Fixing elitism parameter for random replacement

kataklinger · Mar 6, 2024 · 1f6c146 · 1f6c146
1 parent 2638ec1
commit 1f6c146
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/src/inc/replacement.hpp b/src/inc/replacement.hpp
@@ -66,7 +66,9 @@ class random {
   inline static constexpr fitness_tag_t fitness_tag{};
 
 public:
-  inline explicit random(generator_t& generator) noexcept
+  inline explicit random(
+      generator_t& generator,
+      countable_t<Elitism> /*unused*/) noexcept
       : generator_{&generator} {
   }
 
@@ -92,10 +94,10 @@ class random {
   generator_t* generator_;
 };
 
-template<typename Generator, std::size_t Elitism = 0>
+template<typename Generator, std::size_t Elitism>
 using random_raw = random<Generator, Elitism, raw_fitness_tag>;
 
-template<typename Generator, std::size_t Elitism = 0>
+template<typename Generator, std::size_t Elitism>
 using random_scaled = random<Generator, Elitism, scaled_fitness_tag>;
 
 template<typename FitnessTag>

diff --git a/src/scrap.cpp b/src/scrap.cpp
@@ -153,7 +153,7 @@ void test_ground() {
   gal::select::lineal_raw sl6{};
   sl6(p);
 
-  gal::replace::random_raw<std::mt19937, 2> ro1{gen};
+  gal::replace::random_raw ro1{gen, gal::countable<1>};
   ro1(p, std::vector<parent_replacement_t>{});
 
   gal::replace::worst<gal::raw_fitness_tag> ro2{};

diff --git a/tests/operations/population/replacement_tests.cpp b/tests/operations/population/replacement_tests.cpp
@@ -72,7 +72,7 @@ struct replacement_tests : public ::testing::Test {
 
 TEST_F(replacement_tests, random_raw_elitism_removed_count) {
   // arrange
-  gal::replace::random_raw<std::mt19937, 2> op{rng_};
+  gal::replace::random_raw op{rng_, gal::countable<2>};
 
   // act
   auto replaced = op(population_, offsprings_5_);
@@ -83,7 +83,7 @@ TEST_F(replacement_tests, random_raw_elitism_removed_count) {
 
 TEST_F(replacement_tests, random_raw_elitism_removed_content) {
   // arrange
-  gal::replace::random_raw<std::mt19937, 2> op{rng_};
+  gal::replace::random_raw op{rng_, gal::countable<2>};
 
   // act
   auto replaced = op(population_, offsprings_5_);
@@ -95,7 +95,7 @@ TEST_F(replacement_tests, random_raw_elitism_removed_content) {
 
 TEST_F(replacement_tests, random_raw_elitism_added_content) {
   // arrange
-  gal::replace::random_raw<std::mt19937, 2> op{rng_};
+  gal::replace::random_raw op{rng_, gal::countable<2>};
 
   // act
   op(population_, offsprings_5_);
@@ -107,7 +107,7 @@ TEST_F(replacement_tests, random_raw_elitism_added_content) {
 
 TEST_F(replacement_tests, random_scaled_elitism_removed_count) {
   // arrange
-  gal::replace::random_scaled<std::mt19937, 2> op{rng_};
+  gal::replace::random_scaled op{rng_, gal::countable<2>};
 
   // act
   auto replaced = op(population_, offsprings_5_);
@@ -118,7 +118,7 @@ TEST_F(replacement_tests, random_scaled_elitism_removed_count) {
 
 TEST_F(replacement_tests, random_scaled_elitism_removed_content) {
   // arrange
-  gal::replace::random_scaled<std::mt19937, 2> op{rng_};
+  gal::replace::random_scaled op{rng_, gal::countable<2>};
 
   // act
   auto replaced = op(population_, offsprings_5_);
@@ -130,7 +130,7 @@ TEST_F(replacement_tests, random_scaled_elitism_removed_content) {
 
 TEST_F(replacement_tests, random_scaled_elitism_added_content) {
   // arrange
-  gal::replace::random_scaled<std::mt19937, 2> op{rng_};
+  gal::replace::random_scaled op{rng_, gal::countable<2>};
 
   // act
   op(population_, offsprings_5_);
@@ -142,7 +142,7 @@ TEST_F(replacement_tests, random_scaled_elitism_added_content) {
 
 TEST_F(replacement_tests, random_raw_no_elitism_removed_count) {
   // arrange
-  gal::replace::random_raw op{rng_};
+  gal::replace::random_raw op{rng_, gal::countable<0>};
 
   // act
   auto replaced = op(population_, offsprings_5_);
@@ -153,7 +153,7 @@ TEST_F(replacement_tests, random_raw_no_elitism_removed_count) {
 
 TEST_F(replacement_tests, random_raw_no_elitism_removed_content) {
   // arrange
-  gal::replace::random_raw op{rng_};
+  gal::replace::random_raw op{rng_, gal::countable<0>};
 
   // act
   auto replaced = op(population_, offsprings_5_);
@@ -165,7 +165,7 @@ TEST_F(replacement_tests, random_raw_no_elitism_removed_content) {
 
 TEST_F(replacement_tests, random_raw_no_elitism_added_content) {
   // arrange
-  gal::replace::random_raw op{rng_};
+  gal::replace::random_raw op{rng_, gal::countable<0>};
 
   // act
   op(population_, offsprings_5_);
@@ -177,7 +177,7 @@ TEST_F(replacement_tests, random_raw_no_elitism_added_content) {
 
 TEST_F(replacement_tests, random_scaled_no_elitism_removed_count) {
   // arrange
-  gal::replace::random_scaled op{rng_};
+  gal::replace::random_scaled op{rng_, gal::countable<0>};
 
   // act
   auto replaced = op(population_, offsprings_5_);
@@ -188,7 +188,7 @@ TEST_F(replacement_tests, random_scaled_no_elitism_removed_count) {
 
 TEST_F(replacement_tests, random_scaled_no_elitism_removed_content) {
   // arrange
-  gal::replace::random_scaled op{rng_};
+  gal::replace::random_scaled op{rng_, gal::countable<0>};
 
   // act
   auto replaced = op(population_, offsprings_5_);
@@ -200,7 +200,7 @@ TEST_F(replacement_tests, random_scaled_no_elitism_removed_content) {
 
 TEST_F(replacement_tests, random_scaled_no_elitism_added_content) {
   // arrange
-  gal::replace::random_scaled op{rng_};
+  gal::replace::random_scaled op{rng_, gal::countable<0>};
 
   // act
   op(population_, offsprings_5_);