[Rcpp-commits] r2325 - in pkg/RcppDE: . src

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

Author: edd
Date: 2010-10-17 00:21:02 +0200 (Sun, 17 Oct 2010)
New Revision: 2325

Modified:
   pkg/RcppDE/benchmark.txt
   pkg/RcppDE/src/de4_0.cpp
Log:
undo parts of r2324 which was little too aggressive


Modified: pkg/RcppDE/benchmark.txt
===================================================================
--- pkg/RcppDE/benchmark.txt	2010-10-16 22:13:19 UTC (rev 2324)
+++ pkg/RcppDE/benchmark.txt	2010-10-16 22:21:02 UTC (rev 2325)
@@ -239,3 +239,4 @@
 Genrose50   2.551333 2.636611           1.0334       -3.3425
 MEANS       0.568667 0.584861           1.0285       -2.8478
 
+

Modified: pkg/RcppDE/src/de4_0.cpp
===================================================================
--- pkg/RcppDE/src/de4_0.cpp	2010-10-16 22:13:19 UTC (rev 2324)
+++ pkg/RcppDE/src/de4_0.cpp	2010-10-16 22:21:02 UTC (rev 2325)
@@ -134,6 +134,10 @@
     d_storepop.zeros();				// initialize stored populations 
     i_nstorepop = (i_nstorepop < 0) ? 0 : i_nstorepop;
       
+    if (i_specinitialpop > 0) {    		// if initial population provided, initialize with values 
+	initialpop = initialpopm;
+    }
+
     l_nfeval = 0;    				// number of function evaluations (this is an input via DEoptim.control, but we over-write it?) 
 
     for (i = 0; i < i_NP; i++) {		// ------Initialization-----------------------------