new cmu and cc values for sep algorithms, ref #88

Emmanuel Benazera · Emmanuel Benazera · commit 5913f4337a5e · 2015-01-27T08:40:13.000+01:00
diff --git a/src/cmaparameters.cc b/src/cmaparameters.cc
@@ -153,8 +153,9 @@ namespace libcmaes
   {
     _sep = true;
     _c1 *= (Parameters<TGenoPheno>::_dim+2.0)/3.0;
-    _cmu = std::min(1.0-_c1,2.0*(_muw-2.0+1.0/_muw)/(pow(Parameters<TGenoPheno>::_dim+2.0,2)+_muw));
+    _cmu = std::min(1.0-_c1,(0.3 + _muw - 2.0 + 1.0/_muw) / (this->_dim + 4.0*std::sqrt(this->_dim) + _muw/2.0));
     _lazy_value = 1.0/(_c1+_cmu)/Parameters<TGenoPheno>::_dim/10.0;
+    _cc = (1.0+1.0/static_cast<double>(Parameters<TGenoPheno>::_dim) + _muw/static_cast<double>(Parameters<TGenoPheno>::_dim))/(std::sqrt(Parameters<TGenoPheno>::_dim)+1.0/static_cast<double>(Parameters<TGenoPheno>::_dim)+2.0*_muw/static_cast<double>(Parameters<TGenoPheno>::_dim));
   }
   
   template <class TGenoPheno>

Original file line number	Diff line number	Diff line change
`@@ -153,8 +153,9 @@ namespace libcmaes`
`153`	`153`	`{`
`154`	`154`	`_sep = true;`
`155`	`155`	`_c1 *= (Parameters<TGenoPheno>::_dim+2.0)/3.0;`
`156`		`- _cmu = std::min(1.0-_c1,2.0*(_muw-2.0+1.0/_muw)/(pow(Parameters<TGenoPheno>::_dim+2.0,2)+_muw));`
	`156`	`+ _cmu = std::min(1.0-_c1,(0.3 + _muw - 2.0 + 1.0/_muw) / (this->_dim + 4.0*std::sqrt(this->_dim) + _muw/2.0));`
`157`	`157`	`_lazy_value = 1.0/(_c1+_cmu)/Parameters<TGenoPheno>::_dim/10.0;`
	`158`	`+ _cc = (1.0+1.0/static_cast<double>(Parameters<TGenoPheno>::_dim) + _muw/static_cast<double>(Parameters<TGenoPheno>::_dim))/(std::sqrt(Parameters<TGenoPheno>::_dim)+1.0/static_cast<double>(Parameters<TGenoPheno>::_dim)+2.0*_muw/static_cast<double>(Parameters<TGenoPheno>::_dim));`
`158`	`159`	`}`
`159`	`160`
`160`	`161`	`template <class TGenoPheno>`