fixed auto init of TPA, ref #88, #103

Emmanuel Benazera · Emmanuel Benazera · commit b22b3d1d56da · 2015-02-06T11:18:43.000+01:00
diff --git a/src/cmaparameters.cc b/src/cmaparameters.cc
@@ -132,7 +132,7 @@ namespace libcmaes
   void CMAParameters<TGenoPheno>::set_tpa(const int &b)
   {
     this->_tpa = b;
-    if (this->_tpa > 0)
+    if (this->_tpa == 2)
       _dsigma = 4 - 3.6 / std::sqrt(Parameters<TGenoPheno>::_dim);
     else if (!this->_vd)
       _dsigma = 1.0+_csigma+2.0*std::max(0.0,sqrt((_muw-1)/(Parameters<TGenoPheno>::_dim+1))-1); // default

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ namespace libcmaes`
`132`	`132`	`void CMAParameters<TGenoPheno>::set_tpa(const int &b)`
`133`	`133`	`{`
`134`	`134`	`this->_tpa = b;`
`135`		`- if (this->_tpa > 0)`
	`135`	`+ if (this->_tpa == 2)`
`136`	`136`	`_dsigma = 4 - 3.6 / std::sqrt(Parameters<TGenoPheno>::_dim);`
`137`	`137`	`else if (!this->_vd)`
`138`	`138`	`_dsigma = 1.0+_csigma+2.0*std::max(0.0,sqrt((_muw-1)/(Parameters<TGenoPheno>::_dim+1))-1); // default`