[Rcpp-commits] r3079 - in pkg: RcppArmadillo/inst/unitTests RcppEigen/inst/unitTests RcppGSL/inst/unitTests

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

Author: edd
Date: 2011-06-15 20:19:04 +0200 (Wed, 15 Jun 2011)
New Revision: 3079

Modified:
   pkg/RcppArmadillo/inst/unitTests/runit.fastLm.R
   pkg/RcppEigen/inst/unitTests/runit.fastLm.R
   pkg/RcppGSL/inst/unitTests/runit.fastLm.R
Log:
better way to load trees dataset


Modified: pkg/RcppArmadillo/inst/unitTests/runit.fastLm.R
===================================================================
--- pkg/RcppArmadillo/inst/unitTests/runit.fastLm.R	2011-06-15 18:15:50 UTC (rev 3078)
+++ pkg/RcppArmadillo/inst/unitTests/runit.fastLm.R	2011-06-15 18:19:04 UTC (rev 3079)
@@ -1,6 +1,6 @@
 #!/usr/bin/r -t
 #
-# Copyright (C) 2010	Dirk Eddelbuettel, Romain Francois and Douglas Bates
+# Copyright (C) 2010 - 2011  Dirk Eddelbuettel, Romain Francois and Douglas Bates
 #
 # This file is part of RcppArmadillo.
 #
@@ -23,7 +23,7 @@
 }
 
 test.fastLm <- function() {
-    data(trees)
+    data(trees, package="datasets")
     flm <- .Call("fastLm",
                  cbind(1, log(trees$Girth)),
                  log(trees$Volume),
@@ -37,7 +37,7 @@
 }
 
 test.fastLm.formula <- function() {
-    data(trees)
+    data(trees, package="datasets")
     flm <- fastLm(log(Volume) ~ log(Girth), data=trees)
     fit <- lm(log(Volume) ~ log(Girth), data=trees)
 

Modified: pkg/RcppEigen/inst/unitTests/runit.fastLm.R
===================================================================
--- pkg/RcppEigen/inst/unitTests/runit.fastLm.R	2011-06-15 18:15:50 UTC (rev 3078)
+++ pkg/RcppEigen/inst/unitTests/runit.fastLm.R	2011-06-15 18:19:04 UTC (rev 3079)
@@ -23,7 +23,7 @@
 }
 
 test.fastLm <- function() {
-    data(trees)
+    data(trees, package="datasets")
     flm <- .Call("fastLm",
                  cbind(1, log(trees$Girth)),
                  log(trees$Volume),
@@ -37,7 +37,7 @@
 }
 
 test.fastLm.Bench <- function() {
-    data(trees)
+    data(trees, package="datasets")
     flm <- .Call("fastLmBench",
                  cbind(1, log(trees$Girth)),
                  log(trees$Volume),
@@ -51,7 +51,7 @@
 }
 
 test.fastLm.Chol1 <- function() {
-    data(trees)
+    data(trees, package="datasets")
     flm <- .Call("fastLmChol1",
                  cbind(1, log(trees$Girth)),
                  log(trees$Volume),
@@ -65,7 +65,7 @@
 }
 
 test.fastLm.Chol2 <- function() {
-    data(trees)
+    data(trees, package="datasets")
     flm <- .Call("fastLmChol2",
                  cbind(1, log(trees$Girth)),
                  log(trees$Volume),
@@ -79,7 +79,7 @@
 }
 
 test.fastLm.formula <- function() {
-    data(trees)
+    data(trees, package="datasets")
     flm <- fastLm(log(Volume) ~ log(Girth), data=trees)
     fit <- lm(log(Volume) ~ log(Girth), data=trees)
 

Modified: pkg/RcppGSL/inst/unitTests/runit.fastLm.R
===================================================================
--- pkg/RcppGSL/inst/unitTests/runit.fastLm.R	2011-06-15 18:15:50 UTC (rev 3078)
+++ pkg/RcppGSL/inst/unitTests/runit.fastLm.R	2011-06-15 18:19:04 UTC (rev 3079)
@@ -19,7 +19,7 @@
 # along with RcppGSL.  If not, see <http://www.gnu.org/licenses/>.
 
 test.fastLm <- function() {
-    data(trees)
+    data(trees, package="datasets")
     flm <- .Call("fastLm",
                  cbind(1, log(trees$Girth)),
                  log(trees$Volume),
@@ -33,7 +33,7 @@
 }
 
 test.fastLm.formula <- function() {
-    data(trees)
+    data(trees, package="datasets")
     flm <- fastLm(log(Volume) ~ log(Girth), data=trees)
     fit <- lm(log(Volume) ~ log(Girth), data=trees)