diff --git a/src/libaevol/population/SIMD_Individual.cpp b/src/libaevol/population/SIMD_Individual.cpp new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/libaevol/population/SIMD_Individual.h b/src/libaevol/population/SIMD_Individual.h new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/libaevol/raevol/PhenotypicTargetHandler_R.cpp b/src/libaevol/raevol/PhenotypicTargetHandler_R.cpp index be577b8fb30a44ea0deeba91c7830948ea369d32..488fcf1387373bbc3a70c274a0c81a96ee27c6e6 100644 --- a/src/libaevol/raevol/PhenotypicTargetHandler_R.cpp +++ b/src/libaevol/raevol/PhenotypicTargetHandler_R.cpp @@ -354,19 +354,19 @@ void PhenotypicTargetHandler_R::load(gzFile backup_file) { int16_t nb_gaussian_list = 0; int16_t nb_gaussians = 0; gzread(backup_file, &nb_gaussian_list, sizeof(nb_gaussian_list)); - //printf("Loading %d gaussians list\n", nb_gaussian_list); + printf("Loading %d gaussians list\n", nb_gaussian_list); for( int16_t i = 0; i<nb_gaussian_list; i++) { env_gaussians_list_.push_back( std::list<Gaussian>()); gzread(backup_file, &nb_gaussians, sizeof(nb_gaussians)); - //printf("There are %d gaussian in gaussians list %d\n", nb_gaussians, i); + printf("There are %d gaussian in gaussians list %d\n", nb_gaussians, i); for (int16_t j = 0 ; j < nb_gaussians ; j++) { env_gaussians_list_.back().push_back(Gaussian(backup_file)); - //printf("Nb gaussians in current_gaussians : %d\n", env_gaussians_list_.back().size()); - /*printf("Gaussian %d. Height = %f, Mean = %f, width = %f\n",j, - env_gaussians_list_.back().back().get_height(), - env_gaussians_list_.back().back().get_mean(), - env_gaussians_list_.back().back().get_width() - );*/ + printf("Nb gaussians in current_gaussians : %d\n", env_gaussians_list_.back().size()); + printf("Gaussian %d. Height = %f, Mean = %f, width = %f\n",j, + env_gaussians_list_.back().back().height(), + env_gaussians_list_.back().back().mean(), + env_gaussians_list_.back().back().width() + ); } } diff --git a/src/libaevol/raevol/SIMD_PhenotypicTargetHandler_R.cpp b/src/libaevol/raevol/SIMD_PhenotypicTargetHandler_R.cpp index 2dfd21d55d2b2f1a75af5c0e3d311d0256b89acc..560e5a867fd9e0bb7df45ec776cf7b615a80c170 100644 --- a/src/libaevol/raevol/SIMD_PhenotypicTargetHandler_R.cpp +++ b/src/libaevol/raevol/SIMD_PhenotypicTargetHandler_R.cpp @@ -7,15 +7,17 @@ namespace aevol { SIMD_PhenotypicTargetHandler_R::SIMD_PhenotypicTargetHandler_R(PhenotypicTargetHandler_R *handler, ExpSetup* exp_s) { + env_gaussians_list_.resize(handler->env_gaussians_list_.size()); nb_env_ = env_gaussians_list_.size(); int i = 0; for (auto gaussian_env : handler->env_gaussians_list_) { for (auto gauss : gaussian_env) { - env_gaussians_list_[i].push_back(Gaussian(gauss)); - i++; + env_gaussians_list_[i].emplace_back(gauss); } + + i++; } env_signals_list_.resize(handler->env_signals_list_.size()); @@ -23,8 +25,9 @@ SIMD_PhenotypicTargetHandler_R::SIMD_PhenotypicTargetHandler_R(PhenotypicTargetH for (auto env_signal : handler->env_signals_list_) { for (auto e_signal : env_signal) { env_signals_list_[i].push_back(e_signal); - i++; } + i++; + } i = 0; diff --git a/src/libaevol/raevol/SIMD_PhenotypicTargetHandler_R.h b/src/libaevol/raevol/SIMD_PhenotypicTargetHandler_R.h index 469968c67ce39e22fea099248f773dd3de077456..2303855fc7396fdda9210481a34d328b8db3ca33 100644 --- a/src/libaevol/raevol/SIMD_PhenotypicTargetHandler_R.h +++ b/src/libaevol/raevol/SIMD_PhenotypicTargetHandler_R.h @@ -27,6 +27,8 @@ class SIMD_PhenotypicTargetHandler_R { std::vector<std::list<int16_t>> env_signals_list_; Vector_Fuzzy** targets_fuzzy_; + Vector_Fuzzy** targets_fuzzy_by_id_; + PhenotypicTargetVariationMethod var_method_; int16_t* list_env_id_; @@ -42,8 +44,6 @@ class SIMD_PhenotypicTargetHandler_R { int16_t sampling_; - Vector_Fuzzy** targets_fuzzy_by_id_; - std::shared_ptr<JumpingMT> var_prng_; bool hasChanged_ = false;