[Rcpp-commits] r2332 - pkg/RcppDE

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

Author: edd
Date: 2010-10-18 20:23:33 +0200 (Mon, 18 Oct 2010)
New Revision: 2332

Modified:
   pkg/RcppDE/benchmark.r
   pkg/RcppDE/bigBenchmark.r
Log:
two minor typos


Modified: pkg/RcppDE/benchmark.r
===================================================================
--- pkg/RcppDE/benchmark.r	2010-10-18 18:11:15 UTC (rev 2331)
+++ pkg/RcppDE/benchmark.r	2010-10-18 18:23:33 UTC (rev 2332)
@@ -49,7 +49,7 @@
 
 res <- rbind(do.call(rbind, lapply(reps, runPair, maxIt, function(...) Rastrigin(...))),
              do.call(rbind, lapply(reps, runPair, maxIt, function(...) Wild(...))),
-             do.call(rbind, lapply(reps, runPair, maxIt, function(...) Genrose(...))),
+             do.call(rbind, lapply(reps, runPair, maxIt, function(...) Genrose(...)))
 #             runPair(50, maxIt, function(...) Genrose(...))
 #             runPair(100, maxIt, function(...) Genrose(...))
              )

Modified: pkg/RcppDE/bigBenchmark.r
===================================================================
--- pkg/RcppDE/bigBenchmark.r	2010-10-18 18:11:15 UTC (rev 2331)
+++ pkg/RcppDE/bigBenchmark.r	2010-10-18 18:23:33 UTC (rev 2332)
@@ -51,7 +51,7 @@
 
 res <- rbind(do.call(rbind, lapply(reps, runPair, maxIt, function(...) Rastrigin(...))),
              do.call(rbind, lapply(reps, runPair, maxIt, function(...) Wild(...))),
-             do.call(rbind, lapply(reps, runPair, maxIt, function(...) Genrose(...))),
+             do.call(rbind, lapply(reps, runPair, maxIt, function(...) Genrose(...)))
              )
 res <- rbind(res, colMeans(res))
 
@@ -60,14 +60,6 @@
                    paste("Genrose", reps, sep=""),
                    "MEANS")
 
-res <- rbind(res, colMeans(res))
-rownames(res) <- c(#"Rastrigin2", "Rastrigin5", "Rastrigin20"
-                   "Rastrigin50", "Rastrigin100", "Rastrigin200"
-                   #,"Wild2", "Wild5", "Wild20"
-                   ,"Wild50", "Wild100", "Wild200"
-                   #"Genrose2", "Genrose5", "Genrose20"
-                   ,"Genrose50", "Genrose100", "Genrose200"
-                   ,"MEANS")
 res$ratioRcppToBasic <- res[,2]/res[,1]
 res$pctGainOfRcpp <- (1-res[,2]/res[,1])*100