[Rcpp-commits] r3073 - in pkg/RcppGSL: . R inst/unitTests man

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

Author: edd
Date: 2011-06-15 02:28:40 +0200 (Wed, 15 Jun 2011)
New Revision: 3073

Modified:
   pkg/RcppGSL/ChangeLog
   pkg/RcppGSL/R/fastLm.R
   pkg/RcppGSL/inst/unitTests/runit.fastLm.R
   pkg/RcppGSL/man/fastLm.Rd
Log:
a few more fixes to make R CMD check and the unit test happy about fastLmPure() argument order


Modified: pkg/RcppGSL/ChangeLog
===================================================================
--- pkg/RcppGSL/ChangeLog	2011-06-14 23:29:10 UTC (rev 3072)
+++ pkg/RcppGSL/ChangeLog	2011-06-15 00:28:40 UTC (rev 3073)
@@ -1,7 +1,8 @@
 2011-06-14  Douglas Bates <bates at stat.wisc.edu>
 
-	* R/fastLm.R, fastLm.Rd, src/fastLm.cpp: Change order of arguments in
-	fastLm.cpp and fastLm.R and documentation.
+	* R/fastLm.R, man/fastLm.Rd, src/fastLm.cpp,
+	inst/unitTests/runit.fastLm.R: Change order of arguments in
+	fastLm.cpp, fastLm.R, unit test and documentation.
 
 2011-06-13  Dirk Eddelbuettel  <edd at debian.org>
 

Modified: pkg/RcppGSL/R/fastLm.R
===================================================================
--- pkg/RcppGSL/R/fastLm.R	2011-06-14 23:29:10 UTC (rev 3072)
+++ pkg/RcppGSL/R/fastLm.R	2011-06-15 00:28:40 UTC (rev 3073)
@@ -1,6 +1,7 @@
+
 ## fastLm.R: Rcpp/GSL implementation of lm()
 ##
-## Copyright (C)  2010 Dirk Eddelbuettel and Romain Francois
+## Copyright (C)  2010 - 2011 Dirk Eddelbuettel and Romain Francois
 ##
 ## This file is part of RcppGSL.
 ##
@@ -25,7 +26,7 @@
     res <- .Call("fastLm", X, y, package="RcppGSL")
 }
 
-fastLm <- function(x, ...) UseMethod("fastLm")
+fastLm <- function(X, ...) UseMethod("fastLm")
 
 fastLm.default <- function(X, y, ...) {
 

Modified: pkg/RcppGSL/inst/unitTests/runit.fastLm.R
===================================================================
--- pkg/RcppGSL/inst/unitTests/runit.fastLm.R	2011-06-14 23:29:10 UTC (rev 3072)
+++ pkg/RcppGSL/inst/unitTests/runit.fastLm.R	2011-06-15 00:28:40 UTC (rev 3073)
@@ -1,7 +1,7 @@
 #!/usr/bin/r -t
 #                        Emacs make this -*- mode: R; tab-width: 4 -*-
 #
-# Copyright (C) 2010	Romain Francois and Dirk Eddelbuettel
+# Copyright (C) 2010 - 2011	 Romain Francois and Dirk Eddelbuettel
 #
 # This file is part of RcppGSL.
 #
@@ -21,8 +21,8 @@
 test.fastLm <- function() {
     data(trees)
     flm <- .Call("fastLm",
+                 cbind(1, log(trees$Girth)),
                  log(trees$Volume),
-                 cbind(1, log(trees$Girth)),
                  PACKAGE="RcppGSL")
     fit <- lm(log(Volume) ~ log(Girth), data=trees)
 

Modified: pkg/RcppGSL/man/fastLm.Rd
===================================================================
--- pkg/RcppGSL/man/fastLm.Rd	2011-06-14 23:29:10 UTC (rev 3072)
+++ pkg/RcppGSL/man/fastLm.Rd	2011-06-15 00:28:40 UTC (rev 3073)
@@ -72,7 +72,7 @@
   data(trees)
 
   ## bare-bones direct interface
-  flm <- fastLmPure( log(trees$Volume),  cbind(1, log(trees$Girth)) )
+  flm <- fastLmPure( cbind(1, log(trees$Girth)), log(trees$Volume) )
   print(flm)
 
   ## standard R interface for formula or data returning object of class fastLm