Added best indiv button and also added functionality to it

* Also added convergence and genealogy to the Experiment window
* Change a little bit the show_best to let the matplotlib window
  to be the modal window
* #36

Author: Ezequiel Torres

MLC/Application.py

@@ -18,8 +18,8 @@ class MLC_CALLBACKS:
 
 
 class Application(object):
+
     def __init__(self, simulation, callbacks={}):
-        self._set_numpy_parameters()
         self._config = Config.get_instance()
 
         self._simulation = simulation
@@ -67,7 +67,7 @@ def __init__(self, simulation, callbacks={}):
 
         # add callback to show best individual
         self.__callbacks_manager.subscribe(MLC_CALLBACKS.ON_NEW_GENERATION, self.show_best)
-        self.__display_best = False
+        self.__display_best = True
 
     def _set_numpy_parameters(self):
         # Set printable resolution (don't alter numpy interval resolution)
@@ -95,6 +95,7 @@ def go(self, to_generation, from_generation=None, display_best=False):
 
         :return:
         """
+        self._set_numpy_parameters()
         self.__display_best = display_best
 
         if from_generation is None:
@@ -103,8 +104,8 @@ def go(self, to_generation, from_generation=None, display_best=False):
         lg.logger_.info("Running MLC from generation %s to %s" % (from_generation, to_generation))
 
         if from_generation < self._mlc_repository.count_population():
-            lg.logger_.info("Generations %s to %s discarded" % (from_generation+1, self._mlc_repository.count_population()))
-            self._mlc_repository.remove_population_from(from_generation+1)
+            lg.logger_.info("Generations %s to %s discarded" % (from_generation + 1, self._mlc_repository.count_population()))
+            self._mlc_repository.remove_population_from(from_generation + 1)
 
         # emit app start event
         self.__callbacks_manager.on_event(MLC_CALLBACKS.ON_START)
@@ -127,9 +128,9 @@ def go(self, to_generation, from_generation=None, display_best=False):
             last_population = self._mlc_repository.get_population(last_generation)
 
             # obtain the next generation by evolving the lastone
-            lg.logger_.info("Evolving to Population %s using population %s" % (last_generation+1, last_generation))
+            lg.logger_.info("Evolving to Population %s using population %s" % (last_generation + 1, last_generation))
 
-            next_population = Simulation.create_empty_population_for(last_generation+1)
+            next_population = Simulation.create_empty_population_for(last_generation + 1)
             next_population = last_population.evolve(next_population)
 
             # continue with evolve if there are duplicated individuals
@@ -144,13 +145,16 @@ def go(self, to_generation, from_generation=None, display_best=False):
             self._mlc_repository.add_population(next_population)
 
             # emit new generation event
-            self.__callbacks_manager.on_event(MLC_CALLBACKS.ON_NEW_GENERATION, last_generation+1)
+            self.__callbacks_manager.on_event(MLC_CALLBACKS.ON_NEW_GENERATION, last_generation + 1)
 
         lg.logger_.info("MLC Simulation Finished")
 
         # emit app finish event
         self.__callbacks_manager.on_event(MLC_CALLBACKS.ON_FINISH)
 
+        # Return the numpy warning configuration to its original value
+        np.seterr(all='warn')
+
     def get_simulation(self):
         return self._simulation
 
@@ -196,7 +200,11 @@ def show_best(self, generation_number):
             population = self._mlc_repository.get_population(generation_number)
             best_index, best_indiv, cost = population.get_best_individual()
 
-            EvaluatorFactory.get_callback().show_best(best_index, best_indiv, cost, stop_on_graph)
+            EvaluatorFactory.get_callback().show_best(index=best_index,
+                                                      indiv=best_indiv,
+                                                      cost=cost,
+                                                      generation=generation_number,
+                                                      block=stop_on_graph)
 
     def _project_validations(self):
         # Check that the evaluation and preevaluation modules can be loaded
@@ -205,6 +213,7 @@ def _project_validations(self):
 
 
 class MLCCallbacksManager:
+
     def __init__(self):
         self.__callbacks = {}
 
@@ -222,4 +231,4 @@ def on_event(self, event_type, *args, **kwargs):
             return
 
         for callback in self.__callbacks[event_type]:
-            callback(*args, **kwargs)
+            callback(*args, **kwargs)

MLC/GUI/Autogenerated/autogenerated.py

@@ -223,9 +223,6 @@ def setupUi(self, ExperimentInProgressDialog):
         self.picture_groupBox.setObjectName("picture_groupBox")
         self.picture_layout = QtWidgets.QVBoxLayout(self.picture_groupBox)
         self.picture_layout.setObjectName("picture_layout")
-        self.log_check = QtWidgets.QCheckBox(self.picture_groupBox)
-        self.log_check.setObjectName("log_check")
-        self.picture_layout.addWidget(self.log_check)
         self.indiv_chart = QtWidgets.QTextEdit(self.picture_groupBox)
         self.indiv_chart.setObjectName("indiv_chart")
         self.picture_layout.addWidget(self.indiv_chart)
@@ -267,8 +264,7 @@ def retranslateUi(self, ExperimentInProgressDialog):
         self.gen_label.setText(_translate("ExperimentInProgressDialog", "TextLabel"))
         self.indiv_label.setText(_translate("ExperimentInProgressDialog", "TextLabel"))
         self.picture_groupBox.setTitle(_translate("ExperimentInProgressDialog", "Individuals\' Costs"))
-        self.log_check.setText(_translate("ExperimentInProgressDialog", "Log Scale"))
-        self.cancel_button.setText(_translate("ExperimentInProgressDialog", "Stop Experiment"))
+        self.cancel_button.setText(_translate("ExperimentInProgressDialog", "Cancel Experiment"))
 
 # -*- coding: utf-8 -*-
 
@@ -314,6 +310,11 @@ def setupUi(self, Experiment):
         self.textEdit.setObjectName("textEdit")
         self.chart_conf_layout.addWidget(self.textEdit)
         self.verticalLayout_4.addWidget(self.chart_conf_frame)
+        self.line = QtWidgets.QFrame(self.frame_4)
+        self.line.setFrameShape(QtWidgets.QFrame.HLine)
+        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+        self.line.setObjectName("line")
+        self.verticalLayout_4.addWidget(self.line)
         self.groupBox_7 = QtWidgets.QGroupBox(self.frame_4)
         self.groupBox_7.setObjectName("groupBox_7")
         self.gridLayout_6 = QtWidgets.QGridLayout(self.groupBox_7)
@@ -379,11 +380,6 @@ def setupUi(self, Experiment):
         self.points_combo.setObjectName("points_combo")
         self.gridLayout_6.addWidget(self.points_combo, 9, 1, 1, 1)
         self.verticalLayout_4.addWidget(self.groupBox_7)
-        self.line = QtWidgets.QFrame(self.frame_4)
-        self.line.setFrameShape(QtWidgets.QFrame.HLine)
-        self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
-        self.line.setObjectName("line")
-        self.verticalLayout_4.addWidget(self.line)
         self.horizontalLayout_2.addWidget(self.frame_4)
         self.frame_3 = QtWidgets.QFrame(self.experiment_tab)
         self.frame_3.setFrameShape(QtWidgets.QFrame.StyledPanel)
@@ -539,6 +535,20 @@ def setupUi(self, Experiment):
         self.pushButton_8.setObjectName("pushButton_8")
         self.verticalLayout_13.addWidget(self.pushButton_8)
         self.verticalLayout_11.addWidget(self.groupBox_3)
+        self.groupBox_8 = QtWidgets.QGroupBox(self.right_menu_frame)
+        self.groupBox_8.setObjectName("groupBox_8")
+        self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.groupBox_8)
+        self.verticalLayout_5.setObjectName("verticalLayout_5")
+        self.best_indiv_button = QtWidgets.QPushButton(self.groupBox_8)
+        self.best_indiv_button.setObjectName("best_indiv_button")
+        self.verticalLayout_5.addWidget(self.best_indiv_button)
+        self.convergence_button = QtWidgets.QPushButton(self.groupBox_8)
+        self.convergence_button.setObjectName("convergence_button")
+        self.verticalLayout_5.addWidget(self.convergence_button)
+        self.genealogy_button = QtWidgets.QPushButton(self.groupBox_8)
+        self.genealogy_button.setObjectName("genealogy_button")
+        self.verticalLayout_5.addWidget(self.genealogy_button)
+        self.verticalLayout_11.addWidget(self.groupBox_8)
         spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
         self.verticalLayout_11.addItem(spacerItem1)
         self.horizontalLayout_5.addWidget(self.right_menu_frame)
@@ -587,7 +597,7 @@ def setupUi(self, Experiment):
         Experiment.setCentralWidget(self.centralWidget)
 
         self.retranslateUi(Experiment)
-        self.tabWidget.setCurrentIndex(0)
+        self.tabWidget.setCurrentIndex(1)
         self.next_gen_button.clicked.connect(Experiment.on_next_gen_button_clicked)
         self.save_config_button.clicked.connect(Experiment.on_save_config_button_clicked)
         self.dimension_check.clicked.connect(Experiment.on_dimension_check_clicked)
@@ -609,6 +619,9 @@ def setupUi(self, Experiment):
         self.min_cost_combo.currentTextChanged['QString'].connect(Experiment.on_chart_config_changed)
         self.max_cost_combo.currentTextChanged['QString'].connect(Experiment.on_chart_config_changed)
         self.nan_color_combo.currentTextChanged['QString'].connect(Experiment.on_chart_config_changed)
+        self.genealogy_button.clicked.connect(Experiment.on_genealogy_button_clicked)
+        self.best_indiv_button.clicked.connect(Experiment.on_best_indiv_button_clicked)
+        self.convergence_button.clicked.connect(Experiment.on_convergence_button_clicked)
         # QtCore.QMetaObject.connectSlotsByName(Experiment)
 
     def retranslateUi(self, Experiment):
@@ -649,6 +662,10 @@ def retranslateUi(self, Experiment):
         self.pushButton_3.setText(_translate("Experiment", "Create"))
         self.pushButton_4.setText(_translate("Experiment", "Cut"))
         self.pushButton_8.setText(_translate("Experiment", "Import"))
+        self.groupBox_8.setTitle(_translate("Experiment", "Graphics"))
+        self.best_indiv_button.setText(_translate("Experiment", "Best Individual"))
+        self.convergence_button.setText(_translate("Experiment", "Convergence"))
+        self.genealogy_button.setText(_translate("Experiment", "Genealogy"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("Experiment", "Results"))
         self.groupBox.setTitle(_translate("Experiment", "Experiment properties"))
         self.import_config_button.setText(_translate("Experiment", "Import"))

MLC/GUI/Autogenerated/untitled/experiment.ui

@@ -477,6 +477,36 @@
              </layout>
             </widget>
            </item>
+           <item>
+            <widget class="QGroupBox" name="groupBox_8">
+             <property name="title">
+              <string>Graphics</string>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_5">
+              <item>
+               <widget class="QPushButton" name="best_indiv_button">
+                <property name="text">
+                 <string>Best Individual</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="convergence_button">
+                <property name="text">
+                 <string>Convergence</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="genealogy_button">
+                <property name="text">
+                 <string>Genealogy</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
            <item>
             <spacer name="verticalSpacer">
              <property name="orientation">
@@ -921,6 +951,54 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>genealogy_button</sender>
+   <signal>clicked()</signal>
+   <receiver>Experiment</receiver>
+   <slot>on_genealogy_button_clicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>835</x>
+     <y>488</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>480</x>
+     <y>273</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>best_indiv_button</sender>
+   <signal>clicked()</signal>
+   <receiver>Experiment</receiver>
+   <slot>on_best_indiv_button_clicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>835</x>
+     <y>433</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>480</x>
+     <y>273</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>convergence_button</sender>
+   <signal>clicked()</signal>
+   <receiver>Experiment</receiver>
+   <slot>on_convergence_button_clicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>835</x>
+     <y>461</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>480</x>
+     <y>273</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>on_closed_dialog()</slot>
@@ -940,5 +1018,8 @@
   <slot>on_preev_edit_button_clicked()</slot>
   <slot>on_gen_count_combo_changed(QString)</slot>
   <slot>on_chart_config_changed(QString)</slot>
+  <slot>on_best_indiv_button_clicked()</slot>
+  <slot>on_convergence_button_clicked()</slot>
+  <slot>on_genealogy_button_clicked()</slot>
  </slots>
 </ui>

MLC/GUI/Experiment/ExperimentDialog.py

@@ -242,6 +242,16 @@ def on_chart_config_changed(self, value_changed):
                      .format(self._experiment_name))
         self._chart_conf.update_chart()
 
+    def on_best_indiv_button_clicked(self):
+        logger.debug('[EXPERIMENT {0}] [BEST_INDIV_BUTTON] - Executing on_best_indiv_button_clicked function')
+        self._mlc_local.show_best(self._experiment_name, self._current_gen)
+
+    def on_convergence_button_clicked(self):
+        logger.debug('[EXPERIMENT {0}] [CONVERGENCE_BUTTON] - Executing on_convergence_button_clicked function')
+
+    def on_genealogy_button_clicked(self):
+        logger.debug('[EXPERIMENT {0}] [GENEALOGY_BUTTON] - Executing on_genealogy_button_clicked function')
+
     def _config_table_edited(self, left, right):
         config_table = self._autogenerated_object.config_table
         table_model = config_table.model()
@@ -281,8 +291,8 @@ def _db_view_edited(self, left, right):
         indiv_id = int(table_model.get_data(left.row(), 1))
         if response == QMessageBox.No:
             # Get the value stored in the database
-            old_value = self._get_db_view_stored_value(model_index=left, 
-                                                       table_model=table_model, 
+            old_value = self._get_db_view_stored_value(model_index=left,
+                                                       table_model=table_model,
                                                        indiv_id=indiv_id)
             logger.info('[EXPERIMENT {0}] [DB_VIEW_EDITED] - '
                         'Edition was canceled. Cell({1}, {2}) - Old value: {3}'
@@ -298,10 +308,10 @@ def _db_view_edited(self, left, right):
                 except ValueError:
                     logger.info("[EXPERIMENT {0}] [DB_VIEW_EDITED] - "
                                 "Cost inserted is not valid. Individual won't be updated)")
-                    QMessageBox.critical(self, "Invalid cost", 
+                    QMessageBox.critical(self, "Invalid cost",
                                          "Cost inserted is not valid. Individual won't be updated ")
-                    old_value = self._get_db_view_stored_value(model_index=left, 
-                                                               table_model=table_model, 
+                    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))
                     return
@@ -315,7 +325,8 @@ def _db_view_edited(self, left, right):
                                                        new_cost=float(value),
                                                        new_ev_time=time.time(),
                                                        generation=self._current_gen)
-                QMessageBox.information(self, "Experiment updated", 
+                self._update_individuals_figure()
+                QMessageBox.information(self, "Experiment updated",
                                         "Individual was succesfully updated")
             elif left.column() == 5:
                 # TODO

MLC/Population/Population.py

@@ -168,7 +168,7 @@ def update_individual(self, *a, **kw):
     def get_best_individual(self):
         best_indivs = [x[0] for x in sorted(enumerate(self._costs), key=lambda x: x[1])]
         best_index = self._individuals[best_indivs[0]]
-        return best_index, self._mlc_repository.get_individual(best_index), self._costs[best_index]
+        return best_index, self._mlc_repository.get_individual(best_index), self._costs[best_indivs[0]]
 
     def evolve(self, next_population):
         # FIXME: It's not necessary to compute the creation of both subgenerations

MLC/api/MLCLocal.py

@@ -224,6 +224,18 @@ def get_individuals(self, experiment_name):
         individuals = MLCRepository.get_instance().get_individuals_data()
         return individuals
 
+    def get_generation(self, experiment_name, generation_number):
+        if experiment_name not in self._experiments:
+            raise ExperimentNotExistException(experiment_name)
+
+        if experiment_name not in self._open_experiments:
+            raise ClosedExperimentException("get_experiment_info", experiment_name)
+
+        # get simulation in order to load mlc experiment database
+        simulation = self._open_experiments[experiment_name].get_simulation()
+
+        return simulation.get_generation(generation_number)
+
     def get_individual(self, experiment_name, individual_id):
         if experiment_name not in self._experiments:
             raise ExperimentNotExistException(experiment_name)
@@ -247,17 +259,18 @@ def update_individual_cost(self, experiment_name, indiv_id, new_cost, new_ev_tim
 
         MLCRepository.get_instance().update_individual_cost(indiv_id, new_cost, new_ev_time, generation)
 
-    def get_generation(self, experiment_name, generation_number):
+    def show_best(self, experiment_name, generation_number):
         if experiment_name not in self._experiments:
             raise ExperimentNotExistException(experiment_name)
 
         if experiment_name not in self._open_experiments:
             raise ClosedExperimentException("get_experiment_info", experiment_name)
 
-        # get simulation in order to load mlc experiment database
-        simulation = self._open_experiments[experiment_name].get_simulation()
+        experiment = self._open_experiments[experiment_name]
+        simulation = experiment.get_simulation()
 
-        return simulation.get_generation(generation_number)
+        app = Application(simulation)
+        app.show_best(generation_number)
 
     def _create_experiment_dir(self, experiment_name):
         """