From e9dbc71f87ab342487d8145dd8122773cdc1f77f Mon Sep 17 00:00:00 2001 From: lisyarus Date: Mon, 18 Jan 2021 20:01:46 +0300 Subject: [PATCH] Remove Eigen dependence --- examples/animation_2d.cpp | 19 ++++++++++--------- examples/physics_2d.cpp | 3 --- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/examples/animation_2d.cpp b/examples/animation_2d.cpp index 7a0f4dda..36ec2499 100644 --- a/examples/animation_2d.cpp +++ b/examples/animation_2d.cpp @@ -22,8 +22,8 @@ #include #include -#include -#include +//#include +//#include #include #include @@ -443,8 +443,8 @@ struct controller // geom::matrix m3; // geom::vector t3; - Eigen::VectorXf to_eigen() const; - void from_eigen(Eigen::VectorXf const & v); + //Eigen::VectorXf to_eigen() const; + //void from_eigen(Eigen::VectorXf const & v); int generation = 0; @@ -507,7 +507,7 @@ void controller::randomize(RNG && rng, float amplitude) // visit_v(t3); } - +/* Eigen::VectorXf controller::to_eigen() const { Eigen::VectorXf vec; @@ -525,6 +525,7 @@ void controller::from_eigen(Eigen::VectorXf const & v) std::copy(v.data(), v.data() + inputs * outputs, m1.coords); std::copy(v.data() + inputs * outputs, v.data() + (inputs + 1) * outputs, t1.coords); } +*/ template void controller::mutate(RNG && rng, float amplitude) @@ -699,8 +700,8 @@ struct animation_2d_app float const initial_variance = 10.f; static constexpr auto mutation_amplitude = [](float t){ return std::pow(10.f, 1.f + geom::lerp(0.f, -2.f, t)); }; - Eigen::VectorXf mean; - Eigen::MatrixXf covariance; + //Eigen::VectorXf mean; + //Eigen::MatrixXf covariance; float best_score = 0.f; bool const warm_start = false; @@ -1218,8 +1219,8 @@ void animation_2d_app::do_train() population = std::move(new_population); } - (void)&controller::to_eigen; - (void)&controller::from_eigen; + //(void)&controller::to_eigen; + //(void)&controller::from_eigen; std::vector> scores(population.size()); std::vector> futures; diff --git a/examples/physics_2d.cpp b/examples/physics_2d.cpp index 9f07e38f..9826f2d0 100644 --- a/examples/physics_2d.cpp +++ b/examples/physics_2d.cpp @@ -18,9 +18,6 @@ #include #include -#include -#include - #include #include