Added the first individuals to the experiment

* If there are individuals to be inserted in the first population,
  a custom gen_creator is created and set as a parameter to the MLCLocal
  model class #48

Author: Ezequiel Torres

MLC/GUI/Experiment/ExperimentInProgress.py

@@ -210,7 +210,8 @@ class ExperimentInProgress(Thread):
 
     def __init__(self, mlc_local, experiment_name,
                  to_gen, from_gen, chart_params,
-                 parent_signal, parent=None):
+                 parent_signal, gen_creator=None,
+                 parent=None):
         Thread.__init__(self)
 
         self._mlc_local = mlc_local
@@ -247,11 +248,15 @@ def __init__(self, mlc_local, experiment_name,
         self._dialog.add_experiment_data(self._amount_gens, self._indivs_per_gen)
         self._dialog.show()
 
+        # Individuals to be inserted in the first generation
+        self._gen_creator = gen_creator
+
     def run(self):
         logger.debug('{0} [RUN] - Executing Thread mainloop'.format(self._log_prefix))
         try:
             self._mlc_local.go(self._experiment_name, self._to_gen,
-                               self._from_gen, self._callbacks)
+                               self._from_gen, self._callbacks,
+                               self._gen_creator)
         except ThreadCancelException, err:
             logger.info('{0} [RUN] - Thread was cancelled by the user'
                         .format(self._log_prefix))

MLC/GUI/Experiment/ExperimentWindow.py

@@ -117,10 +117,12 @@ def on_start_button_clicked(self):
         to_gen = int(self._autogenerated_object.to_gen_combo.currentText())
         number_of_gens = self._mlc_local.get_experiment_info(self._experiment_name)["generations"]
 
+        gen_creator = None
         if number_of_gens == 0:
             from_gen = 0
             # Hide the first individuals tab
             self._autogenerated_object.tabWidget.setTabEnabled(3, False)
+            gen_creator = self._first_indivs_manager.get_gen_creator()
 
         # Check if the experiment range is ok
         if to_gen <= from_gen:
@@ -157,7 +159,8 @@ def on_start_button_clicked(self):
                                                to_gen=to_gen,
                                                from_gen=from_gen,
                                                chart_params=self._chart_conf.chart_params(),
-                                               parent_signal=self.experiment_finished)
+                                               parent_signal=self.experiment_finished,
+                                               gen_creator=gen_creator)
 
         progress_dialog.start()
         self._progress_dialog = progress_dialog
@@ -469,7 +472,7 @@ def _db_view_edited(self, left, right):
                         'Edition was canceled. Cell({1}, {2}) - Old value: {3}'
                         .format(self._experiment_name, left.row(),
                                 left.column(), old_value))
-            table_model.set_data(left.row(), left.column(), str(old_value))
+            table_model.set_data(left.row(), left.column(), old_value)
         else:
             value = table_model.get_data(left.row(), left.column())
 
@@ -484,7 +487,7 @@ def _db_view_edited(self, left, right):
                     old_value = self._get_db_view_stored_value(model_index=left,
                                                                table_model=table_model,
                                                                indiv_id=indiv_id)
-                    table_model.set_data(left.row(), left.column(), str(old_value))
+                    table_model.set_data(left.row(), left.column(), old_value)
                     return
 
                 logger.info('[EXPERIMENT {0}] [DB_VIEW_EDITED] - '
@@ -532,7 +535,7 @@ def _update_individuals_per_generation_list(self):
 
             for pop_index in xrange(1, indivs_per_gen + 1):
                 indiv_index = pop_individuals[pop_index - 1]
-                indiv_cost = str(costs[pop_index - 1])
+                indiv_cost = costs[pop_index - 1]
                 indiv_value = individuals[indiv_index].get_value()
                 indiv_appearences = individuals[indiv_index].get_appearances()
 
@@ -552,7 +555,9 @@ def _load_experiment_config(self):
         config_table = self._autogenerated_object.config_table
         config_table.setModel(table_model)
         config_table.resizeColumnsToContents()
+        # config_table.setVisible(False)
         config_table.setSortingEnabled(True)
+        # config_table.setVisible(True)
         config_table.setEditTriggers(QAbstractItemView.DoubleClicked)
         table_model.set_editable_columns(editable_columns)
         table_model.set_data_changed_callback(self._config_table_edited)
@@ -605,6 +610,7 @@ def _update_experiment_info(self):
             db_view = self._autogenerated_object.db_view
             db_view.setModel(table_model)
             db_view.resizeColumnsToContents()
+            db_view.resizeColumnsToContents()
             db_view.setSortingEnabled(True)
             table_model.set_editable_columns(editable_columns)
             table_model.set_data_changed_callback(self._db_view_edited)

MLC/GUI/Experiment/FirstIndividualsManager.py

@@ -3,11 +3,15 @@
 from MLC.individual.Individual import Individual
 from MLC.mlc_parameters.mlc_parameters import Config
 from MLC.Population.Evaluation.EvaluatorFactory import EvaluatorFactory
+
+from MLC.Population.Creation.IndividualSelection import IndividualSelection
+from MLC.Population.Creation.CreationFactory import CreationFactory
 from PyQt5.QtWidgets import QInputDialog
 from PyQt5.QtWidgets import QMessageBox
 
 logger = get_gui_logger()
 
+
 class FirstIndividualsManager(object):
 
     def __init__(self, parent, experiment_name, autogenerated_object, mlc_local):
@@ -64,6 +68,27 @@ def modify_individual(self, indiv_index):
     def remove_individual(self, indiv_index):
         pass
 
+    def get_gen_creator(self):
+        """
+        Return an IndividualSelection creator if the user added individuals
+        manually. 
+        Return None if this was not the case
+        """
+        if not self._individuals:
+            logger.info("[FIRST_INDIV] No individual")
+            return None
+
+        gen_method = Config.get_instance().get('GP', 'generation_method')
+        fill_creator = CreationFactory.make(gen_method)
+
+        # Creat the dictionary of individuals
+        indivs_dict = {}
+        for index in xrange(len(self._individuals)):
+            indiv = Individual(self._individuals[index])
+            indivs_dict[indiv] = [index]
+
+        return IndividualSelection(indivs_dict, fill_creator)
+
     def _load_table(self):
         header = ['Index', 'Value']
 
@@ -78,9 +103,11 @@ def _load_table(self):
                                        parent=self._parent)
 
         self._first_indivs_table.setModel(table_model)
+        self._first_indivs_table.setDisabled(False)
+        self._first_indivs_table.setVisible(False)
         self._first_indivs_table.resizeColumnsToContents()
+        self._first_indivs_table.setVisible(True)
         self._first_indivs_table.setSortingEnabled(True)
-        self._first_indivs_table.setDisabled(False)
 
     def _test_individual_value(self, indiv_value):
         """

MLC/GUI/Tables/ConfigTableModel.py

@@ -110,7 +110,3 @@ def get_data(self, row, col):
 
     def set_data_changed_callback(self, callback):
         self.dataChanged.connect(callback)
-
-    def update_layout(self):
-        self.layoutAboutToBeChanged.emit()
-        self.layoutChanged.emit()

MLC/api/MLCLocal.py

@@ -219,7 +219,8 @@ def get_experiment_info(self, experiment_name):
             experiment_info["best_indiv_value"] = min_indiv_data.get_value()
         return experiment_info
 
-    def go(self, experiment_name, to_generation, from_generation=0, callbacks={}):
+    def go(self, experiment_name, to_generation, from_generation=0, 
+           callbacks={}, gen_creator=None):
         if experiment_name not in self._experiments:
             raise ExperimentNotExistException(experiment_name)
 
@@ -231,7 +232,7 @@ def go(self, experiment_name, to_generation, from_generation=0, callbacks={}):
         simulation = experiment.get_simulation()
 
         # launch simulation
-        app = Application(simulation, callbacks=callbacks)
+        app = Application(simulation, callbacks=callbacks, gen_creator=gen_creator)
         app.go(from_generation=from_generation, to_generation=to_generation)
 
         return True

MLC/api/mlc.py

@@ -157,12 +157,15 @@ def set_experiment_configuration(self, experiment_name, configuration):
         """
         raise NotImplementedError("MLC::set_experiment_configuration not implemented")
 
-    def go(self, experiment_name, to_generation, from_generation=None):
+    def go(self, experiment_name, to_generation,
+           from_generation=0, callbacks={}, gen_creator=None):
         """
             Execute experiments until to_generation generations are reached.
             :param experiment_name:
             :param to_generation: final generation.
             :param from_generation: initial generation.
+            :param callbacks: Callbacks to be triggered in special moments of the experiment
+            :param gen_creator: Modified gen_creator to add individuals manually
             :return:
         """
         raise NotImplementedError("MLC::go not implemented")