[Rcpp-commits] r2334 - pkg/RcppDE

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

Author: edd
Date: 2010-10-18 21:01:14 +0200 (Mon, 18 Oct 2010)
New Revision: 2334

Modified:
   pkg/RcppDE/benchmark.r
   pkg/RcppDE/bigBenchmark.r
Log:
another typo/thinko


Modified: pkg/RcppDE/benchmark.r
===================================================================
--- pkg/RcppDE/benchmark.r	2010-10-18 18:37:32 UTC (rev 2333)
+++ pkg/RcppDE/benchmark.r	2010-10-18 19:01:14 UTC (rev 2334)
@@ -24,9 +24,9 @@
                                                  control=list(NP=10*n, itermax=maxIt, trace=FALSE))
 
 set.seed(42)
-valBasic <- basicDE(5, maxIt, fun)
+valBasic <- basicDE(5, maxIt, function(...) Rastrigin(...))
 set.seed(42)
-valCpp <- cppDE(5, maxIt, fun)
+valCpp <- cppDE(5, maxIt, function(...) Rastrigin(...))
 stopifnot( all.equal(valBasic, valCpp) )
 
 runPair <- function(n, maxIt, fun) {

Modified: pkg/RcppDE/bigBenchmark.r
===================================================================
--- pkg/RcppDE/bigBenchmark.r	2010-10-18 18:37:32 UTC (rev 2333)
+++ pkg/RcppDE/bigBenchmark.r	2010-10-18 19:01:14 UTC (rev 2334)
@@ -24,9 +24,9 @@
                                                  control=list(NP=10*n, itermax=maxIt, trace=FALSE))#, bs=TRUE))
 
 set.seed(42)
-valBasic <- basicDE(5, maxIt, fun)
+valBasic <- basicDE(5, maxIt, function(...) Rastrigin(...))
 set.seed(42)
-valCpp <- cppDE(5, maxIt, fun)
+valCpp <- cppDE(5, maxIt, function(...) Rastrigin(...))
 stopifnot( all.equal(valBasic, valCpp) )
 
 runPair <- function(n, maxIt, fun) {