From 006f6a72f7da47228f71e7fa0990b6703aeff481 Mon Sep 17 00:00:00 2001 From: Matthew Andres Moreno Date: Mon, 16 Sep 2024 18:24:04 -0400 Subject: [PATCH] Remove old copied hack causing unwanted side effects --- avida-core/source/actions/DriverActions.cc | 6 +++++- .../tests/set_random_seed/expected/data/parasites1a.dat | 2 +- .../tests/set_random_seed/expected/data/parasites1b.dat | 2 +- .../tests/set_random_seed/expected/data/parasites2a.dat | 2 +- .../tests/set_random_seed/expected/data/parasites2b.dat | 2 +- .../tests/set_random_seed/expected/data/parasites3.dat | 2 +- .../tests/set_random_seed2/expected/data/parasites1a.dat | 2 +- .../tests/set_random_seed2/expected/data/parasites1b.dat | 2 +- .../tests/set_random_seed2/expected/data/parasites2a.dat | 2 +- .../tests/set_random_seed2/expected/data/parasites2b.dat | 2 +- .../tests/set_random_seed2/expected/data/parasites3.dat | 2 +- 11 files changed, 15 insertions(+), 11 deletions(-) diff --git a/avida-core/source/actions/DriverActions.cc b/avida-core/source/actions/DriverActions.cc index 41816a8db..903674c31 100644 --- a/avida-core/source/actions/DriverActions.cc +++ b/avida-core/source/actions/DriverActions.cc @@ -273,7 +273,11 @@ class cActionSetRandomSeed : public cAction { // When resetting the random seed, the timeslicer also needs to be rebuilt, since it may use the RNG // Resizing the cell grid triggers the reconstruction of the timeslicer, so... - m_world->GetPopulation().ResizeCellGrid(m_world->GetConfig().WORLD_X.Get(), m_world->GetConfig().WORLD_Y.Get()); + // @MAM 2024-09 - Removed this line when copying code from + // Avida::Viewer::Driver::SetRandomSeed + // because it was causing populations in Bhaskar's experiments to freeze. + // I'm not sure why it was here in the first place.... + // m_world->GetPopulation().ResizeCellGrid(m_world->GetConfig().WORLD_X.Get(), m_world->GetConfig().WORLD_Y.Get()); } protected: diff --git a/avida-core/tests/set_random_seed/expected/data/parasites1a.dat b/avida-core/tests/set_random_seed/expected/data/parasites1a.dat index 132031158..55bc4ee1e 100644 --- a/avida-core/tests/set_random_seed/expected/data/parasites1a.dat +++ b/avida-core/tests/set_random_seed/expected/data/parasites1a.dat @@ -1,5 +1,5 @@ # Avida Dominant Parasite Data -# Mon Sep 16 14:34:19 2024 +# Mon Sep 16 18:18:48 2024 # 1: Update # 2: Number of Extant Parasites diff --git a/avida-core/tests/set_random_seed/expected/data/parasites1b.dat b/avida-core/tests/set_random_seed/expected/data/parasites1b.dat index 99f6b78a4..64504bf70 100644 --- a/avida-core/tests/set_random_seed/expected/data/parasites1b.dat +++ b/avida-core/tests/set_random_seed/expected/data/parasites1b.dat @@ -1,5 +1,5 @@ # Avida Dominant Parasite Data -# Mon Sep 16 14:34:27 2024 +# Mon Sep 16 18:18:56 2024 # 1: Update # 2: Number of Extant Parasites diff --git a/avida-core/tests/set_random_seed/expected/data/parasites2a.dat b/avida-core/tests/set_random_seed/expected/data/parasites2a.dat index 7493d41c0..232fef213 100644 --- a/avida-core/tests/set_random_seed/expected/data/parasites2a.dat +++ b/avida-core/tests/set_random_seed/expected/data/parasites2a.dat @@ -1,5 +1,5 @@ # Avida Dominant Parasite Data -# Mon Sep 16 14:34:30 2024 +# Mon Sep 16 18:18:59 2024 # 1: Update # 2: Number of Extant Parasites diff --git a/avida-core/tests/set_random_seed/expected/data/parasites2b.dat b/avida-core/tests/set_random_seed/expected/data/parasites2b.dat index b75f24b3a..377dfaf47 100644 --- a/avida-core/tests/set_random_seed/expected/data/parasites2b.dat +++ b/avida-core/tests/set_random_seed/expected/data/parasites2b.dat @@ -1,5 +1,5 @@ # Avida Dominant Parasite Data -# Mon Sep 16 14:34:37 2024 +# Mon Sep 16 18:19:08 2024 # 1: Update # 2: Number of Extant Parasites diff --git a/avida-core/tests/set_random_seed/expected/data/parasites3.dat b/avida-core/tests/set_random_seed/expected/data/parasites3.dat index 3135b6c34..c888cdfe9 100644 --- a/avida-core/tests/set_random_seed/expected/data/parasites3.dat +++ b/avida-core/tests/set_random_seed/expected/data/parasites3.dat @@ -1,5 +1,5 @@ # Avida Dominant Parasite Data -# Mon Sep 16 14:34:37 2024 +# Mon Sep 16 18:19:08 2024 # 1: Update # 2: Number of Extant Parasites diff --git a/avida-core/tests/set_random_seed2/expected/data/parasites1a.dat b/avida-core/tests/set_random_seed2/expected/data/parasites1a.dat index 9424d7bd8..05d289e0a 100644 --- a/avida-core/tests/set_random_seed2/expected/data/parasites1a.dat +++ b/avida-core/tests/set_random_seed2/expected/data/parasites1a.dat @@ -1,5 +1,5 @@ # Avida Dominant Parasite Data -# Mon Sep 16 14:52:23 2024 +# Mon Sep 16 18:19:10 2024 # 1: Update # 2: Number of Extant Parasites diff --git a/avida-core/tests/set_random_seed2/expected/data/parasites1b.dat b/avida-core/tests/set_random_seed2/expected/data/parasites1b.dat index 1409e53f8..5f4967b3a 100644 --- a/avida-core/tests/set_random_seed2/expected/data/parasites1b.dat +++ b/avida-core/tests/set_random_seed2/expected/data/parasites1b.dat @@ -1,5 +1,5 @@ # Avida Dominant Parasite Data -# Mon Sep 16 14:52:34 2024 +# Mon Sep 16 18:19:19 2024 # 1: Update # 2: Number of Extant Parasites diff --git a/avida-core/tests/set_random_seed2/expected/data/parasites2a.dat b/avida-core/tests/set_random_seed2/expected/data/parasites2a.dat index d8daaec9d..67338f551 100644 --- a/avida-core/tests/set_random_seed2/expected/data/parasites2a.dat +++ b/avida-core/tests/set_random_seed2/expected/data/parasites2a.dat @@ -1,5 +1,5 @@ # Avida Dominant Parasite Data -# Mon Sep 16 14:52:37 2024 +# Mon Sep 16 18:19:23 2024 # 1: Update # 2: Number of Extant Parasites diff --git a/avida-core/tests/set_random_seed2/expected/data/parasites2b.dat b/avida-core/tests/set_random_seed2/expected/data/parasites2b.dat index bee1e1622..3af5b7eb7 100644 --- a/avida-core/tests/set_random_seed2/expected/data/parasites2b.dat +++ b/avida-core/tests/set_random_seed2/expected/data/parasites2b.dat @@ -1,5 +1,5 @@ # Avida Dominant Parasite Data -# Mon Sep 16 14:52:46 2024 +# Mon Sep 16 18:19:31 2024 # 1: Update # 2: Number of Extant Parasites diff --git a/avida-core/tests/set_random_seed2/expected/data/parasites3.dat b/avida-core/tests/set_random_seed2/expected/data/parasites3.dat index 4941c7d51..8b8f37d5e 100644 --- a/avida-core/tests/set_random_seed2/expected/data/parasites3.dat +++ b/avida-core/tests/set_random_seed2/expected/data/parasites3.dat @@ -1,5 +1,5 @@ # Avida Dominant Parasite Data -# Mon Sep 16 14:52:46 2024 +# Mon Sep 16 18:19:31 2024 # 1: Update # 2: Number of Extant Parasites