[Rcpp-commits] r1259 - in pkg: RcppArmadillo RcppArmadillo/R RcppArmadillo/man RcppGSL RcppGSL/R RcppGSL/man

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

Author: edd
Date: 2010-05-17 20:13:15 +0200 (Mon, 17 May 2010)
New Revision: 1259

Modified:
   pkg/RcppArmadillo/NAMESPACE
   pkg/RcppArmadillo/R/fastLm.R
   pkg/RcppArmadillo/man/fastLm.Rd
   pkg/RcppGSL/NAMESPACE
   pkg/RcppGSL/R/fastLm.R
   pkg/RcppGSL/man/fastLm.Rd
Log:
fastLmCall is now fastLmPure


Modified: pkg/RcppArmadillo/NAMESPACE
===================================================================
--- pkg/RcppArmadillo/NAMESPACE	2010-05-17 17:37:20 UTC (rev 1258)
+++ pkg/RcppArmadillo/NAMESPACE	2010-05-17 18:13:15 UTC (rev 1259)
@@ -1,9 +1,10 @@
 useDynLib(RcppArmadillo)
 
-export(fastLmCall,
+export(fastLmPure,
        fastLm,
        fastLm.default,
        fastLm.formula,
+       predict.fastLm,
        print.fastLm,
        summary.fastLm,
        print.summary.fastLm)

Modified: pkg/RcppArmadillo/R/fastLm.R
===================================================================
--- pkg/RcppArmadillo/R/fastLm.R	2010-05-17 17:37:20 UTC (rev 1258)
+++ pkg/RcppArmadillo/R/fastLm.R	2010-05-17 18:13:15 UTC (rev 1259)
@@ -18,7 +18,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with RcppArmadillo.  If not, see <http://www.gnu.org/licenses/>.
 
-fastLmCall <- function(y, X) {
+fastLmPure <- function(y, X) {
 
     stopifnot(is.matrix(X))
     stopifnot(nrow(y)==nrow(X))
@@ -33,7 +33,7 @@
     x <- as.matrix(x)
     y <- as.numeric(y)
 
-    res <- fastLmCall(y, x)
+    res <- fastLmPure(y, x)
 
     res$coefficients <- res$coefficient[,1] # force into single-col vector
 

Modified: pkg/RcppArmadillo/man/fastLm.Rd
===================================================================
--- pkg/RcppArmadillo/man/fastLm.Rd	2010-05-17 17:37:20 UTC (rev 1258)
+++ pkg/RcppArmadillo/man/fastLm.Rd	2010-05-17 18:13:15 UTC (rev 1259)
@@ -1,6 +1,6 @@
 \name{fastLm}
 \alias{fastLm}
-\alias{fastLmCall}
+\alias{fastLmPure}
 \alias{fastLm.default}
 \alias{fastLm.formula}
 \alias{print.fastLm}
@@ -14,7 +14,7 @@
   function of \code{Armadillo} linear algebra library.
 }
 \usage{
-fastLmCall(y, X)
+fastLmPure(y, X)
 
 fastLm(x, ...)
 \method{fastLm}{default}(x, y, ...)
@@ -38,7 +38,7 @@
   Linear models should be estimated using the \code{\link{lm}} function. In
   some cases, \code{\link{lm.fit}} may be appropriate.
 
-  The \code{fastLmCall} function provides a reference use case of the \code{GSL}
+  The \code{fastLmPure} function provides a reference use case of the \code{GSL}
   library via the wrapper functions in the \pkg{RcppGSL} package.
   
   The \code{fastLm} function provides a more standard implementation of
@@ -81,7 +81,7 @@
   data(trees)
 
   ## bare-bones direct interface
-  flm <- fastLmCall( log(trees$Volume),  cbind(1, log(trees$Girth)) )
+  flm <- fastLmPure( log(trees$Volume),  cbind(1, log(trees$Girth)) )
   print(flm)
 
   ## standard R interface for formula or data returning object of class fastLm

Modified: pkg/RcppGSL/NAMESPACE
===================================================================
--- pkg/RcppGSL/NAMESPACE	2010-05-17 17:37:20 UTC (rev 1258)
+++ pkg/RcppGSL/NAMESPACE	2010-05-17 18:13:15 UTC (rev 1259)
@@ -1,10 +1,10 @@
 useDynLib(RcppGSL)
 
-##exportPattern("^[[:alpha:]]+")
-export(fastLmCall,
+export(fastLmPure,
        fastLm,
        fastLm.default,
        fastLm.formula,
+       predict.fastLm,
        print.fastLm,
        summary.fastLm,
        print.summary.fastLm)

Modified: pkg/RcppGSL/R/fastLm.R
===================================================================
--- pkg/RcppGSL/R/fastLm.R	2010-05-17 17:37:20 UTC (rev 1258)
+++ pkg/RcppGSL/R/fastLm.R	2010-05-17 18:13:15 UTC (rev 1259)
@@ -17,7 +17,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with RcppGSL.  If not, see <http://www.gnu.org/licenses/>.
 
-fastLmCall <- function(y, X) {
+fastLmPure <- function(y, X) {
 
     stopifnot(is.matrix(X))
     stopifnot(nrow(y)==nrow(X))
@@ -32,7 +32,7 @@
     x <- as.matrix(x)
     y <- as.numeric(y)
 
-    res <- fastLmCall(y, x)
+    res <- fastLmPure(y, x)
     names(res$coefficients) <- colnames(x)
 
     res$fitted.values <- as.vector(x %*% res$coefficients)

Modified: pkg/RcppGSL/man/fastLm.Rd
===================================================================
--- pkg/RcppGSL/man/fastLm.Rd	2010-05-17 17:37:20 UTC (rev 1258)
+++ pkg/RcppGSL/man/fastLm.Rd	2010-05-17 18:13:15 UTC (rev 1259)
@@ -1,6 +1,6 @@
 \name{fastLm}
 \alias{fastLm}
-\alias{fastLmCall}
+\alias{fastLmPure}
 \alias{fastLm.default}
 \alias{fastLm.formula}
 \alias{print.fastLm}
@@ -14,7 +14,7 @@
   function of the \code{GNU GSL} library.
 }
 \usage{
-fastLmCall(y, X)
+fastLmPure(y, X)
 
 fastLm(x, ...)
 \method{fastLm}{default}(x, y, ...)
@@ -38,7 +38,7 @@
   Linear models should be estimated using the \code{\link{lm}} function. In
   some cases, \code{\link{lm.fit}} may be appropriate.
 
-  The \code{fastLmCall} function provides a reference use case of the \code{GSL}
+  The \code{fastLmPure} function provides a reference use case of the \code{GSL}
   library via the wrapper functions in the \pkg{RcppGSL} package.
   
   The \code{fastLm} function provides a more standard implementation of
@@ -62,7 +62,7 @@
 }
 
 \value{
-  \code{fastLmCall} returns a list with three components:
+  \code{fastLmPure} returns a list with three components:
   \item{coefficients}{a vector of coefficients}
   \item{stderr}{a vector of the (estimated) standard errors of the coefficient estimates}
   \item{df}{a scalar denoting the degrees of freedom in the model}
@@ -83,7 +83,7 @@
   data(trees)
 
   ## bare-bones direct interface
-  flm <- fastLmCall( log(trees$Volume),  cbind(1, log(trees$Girth)) )
+  flm <- fastLmPure( log(trees$Volume),  cbind(1, log(trees$Girth)) )
   print(flm)
 
   ## standard R interface for formula or data returning object of class fastLm