From 8dfc2027ffdea9f982f284884f6afdbe22dccd78 Mon Sep 17 00:00:00 2001
From: ROUZAUD-CORNABAS Jonathan <jonathan.rouzaud-cornabas@inria.fr>
Date: Mon, 12 Oct 2020 11:38:38 +0200
Subject: [PATCH] [RAevol7] Fix merge with Aevol_7 and RAevol_7
---
src/libaevol/7/List_Metadata.cpp | 2 +-
src/libaevol/7/List_Metadata.h | 2 +-
src/libaevol/population/Selection.cpp | 7 -------
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/libaevol/7/List_Metadata.cpp b/src/libaevol/7/List_Metadata.cpp
index 5bf286b78..bc4a60a52 100644
--- a/src/libaevol/7/List_Metadata.cpp
+++ b/src/libaevol/7/List_Metadata.cpp
@@ -899,7 +899,7 @@ namespace aevol {
int prot_idx=0;
for (auto prot : proteins_) {
if (prot->is_init_)
- printf("%d -- SIMD -- Protein %d : %.18e\n",step,prot->protein_start,prot->e);
+ printf("SIMD -- Protein %d : %.18e\n",prot->protein_start,prot->e);
prot_idx++;
}
}
diff --git a/src/libaevol/7/List_Metadata.h b/src/libaevol/7/List_Metadata.h
index e239362ac..4d96deb97 100644
--- a/src/libaevol/7/List_Metadata.h
+++ b/src/libaevol/7/List_Metadata.h
@@ -145,7 +145,7 @@ namespace aevol {
void proteins_resize(int resize) override;
void proteins_clear() override;
- void proteins_print(int step = -1);
+ void proteins_print();
/*** Promoters ***/
void lst_promoters(bool lorl,
diff --git a/src/libaevol/population/Selection.cpp b/src/libaevol/population/Selection.cpp
index 6a14d2cf3..71103a956 100644
--- a/src/libaevol/population/Selection.cpp
+++ b/src/libaevol/population/Selection.cpp
@@ -147,7 +147,6 @@ void Selection::step_to_next_generation() {
#pragma omp single
{
- to_evaluate.clear();
// To create the new generation, we must create nb_indivs new individuals
// (offspring) and "kill" the existing ones.
// The number of offspring on a given individual will be given by a stochastic
@@ -313,13 +312,7 @@ void Selection::step_to_next_generation() {
-
#pragma omp for schedule(dynamic) private(x,y,what)
- for (int32_t index = 0; index < grid_width * grid_height; index++) {
- x = index / grid_height;
- y = index % grid_height;
-
- do_replication(reproducers[x][y],
x * grid_height + y, what, x, y);
#ifdef __DETECT_CLONE
--
GitLab