Skip to content

Commit 35b876c

Browse files
committed
change default numeric type back to double
1 parent 1ac0467 commit 35b876c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ target_include_directories(main PUBLIC
1818
)
1919

2020
if (MSVC)
21-
target_compile_options(main PRIVATE /bigobj)
21+
target_compile_options(main PRIVATE /bigobj /openmp)
2222

2323
else()
2424
target_compile_options(main PRIVATE -march=native)

include/common.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <Eigen/QR>
2424
#include <unsupported/Eigen/MatrixFunctions>
2525

26-
using Float = long double;
26+
using Float = double;
2727
using Matrix = Eigen::Matrix<Float, -1, -1>;
2828
using Vector = Eigen::Matrix<Float, -1, 1>;
2929
using Array = Eigen::Array<Float, -1, 1>;
@@ -338,8 +338,8 @@ namespace rng
338338
namespace functions
339339
{
340340
Float sphere(const Vector &x);
341-
Float rastrigin(const Vector &x);
342341
Float ellipse(const Vector& x);
342+
Float rastrigin(const Vector &x);
343343
Float rosenbrock(const Vector& x);
344344
Matrix random_rotation_matrix(int n, int seed);
345345

src/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ using std::chrono::milliseconds;
1111

1212
static int dim = 100;
1313
static bool rotated = false;
14-
static size_t budget = dim * 10000;
14+
static size_t budget = dim * 2000;
1515

1616

1717
struct Ellipse
@@ -75,7 +75,7 @@ void run_modcma(parameters::MatrixAdaptationType mat_t, functions::ObjectiveFunc
7575
-std::numeric_limits<double>::infinity(),
7676
std::nullopt,
7777
budget,
78-
0.1
78+
2.0
7979
);
8080
auto p = std::make_shared<parameters::Parameters>(settings);
8181
auto cma = ModularCMAES(p);

0 commit comments

Comments
 (0)