Merge pull request #49 from IOHprofiler/refactoring_restarting

fix x0 and restart crit

Author: jacobdenobel

modcma/c_maes/__init__.py

@@ -12,6 +12,7 @@
     Population,
     Parameters,
     ModularCMAES,
+    center,
     es
 )
 

setup.py

@@ -11,7 +11,7 @@
 with open("README.md", "r", encoding="Latin-1") as fh:
     long_description = fh.read()
 
-__version__ = "1.0.12"
+__version__ = "1.0.13"
 
 ext = Pybind11Extension(
     "modcma.c_maes.cmaescpp",

src/center_placement.cpp

@@ -5,7 +5,9 @@ namespace center
 {
     void X0::operator()(parameters::Parameters &p)
     {
-        p.adaptation->m = p.settings.x0.value_or(Vector::Zero(p.settings.dim));
+        const auto default_x0 = (p.settings.lb + p.settings.ub) / 2.0;
+
+        p.adaptation->m = p.settings.x0.value_or(default_x0);
     }
 
     void Uniform::operator()(parameters::Parameters &p)

src/restart_criteria.cpp

@@ -68,12 +68,12 @@ namespace restart
         met = time_since_restart > n_bin and recent_improvement == 0;
     }
 
-    void MaxSigma::update(const parameters::Parameters& p)
+    void MaxSigma::update(const parameters::Parameters &p)
     {
         met = p.mutation->sigma > tolerance;
     }
 
-    void MinSigma::update(const parameters::Parameters& p)
+    void MinSigma::update(const parameters::Parameters &p)
     {
         met = p.mutation->sigma < tolerance;
     }
@@ -191,10 +191,9 @@ namespace restart
 
     Criteria Criteria::get(const parameters::Modules modules)
     {
-        vCriteria criteria {
-            std::make_shared<restart::UnableToAdapt>()
-        };
-        
+        vCriteria criteria{
+            std::make_shared<restart::UnableToAdapt>()};
+
         if (modules.restart_strategy >= parameters::RestartStrategyType::RESTART)
         {
             criteria.push_back(std::make_shared<restart::MinSigma>());
@@ -205,15 +204,15 @@ namespace restart
             criteria.push_back(std::make_shared<restart::Stagnation>());
             criteria.push_back(std::make_shared<restart::MinDSigma>());
             criteria.push_back(std::make_shared<restart::MaxDSigma>());
-        }
 
-        if (modules.matrix_adaptation == parameters::MatrixAdaptationType::COVARIANCE ||
-			modules.matrix_adaptation == parameters::MatrixAdaptationType::SEPERABLE)
-        {
-            criteria.push_back(std::make_shared<restart::TolX>());
-            criteria.push_back(std::make_shared<restart::ConditionC>());
-            criteria.push_back(std::make_shared<restart::NoEffectAxis>());
-            criteria.push_back(std::make_shared<restart::NoEffectCoord>());
+            if (modules.matrix_adaptation == parameters::MatrixAdaptationType::COVARIANCE ||
+                modules.matrix_adaptation == parameters::MatrixAdaptationType::SEPERABLE)
+            {
+                criteria.push_back(std::make_shared<restart::TolX>());
+                criteria.push_back(std::make_shared<restart::ConditionC>());
+                criteria.push_back(std::make_shared<restart::NoEffectAxis>());
+                criteria.push_back(std::make_shared<restart::NoEffectCoord>());
+            }
         }
         return Criteria(criteria);
     }