Merge pull request #1 from doobwa/master

Jonathan Chang · Jonathan Chang · commit 33429006289c · 2012-01-11T00:17:40.000-08:00
Fix warning related to namespace issues.
diff --git a/pkg/DESCRIPTION b/pkg/DESCRIPTION
@@ -8,3 +8,7 @@ Maintainer: Jonathan Chang <jonchang@fb.com>
 Description: This package implements the Fast Learning of Ising Models (FLIM) technique which aims to perform inference and learning for large-scale fully-connected pairwise Ising models.
 License: LGPL
 LazyLoad: yes
+Depends: methods, Rcpp (>= 0.9.7)
+LinkingTo: Rcpp
+RcppModules: Rflim
+
diff --git a/pkg/NAMESPACE b/pkg/NAMESPACE
@@ -1,5 +1,4 @@
-import(methods)
-importClassesFrom(Rcpp, "C++Object", "C++Class", "Module")
 useDynLib(Rflim)
-export(Flim)
+import(Rcpp)
 export(count.pairs)
+export(flim)
diff --git a/pkg/R/Flim.R b/pkg/R/Flim.R
@@ -1,4 +1,4 @@
-Flim <- function(singleton.counts,
+flim <- function(singleton.counts,
                  pairwise.counts,
                  document.count,
                  beta.1 = 0.1,
@@ -13,8 +13,7 @@ Flim <- function(singleton.counts,
     stop("Atrocity!  Pairwise count indices must be between 1 and N.");
   }
 
-  flim.obj <- new(.module$Flim, N, beta.1, beta.2)
-  
+  flim.obj <- new(Flim, N, beta.1, beta.2)
 
   flim.obj$loadCorpus(singleton.counts, 
                       pairwise.counts[,1],
diff --git a/pkg/R/onload.R b/pkg/R/onload.R
@@ -1,10 +1,4 @@
-NAMESPACE <- environment()
-.module <- new("Module")
-
-.onLoad <- function(libname, pkgname) {
-  require(methods)
-  unlockBinding(".module", NAMESPACE)
-  assign(".module", Rcpp:::Module("Rflim"), NAMESPACE)
-  lockBinding(".module", NAMESPACE)
+.onLoad <- function(pkgname, libname){
+  require("methods", character=TRUE, quietly=TRUE)
+  loadRcppModules()
 }
-
diff --git a/tests/cora.test.R b/tests/cora.test.R
@@ -18,7 +18,7 @@ pairwise.counts <- subset(data.frame(
 
 save(pairwise.counts, singleton.counts, file="counts.Rdata")
 
-flim.instance <- Flim(singleton.counts,
+flim.instance <- flim(singleton.counts,
                       pairwise.counts,
                       length(documents),
                       0.0, 0.0, 15)
