[Rcpp-commits] r3589 - in pkg/RcppArmadillo: . inst/examples

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

Author: edd
Date: 2012-04-29 16:50:37 +0200 (Sun, 29 Apr 2012)
New Revision: 3589

Modified:
   pkg/RcppArmadillo/ChangeLog
   pkg/RcppArmadillo/inst/examples/fastLm.r
Log:
also run lm() in fastLm as it is a tiny example


Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog	2012-04-29 14:31:07 UTC (rev 3588)
+++ pkg/RcppArmadillo/ChangeLog	2012-04-29 14:50:37 UTC (rev 3589)
@@ -1,3 +1,7 @@
+2012-04-29  Dirk Eddelbuettel  <edd at debian.org>
+
+	* inst/examples/fastLm.r: New example fastLm
+
 2012-04-19  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.3.0.2

Modified: pkg/RcppArmadillo/inst/examples/fastLm.r
===================================================================
--- pkg/RcppArmadillo/inst/examples/fastLm.r	2012-04-29 14:31:07 UTC (rev 3588)
+++ pkg/RcppArmadillo/inst/examples/fastLm.r	2012-04-29 14:50:37 UTC (rev 3589)
@@ -2,7 +2,7 @@
 ##
 ## fastLm.r: Benchmarking lm() via RcppArmadillo and directly
 ##
-## Copyright (C)  2010 - 2011  Dirk Eddelbuettel, Romain Francois and Douglas Bates
+## Copyright (C)  2010 - 2012  Dirk Eddelbuettel, Romain Francois and Douglas Bates
 ##
 ## This file is part of RcppArmadillo.
 ##
@@ -62,8 +62,9 @@
                  fastLmPure2(X, y),             # now with the 2 error checks
                  fastLm(frm, data=trees),       # using model matrix
                  lm.fit(X, y),                  # R's fast function, no stderr
+                 lm(frm, data=trees),           # R's standard function
                  columns = c("test", "replications", "elapsed", "relative"),
                  order="relative",
-                 replications=1000)
+                 replications=2500)
 
 print(res)