Merge pull request #17 from kaneplusplus/master

Use new interface to get CType for big.matrix, for bigmemory package version 4.5.8 onwards.
aloysius-lim · Oct 21, 2015 · ae16484 · ae16484
2 parents 31e204d + de7474b
commit ae16484
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/R/grow.R b/R/grow.R
@@ -219,7 +219,7 @@ setMethod("grow", signature(forest="bigcforest"), function(
 
         if (trace >= 2L) message("Tree ", treenum, ": Growing tree.")
 
-        xtype <- as.integer(.Call("CGetType", x@address, PACKAGE="bigmemory"))
+        xtype <- as.integer(bigmemory:::getCType(x))
         tree <- .Call("growtreeC", x@address, xtype, a@address, a.out@address,
                       forest, insamp, inweight, treenum, trace)
 

diff --git a/R/predict.R b/R/predict.R
@@ -93,7 +93,7 @@ setMethod("predict", signature(object="bigcforest"), function(
     }
 
     ntest <- as.integer(nrow(x))
-    xtype <- as.integer(.Call("CGetType", x@address, PACKAGE="bigmemory"))
+    xtype <- as.integer(bigmemory:::getCType(x))
     ynclass <- length(levels(forest@y))
 
     # fast fix on the test data

diff --git a/R/varimp.R b/R/varimp.R
@@ -95,7 +95,7 @@ setMethod("varimp", signature(forest="bigcforest"),  function(
 
     nvar <- length(forest@varselect)
     ntest <- as.integer(nrow(x));
-    xtype <- as.integer(.Call("CGetType", x@address, PACKAGE="bigmemory"))
+    xtype <- as.integer(bigmemory:::getCType(x))
 
     importance <- numeric(nvar)
     importance.sq <- numeric(nvar)
@@ -187,4 +187,4 @@ setMethod("varimp", signature(forest="bigcforest"),  function(
     return(list(importance=importance, importance.ex=importance.ex,
                 zscore=zscore, significance=significance))
 })
-
+