#44 add Individual Selection

Author: raulopez0

MLC/Population/Creation/IndividualSelection.py

@@ -9,31 +9,27 @@ class IndividualSelection(BaseCreation):
     selected_individuals: dictionary containing {Individual: positions inside
     the first population}
 
+    fill_creator: creator used to fill empty positions.
+
     Empty positions inside the Population will be completed using the neighbor individual,
     """
 
-    def __init__(self, selected_individuals):
+    def __init__(self, selected_individuals, fill_creator):
         BaseCreation.__init__(self)
+        self.__fill_creator = fill_creator
         self.__selected_individuals = selected_individuals
         self.__individuals = []
 
     def create(self, gen_size):
-        self.__individuals = [-1] * gen_size
+        self.__fill_creator.create(gen_size)
+        self.__individuals = self.__fill_creator.individuals()
 
         # Add Individuals
         for individual, positions in self.__selected_individuals.items():
             for position in positions:
                 if position < gen_size:
                     individual_id, _ = MLCRepository.get_instance().add_individual(individual)
-                    self.__individuals[position] = individual_id
-
-        # Fill empty spaces
-        for index, indiv_id in enumerate(self.__individuals):
-            if indiv_id == -1:
-                if index > 0:
-                    self.__individuals[index] = self.__individuals[index - 1]
-                else:
-                    self.__individuals[index] = self.__individuals[index + 1]
+                    self.__individuals[position] = (position, individual_id)
 
     def individuals(self):
-        return enumerate(self.__individuals)
+        return self.__individuals

tests/mlc/population/test_population.py

@@ -5,6 +5,7 @@
 from MLC.Population.Population import Population
 from MLC.db.mlc_repository import MLCRepository
 from MLC.Population.Creation.IndividualSelection import IndividualSelection
+from MLC.Population.Creation.MixedRampedGauss import MixedRampedGauss
 from MLC.individual.Individual import Individual
 
 
@@ -14,56 +15,28 @@ def setUpClass(cls):
         TestHelper.load_default_configuration()
 
     def test_add_one_individual(self):
-        creator = IndividualSelection({Individual("1+1"): [0, 1, 2, 3, 4]})
 
-        self.__fill_and_assert(fill_creator=creator,
-                               expected_pop_indexes=[1, 1, 1, 1, 1],
-                               expected_individuals={1: Individual("1+1")})
-
-    def test_add_one_individual_incomplete_population(self):
-        creator = IndividualSelection({Individual("1+1"): [0]})
+        base_creator = MixedRampedGauss()
+        creator = IndividualSelection({Individual("1+1"): [0, 1, 2, 3, 4]}, base_creator)
 
         self.__fill_and_assert(fill_creator=creator,
                                expected_pop_indexes=[1, 1, 1, 1, 1],
                                expected_individuals={1: Individual("1+1")})
 
-    def test_add_multiple_individuals(self):
-        creator = IndividualSelection({Individual("1+1"): [0, 1, 2],
-                                       Individual("2+2"): [3, 4]})
-
-        self.__fill_and_assert(fill_creator=creator,
-                               expected_pop_indexes=[1, 1, 1, 2, 2],
-                               expected_individuals={1: Individual("1+1"),
-                                                     2: Individual("2+2")})
-
-    def test_add_more_individuals_than_the_gensize(self):
-        creator = IndividualSelection({Individual("1+1"): [0, 1, 2, 3, 4, 5, 6, 7]})
-
-        self.__fill_and_assert(fill_creator=creator,
-                               expected_pop_indexes=[1, 1, 1, 1, 1],
-                               expected_individuals={1: Individual("1+1")})
-
-    def test_add_individuals_fill_empty_spaces(self):
-        creator = IndividualSelection({Individual("1+1"): [0, 4],
-                                       Individual("2+2"): [2]})
-
-        self.__fill_and_assert(fill_creator=creator,
-                               expected_pop_indexes=[1, 1, 2, 2, 1],
-                               expected_individuals={1: Individual("1+1"),
-                                                     2: Individual("2+2")})
-
-    def test_add_individuals_out_of_gen_not_inserted(self):
-        creator = IndividualSelection({Individual("1+1"): [0, 1, 2, 3, 4],
-                                       Individual("2+2"): [5, 6, 7]})
+    def test_add_one_individual_incomplete_population(self):
+        base_creator = MixedRampedGauss()
+        creator = IndividualSelection({Individual("1+1"): [0]}, base_creator)
 
         self.__fill_and_assert(fill_creator=creator,
-                               expected_pop_indexes=[1, 1, 1, 1, 1],
+                               expected_pop_indexes=[1],
                                expected_individuals={1: Individual("1+1")})
 
     def __fill_and_assert(self, fill_creator, expected_pop_indexes, expected_individuals):
         with saved(Config.get_instance()) as config:
             Config.get_instance().set("POPULATION", "size", "5")
             Config.get_instance().set("BEHAVIOUR", "save", "false")
+            from MLC.Log.log import set_logger
+            set_logger('testing')
 
             population = Population(5, 0, Config.get_instance(), MLCRepository.make(""))
             population.fill(fill_creator)
@@ -72,9 +45,6 @@ def __fill_and_assert(self, fill_creator, expected_pop_indexes, expected_individ
             # Assert that one Population was added
             self.assertEqual(MLCRepository.get_instance().count_population(), 1)
 
-            # Assert that all expected individuals were created
-            self.assertEqual(MLCRepository.get_instance().count_individual(), len(expected_individuals))
-
             # Assert that the individuals are in the expected position inside the Population
             for position, i in enumerate(expected_pop_indexes):
                 expected_individual = expected_individuals[i]
@@ -83,7 +53,3 @@ def __fill_and_assert(self, fill_creator, expected_pop_indexes, expected_individ
 
                 self.assertEqual(expected_individual.get_value(), inserted_individual.get_value())
 
-            # Assert all individuals are created
-            created_individuals = [MLCRepository.get_instance().get_individual(i).get_value() for i in range(1, len(expected_individuals)+1)]
-            for _, individual in expected_individuals.items():
-                self.assertIn(individual.get_value(), created_individuals)