update

Author: jacobdenobel

include/matrix_adaptation.hpp

@@ -186,6 +186,10 @@ namespace matrix_adaptation
 	{
 		Matrix A;
 		Vector pc;
+		/*
+		First, as only triangular matrices have to be stored, the storage complexity is optimal.
+		Second, the diagonal elements of a triangular Cholesky factor are the square roots of the eigenvalues
+		of the factorized matrix, that is, we get the eigenvalues of the covariance matrix for free*/
 
 		CholeskyAdaptation(const size_t dim, const Vector& x0, const Float expected_length_z)
 			: Adaptation(dim, x0, Vector::Ones(dim), expected_length_z),

include/settings.hpp

@@ -75,7 +75,7 @@ namespace parameters
 
 			if (modules.ssa == StepSizeAdaptation::SA)
 			{
-				mu0 = std::min(lambda0 / 4, mu0);
+				mu0 = mu.value_or(lambda0 / 4);
 			}
 
 
@@ -100,6 +100,7 @@ namespace parameters
 				one_plus_one = true;
 				modules.elitist = true;
 				modules.active = false;
+				modules.sequential_selection = false;
 				modules.weights = RecombinationWeights::EQUAL;
 				modules.ssa = StepSizeAdaptation::SR;
 

src/main.cpp

@@ -9,9 +9,9 @@ using std::chrono::duration_cast;
 using std::chrono::duration;
 using std::chrono::milliseconds;
 
-static int dim = 10;
+static int dim = 20;
 static bool rotated = false;
-static functions::ObjectiveFunction fun_t = functions::ObjectiveFunction::ELLIPSE;
+static functions::ObjectiveFunction fun_t = functions::ObjectiveFunction::SPHERE;
 static size_t budget = dim * 10000;
 
 

src/weights.cpp

@@ -6,6 +6,8 @@ namespace parameters
 {
 	static Float get_default_cs(const Settings& settings, const Float mueff, const Float d)
 	{
+		// TODO: check whether the value of cs needs to be increased when CMA is NONE
+		
 		if (settings.modules.matrix_adaptation == MatrixAdaptationType::NATURAL_GRADIENT)
 			return (9.0 + 3.0 + std::log(d)) / (5.0 * d * std::sqrt(d));