From 27f08a31ef6ff9fcd95369d3fae47e9ce9cc1056 Mon Sep 17 00:00:00 2001
From: ROUZAUD-CORNABAS Jonathan <jonathan.rouzaud-cornabas@inria.fr>
Date: Tue, 9 Jul 2019 15:01:26 +0200
Subject: [PATCH] Working and reproduceable vanilla parallel version
---
src/libaevol/ExpManager.cpp | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/libaevol/ExpManager.cpp b/src/libaevol/ExpManager.cpp
index c31673c01..b7497b533 100644
--- a/src/libaevol/ExpManager.cpp
+++ b/src/libaevol/ExpManager.cpp
@@ -668,7 +668,7 @@ void ExpManager::run_evolution() {
bool first_run = true;
//"Post Treatment"
- if(anc_stat_) {
+ if(anc_stat_ && record_light_tree()) {
output_m_->light_tree()->setup_anc_stat();
}
@@ -677,7 +677,8 @@ void ExpManager::run_evolution() {
output_m_->stats()->add_indivs(AeTime::time(), indivs());
- simd_individual->run_a_step(best_indiv()->w_max(),selection_pressure(),false);
+ if (SIMD_Individual::standalone_simd)
+ simd_individual->run_a_step(best_indiv()->w_max(),selection_pressure(),false);
// For each generation
@@ -740,7 +741,7 @@ void ExpManager::run_evolution() {
#ifdef __X11
display();
#endif
- if (with_mrca_) {
+ if (with_mrca_ && record_light_tree()) {
if (AeTime::time() == t_end_) {
output_m_->light_tree()->keep_indivs(indivs());
}
@@ -773,9 +774,9 @@ void ExpManager::run_evolution() {
#endif
output_m_->flush();
- if(with_mrca_)
+ if(with_mrca_ && record_light_tree())
output_m_->light_tree()->save_mrca_indiv();
- if(anc_stat_)
+ if(anc_stat_ && record_light_tree())
output_m_->light_tree()->close_anc_stat();
printf("================================================================\n");
--
GitLab