why am I still working. At least it works

Author: jacobdenobel

include/c_maes.hpp

@@ -12,6 +12,12 @@ struct ModularCMAES
 
     void recombine() const;
 
+    void select() const;
+
+    void adapt() const;
+
+    void mutate(FunctionType &objective) const;
+
     bool step(FunctionType& objective) const;
 
     void operator()(FunctionType& objective) const;

include/common.hpp

@@ -22,7 +22,7 @@
 #include <Eigen/Eigenvalues>
 #include <Eigen/QR>
 
-using Float = long double;
+using Float = double;
 using Matrix = Eigen::Matrix<Float, -1, -1>;
 using Vector = Eigen::Matrix<Float, -1, 1>;
 using Array = Eigen::Array<Float, -1, 1>;
@@ -35,9 +35,9 @@ using FunctionType = std::function<Float(const Vector &)>;
 
 namespace constants
 {
-	extern Float tolup_sigma;
+	extern Float max_dsigma;
+	extern Float min_dsigma;
 	extern Float tol_condition_cov;
-	extern Float tol_min_sigma;
 	extern Float stagnation_quantile;
 	extern Float sigma_threshold;
 	extern size_t cache_max_doubles;

include/parameters.hpp

@@ -4,7 +4,8 @@
 #include "mutation.hpp"
 #include "population.hpp"
 #include "matrix_adaptation.hpp"
-#include "restart.hpp"
+#include "restart_strategy.hpp"
+#include "restart_criteria.hpp"
 #include "sampling.hpp"
 #include "stats.hpp"
 #include "selection.hpp"
@@ -16,6 +17,8 @@ namespace parameters
 {
     struct Parameters
     {
+        bool successfull_adaptation;
+        
         size_t lambda;
         size_t mu;
 
@@ -26,23 +29,26 @@ namespace parameters
         Population pop;
         Population old_pop;
 
+        restart::Criteria criteria;
         std::shared_ptr<sampling::Sampler> sampler;
         std::shared_ptr<matrix_adaptation::Adaptation> adaptation;
         std::shared_ptr<mutation::Strategy> mutation;
         std::shared_ptr<selection::Strategy> selection;
-        std::shared_ptr<restart::Strategy> restart;
+        std::shared_ptr<restart::Strategy> restart_strategy;
         std::shared_ptr<bounds::BoundCorrection> bounds;
         std::shared_ptr<repelling::Repelling> repelling;
         std::shared_ptr<center::Placement> center_placement;
 
         Parameters(const size_t dim);
+
         Parameters(const Settings &settings);
 
-        void adapt(FunctionType& objective);
+        
+        void start(FunctionType& objective);
 
-        void perform_restart(FunctionType& objective, const std::optional<Float> &sigma = std::nullopt);
+        void adapt();
 
-        bool invalid_state() const;
+        void perform_restart(FunctionType& objective, const std::optional<Float> &sigma = std::nullopt);
     };
 
 }