[Rcpp-commits] r3215 - pkg/RcppEigen/inst/examples

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

Author: dmbates
Date: 2011-10-22 00:47:49 +0200 (Sat, 22 Oct 2011)
New Revision: 3215

Modified:
   pkg/RcppEigen/inst/examples/lmBenchmark.R
Log:
Renumber methods according to new scheme.  Remove redundant call to "paste".


Modified: pkg/RcppEigen/inst/examples/lmBenchmark.R
===================================================================
--- pkg/RcppEigen/inst/examples/lmBenchmark.R	2011-10-21 22:46:42 UTC (rev 3214)
+++ pkg/RcppEigen/inst/examples/lmBenchmark.R	2011-10-21 22:47:49 UTC (rev 3215)
@@ -20,7 +20,7 @@
 ## column-pivoted QR decomposition - similar to lm.fit
 exprs$PivQR <- expression(.Call("fastLm", mm, y, 0L, PACKAGE="RcppEigen"))
 ## LDLt Cholesky decomposition with rank detection
-exprs$LDLt <- expression(.Call("fastLm", mm, y, 3L, PACKAGE="RcppEigen"))
+exprs$LDLt <- expression(.Call("fastLm", mm, y, 2L, PACKAGE="RcppEigen"))
 ## SVD
 exprs$SVD <- expression(.Call("fastLm", mm, y, 4L, PACKAGE="RcppEigen"))
 ## eigenvalues and eigenvectors of X'X
@@ -32,7 +32,7 @@
 ## Unpivoted  QR decomposition
 exprs$QR <- expression(.Call("fastLm", mm, y, 1L, PACKAGE="RcppEigen"))
 ## LLt Cholesky decomposition
-exprs$LLt <- expression(.Call("fastLm", mm, y, 2L, PACKAGE="RcppEigen"))
+exprs$LLt <- expression(.Call("fastLm", mm, y, 3L, PACKAGE="RcppEigen"))
 
 if (require("RcppArmadillo", character=TRUE, quietly=TRUE)) {
     exprs$arma <- expression(.Call("fastLm", mm, y, PACKAGE="RcppArmadillo"))
@@ -46,8 +46,7 @@
     mm <- cbind(1, matrix(rnorm(n * (p - 1L)), nc=p-1L))
     y <- rnorm(n)
     if (suppressSVD) exprs <- exprs[!names(exprs) %in% c("SVD", "GSL")]
-    cat(paste("lm benchmark for n = ", n, " and p = ", p, ": nrep = ",
-              nrep, "\n", sep=''))
+    cat("lm benchmark for n = ", n, " and p = ", p, ": nrep = ", nrep, "\n", sep='')
     do.call(benchmark, c(exprs,
                          list(order="relative",
                               columns = c("test", "relative",