#44 cutom gen_creator added to the Application constructor parameters

Author: raulopez0

MLC/Application.py

@@ -19,7 +19,7 @@ class MLC_CALLBACKS:
 
 class Application(object):
 
-    def __init__(self, simulation, callbacks={}):
+    def __init__(self, simulation, callbacks={}, gen_creator=None):
         self._config = Config.get_instance()
 
         self._simulation = simulation
@@ -38,8 +38,11 @@ def __init__(self, simulation, callbacks={}):
         self.__badvalues_elim = self._config.get('EVALUATOR', 'badvalues_elim')
 
         # Gen creator
-        gen_method = self._config.get('GP', 'generation_method')
-        self._gen_creator = CreationFactory.make(gen_method)
+        if gen_creator is None:
+            gen_method = self._config.get('GP', 'generation_method')
+            self._gen_creator = CreationFactory.make(gen_method)
+        else:
+            self._gen_creator = gen_creator
 
         # Gen evaluator
         ev_method = self._config.get('EVALUATOR', 'evaluation_method')

MLC/Population/Creation/IndividualSelection.py

@@ -7,7 +7,9 @@ class IndividualSelection(BaseCreation):
     Fill a Population with fixed Individuals.
 
     selected_individuals: dictionary containing {Individual: positions inside
-    the population}
+    the first population}
+
+    Empty positions inside the Population will be completed using the neighbor individual,
     """
 
     def __init__(self, selected_individuals):
@@ -18,13 +20,14 @@ def __init__(self, selected_individuals):
     def create(self, gen_size):
         self.__individuals = [-1]*gen_size
 
+        # 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)
-                    print ">>> ADDING %s to %s -> %s" % (individual.get_value(), individual_id, individual_id)
                     self.__individuals[position] = individual_id
 
+        # Fill empty spaces
         for index, indiv_id in enumerate(self.__individuals):
             if indiv_id == -1:
                 if index > 0:

tests/default_test_configuration.ini

@@ -51,7 +51,7 @@ cascade = 1,1
 # evaluation_method = standalone_function
 # evaluation_method = standalone_files
 evaluation_method = mfile_standalone
-evaluation_function = toy_problem
+evaluation_function = toy_problem_python_ev
 # evaluation_function = toy_problem_python_ev
 indfile = ind.dat
 Jfile = J.dat

tests/mlc/test_application.py

@@ -2,6 +2,7 @@
 import os
 import unittest
 
+from MLC.Population.Creation import BaseCreation
 from tests.test_helpers import TestHelper
 from MLC.config import get_working_directory
 from MLC.config import get_test_path
@@ -106,3 +107,34 @@ def test_on_start_callback_increment_2():
 
             self.assertEqual(ApplicationTest.on_start, 1)
             self.assertEqual(ApplicationTest.on_start_counter_2, 1)
+
+    def test_set_custom_gen_creator(self):
+        with saved(Config.get_instance()) as config:
+            Config.get_instance().set("POPULATION", "size", "5")
+            Config.get_instance().set("BEHAVIOUR", "save", "false")
+
+            from MLC.Population.Creation.BaseCreation import BaseCreation
+            from MLC.individual.Individual import Individual
+
+            class TestCreator(BaseCreation):
+                def __init__(self):
+                    BaseCreation.__init__(self)
+
+                def create(self, gen_size):
+                    MLCRepository.get_instance().add_individual(Individual("(root 1)"))
+                    MLCRepository.get_instance().add_individual(Individual("(root 2)"))
+                    MLCRepository.get_instance().add_individual(Individual("(root 3)"))
+                    MLCRepository.get_instance().add_individual(Individual("(root 4)"))
+                    MLCRepository.get_instance().add_individual(Individual("(root 5)"))
+
+                def individuals(self):
+                    return [(0, 1), (1, 2), (2, 3), (3, 4), (4, 5)]
+
+            simulation = Simulation("")
+            mlc = Application(simulation, gen_creator=TestCreator())
+            mlc.go(to_generation=1)
+
+            # Assert first Population was filled using the TestCreator
+            population = MLCRepository.get_instance().get_population(1)
+            self.assertEqual(population.get_individuals(), [1, 2, 3, 4, 5])
+