[R-gregmisc-users] SF.net SVN: r-gregmisc:[1568] trunk/gtools/R

[<wa...@us...>]

Revision: 1568
          http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1568&view=rev
Author:   warnes
Date:     2012-06-19 13:56:52 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
Clean up R CMD check warnings.

Modified Paths:
--------------
    trunk/gtools/R/addLast.R
    trunk/gtools/R/running.R

Modified: trunk/gtools/R/addLast.R
===================================================================
--- trunk/gtools/R/addLast.R	2012-06-18 20:32:10 UTC (rev 1567)
+++ trunk/gtools/R/addLast.R	2012-06-19 13:56:52 UTC (rev 1568)
@@ -1,16 +1,16 @@
 addLast <- function( fun )
   {
     if (!is.function(fun)) stop("fun must be a function")
-    if(!exists(".Last", env=.GlobalEnv))
-      assign(".Last", fun, env=.GlobalEnv)
+    if(!exists(".Last", envir=.GlobalEnv))
+      assign(".Last", fun, envir=.GlobalEnv)
     else
       {
-        Last <- get(".Last", env=.GlobalEnv)
+        Last <- get(".Last", envir=.GlobalEnv)
         newfun <- function(...)
           {
             fun()
             Last()
           }
-        assign(".Last", newfun, env=.GlobalEnv)
+        assign(".Last", newfun, envir=.GlobalEnv)
       }
   }

Modified: trunk/gtools/R/running.R
===================================================================
--- trunk/gtools/R/running.R	2012-06-18 20:32:10 UTC (rev 1567)
+++ trunk/gtools/R/running.R	2012-06-19 13:56:52 UTC (rev 1568)
@@ -58,21 +58,21 @@
 
   if(is.null(Y))  # univariate
     {
-      funct <- function(which,what,fun,...) fun(what[which],...)
+      funct.uni <- function(which,what,fun,...) fun(what[which],...)
 
       if(simplify)
-        Xvar <- sapply(run.elements, funct, what=X, fun=fun, ...)
+        Xvar <- sapply(run.elements, funct.uni, what=X, fun=fun, ...)
       else
-        Xvar <- lapply(run.elements, funct, what=X, fun=fun, ...)
+        Xvar <- lapply(run.elements, funct.uni, what=X, fun=fun, ...)
     }
   else # bivariate
     {
-      funct <- function(which,XX,YY,fun,...) fun(XX[which],YY[which], ...)
+      funct.bi <- function(which,XX,YY,fun,...) fun(XX[which],YY[which], ...)
 
       if(simplify)
-        Xvar <- sapply(run.elements, funct, XX=X, YY=Y, fun=fun, ...)
+        Xvar <- sapply(run.elements, funct.bi, XX=X, YY=Y, fun=fun, ...)
       else
-        Xvar <- lapply(run.elements, funct, XX=X, YY=Y, fun=fun, ...)
+        Xvar <- lapply(run.elements, funct.bi, XX=X, YY=Y, fun=fun, ...)
     }
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.