moved convenience function set_str_algo from parameters to cmaparamet…

…ers in order to set 'sep' flag while setting the algorithm
CMA-ES · Oct 8, 2014 · 5c83a39 · 5c83a39
1 parent 31d5e3c
commit 5c83a39
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/src/cmaparameters.h b/src/cmaparameters.h
@@ -106,6 +106,20 @@ namespace libcmaes
        */
       void set_noisy();
 
+      /**
+       * \brief sets the optimization algorithm.
+       * @param algo as string from cmaes,ipop,bipop,acmaes,aipop,abipop,sepcmaes,sepipop,sepbipop,sepacmaes,sepaipop,sepabipop
+       */
+      void set_str_algo(const std::string &algo)
+      {
+	std::map<std::string,int>::const_iterator mit;
+	if ((mit = Parameters<TGenoPheno>::_algos.find(algo))!=Parameters<TGenoPheno>::_algos.end())
+	  Parameters<TGenoPheno>::_algo = (*mit).second;
+	if (algo.find("sep")!=std::string::npos)
+	  _sep = true;
+	else LOG(ERROR) << "unknown algorithm " << algo << std::endl;
+      }
+
       /**
        * \brief fix parameters for sep-CMA-ES, using only the diagonal of covariance matrix.
        */
@@ -197,6 +211,9 @@ namespace libcmaes
       // stopping criteria.
       bool _has_max_iter = true; /**< MaxIter criteria: automatically stop running after 100+50*((D+2)^2)/lambda iterations. */
     };
+
+  template<class TGenoPheno>
+    std::map<std::string,int> Parameters<TGenoPheno>::_algos = {{"cmaes",0},{"ipop",1},{"bipop",2},{"acmaes",3},{"aipop",4},{"abipop",5},{"sepcmaes",6},{"sepipop",7},{"sepbipop",8},{"sepacmaes",9},{"sepipop",10},{"sepbipop",11}};
 }
 
 #endif
diff --git a/src/parameters.h b/src/parameters.h
@@ -344,18 +344,6 @@ namespace libcmaes
 	_algo = algo;
       }
 
-      /**
-       * \brief sets the optimization algorithm.
-       * @param algo as string from cmaes,ipop,bipop,acmaes,aipop,abipop,sepcmaes,sepipop,sepbipop,sepacmaes,sepaipop,sepabipop
-       */
-      void set_str_algo(const std::string &algo)
-      {
-	std::map<std::string,int>::const_iterator mit;
-	if ((mit = Parameters<TGenoPheno>::_algos.find(algo))!=Parameters<TGenoPheno>::_algos.end())
-	  _algo = (*mit).second;
-	else LOG(ERROR) << "unknown algorithm " << algo << std::endl;
-      }
-
       /**
        * \brief returns which algorithm is set for the optimization at hand.
        * @return algorithm integer code
@@ -514,10 +502,6 @@ namespace libcmaes
 
       static std::map<std::string,int> _algos; /**< of the form { {"cmaes",0}, {"ipop",1}, ...} */;
     };
-
-  template<class TGenoPheno>
-    std::map<std::string,int> Parameters<TGenoPheno>::_algos = {{"cmaes",0},{"ipop",1},{"bipop",2},{"acmaes",3},{"aipop",4},{"abipop",5},{"sepcmaes",6},{"sepipop",7},{"sepbipop",8},{"sepacmaes",9},{"sepipop",10},{"sepbipop",11}};
-
 }
 
 #endif