[Analogue-commits] r256 - pkg/R

[noreply at r-forge.r-project.org]

Author: gsimpson
Date: 2012-04-03 21:49:54 +0200 (Tue, 03 Apr 2012)
New Revision: 256

Modified:
   pkg/R/internal.R
Log:
fix the remainin .Internal calls following release of .colSums etc in R 2.15

Modified: pkg/R/internal.R
===================================================================
--- pkg/R/internal.R	2012-04-03 19:48:36 UTC (rev 255)
+++ pkg/R/internal.R	2012-04-03 19:49:54 UTC (rev 256)
@@ -167,6 +167,7 @@
 ## w.avg - fast weighted mean function with no checks
 `w.avg` <- function(x, env) {
     opt <- ColSums(x * env) / ColSums(x)
+    ##opt <- .colSums(x * env) / .colSums(x)
     names(opt) <- colnames(x)
     opt
 }
@@ -211,14 +212,14 @@
     dn <- dim(x)
     p <- dn[2]
     dn <- dn[1]
-    .Internal(rowSums(x, dn, p, na.rm))
+    .rowSums(x, dn, p, na.rm)
 }
 
 `ColSums` <- function(x, na.rm = FALSE) {
     dn <- dim(x)
     n <- dn[1]
     dn <- dn[2]
-    .Internal(colSums(x, n, dn, na.rm))
+    .colSums(x, n, dn, na.rm)
 }
 
 ## deshrinking function given deshrinking coefs and a method