Fixes in Experiment range selection

Author: Ezetowers

MLC/GUI/Experiment/ExperimentInProgress.py

@@ -77,7 +77,7 @@ class ExperimentInProgressWindow(QMainWindow):
     new_generation = pyqtSignal()
     simulation_finished = pyqtSignal()
 
-    def __init__(self, parent, parent_signal, chart_params):
+    def __init__(self, parent, parent_signal, chart_params, from_gen, to_gen):
         QMainWindow.__init__(self, parent)
         self._autogenerated_object = Ui_ExperimentInProgressWindow()
         self._autogenerated_object.setupUi(self)
@@ -96,9 +96,13 @@ def __init__(self, parent, parent_signal, chart_params):
         # Signal to be emited when the experiment finished
         self._parent_signal = parent_signal
 
+        # Original from and to generation
+        self._from_gen = from_gen + 1
+        self._to_gen = to_gen
+
         # Individuals Graph data
         self._chart_params = chart_params
-        self._current_generation = 1
+        self._current_generation = from_gen
 
         # Condition variable used to check when the experiment has been stopped or cancelled
         self._experiment_condition = ExperimentCondition()
@@ -138,8 +142,8 @@ def _update_dialog(self, indivs_per_gen_counter, total_indivs_counter, gen_count
         gen_progress_bar.setValue(int(float(total_indivs_counter) / self._total_indivs * 100))
         gen_progress_bar.valueChanged.emit(int(float(total_indivs_counter) / self._total_indivs * 100))
 
-        self._current_generation = gen_counter + 1
-        gen_label.setText("<b>Generation {0}/{1}</b>".format(gen_counter + 1, self._amount_gens))
+        self._current_generation = self._from_gen + gen_counter
+        gen_label.setText("<b>Generation {0}/{1}</b>".format(self._current_generation, self._to_gen))
         indiv_label.setText("<b>Individual {0}/{1}</b>".format(indivs_per_gen_counter, self._indivs_per_gen))
         self._update_current_gen_experiment(indivs_per_gen_counter, cost)
 
@@ -162,7 +166,7 @@ def _create_new_chart(self):
         # Insert the widget into the widget
         picture_layout = self._autogenerated_object.picture_layout
 
-        chart_title = 'Generation {0} - Cost Per Individual'.format(self._current_generation)
+        chart_title = 'Generation {0} - Cost Per Individual'.format(self._current_generation + 1)
         chart_font = QFont()
         chart_font.setWeight(QFont.ExtraBold)
         indiv_chart = QtChartWrapper(show_legend=True)
@@ -212,7 +216,12 @@ def __init__(self, mlc_local, experiment_name,
         self._experiment_name = experiment_name
         self._experiment_info = self._mlc_local.get_experiment_info(experiment_name)
         self._to_gen = to_gen
-        self._from_gen = from_gen - 1
+
+        # If the experiment was not evaluated yet, use from_gen as 0
+        self._from_gen = 0
+        if self._experiment_info["generations"] != 0:
+            self._from_gen = from_gen
+
         self._log_prefix = '[EXPERIMENT_IN_PROGRESS]'
         self._callbacks = {MLC_CALLBACKS.ON_START:          self.simulation_started,
                            MLC_CALLBACKS.ON_NEW_GENERATION: self.new_generation_created,
@@ -223,13 +232,16 @@ def __init__(self, mlc_local, experiment_name,
         self._indiv_per_gen_counter = 0
         self._total_indivs_counter = 0
         self._gen_counter = 0
-        self._amount_gens = to_gen - from_gen + 1
+        self._amount_gens = to_gen - from_gen
         self._indivs_per_gen = int(self._experiment_info["individuals_per_generation"])
         self._experiment_signal = None
 
         self._dialog = ExperimentInProgressWindow(parent=parent,
                                                   parent_signal=parent_signal,
-                                                  chart_params=chart_params)
+                                                  chart_params=chart_params,
+                                                  from_gen=from_gen,
+                                                  to_gen=to_gen)
+
         self._experiment_condition = self._dialog.get_experiment_condition_variable()
         self._dialog.add_experiment_data(self._amount_gens, self._indivs_per_gen)
         self._dialog.show()

MLC/GUI/Experiment/ExperimentWindow.py

@@ -88,6 +88,22 @@ def on_start_button_clicked(self):
         from_gen = int(self._autogenerated_object.from_gen_combo.currentText())
         to_gen = int(self._autogenerated_object.to_gen_combo.currentText())
 
+        if self._mlc_local.get_experiment_info(self._experiment_name)["generations"] == 0:
+            from_gen = 0
+
+        # Check if the experiment range is ok
+        if to_gen <= from_gen:
+            logger.info("[EXPERIMENT {0}] [START_BUTTON] - Experiment can not be executed. "
+                        "'From Generation' index must be greater than 'To Generation' index "
+                        "From Gen: {1} - To Gen:{2}"
+                        .format(self._experiment_name, from_gen, to_gen))
+
+            QMessageBox.critical(self,
+                                 "Invalid Generation Range",
+                                 "Experiment can not be executed. 'From Generation' index "
+                                 "must be greater than 'To Generation' index")
+            return
+
         logger.info('[EXPERIMENT {0}] [START_BUTTON] - Proceed to execute experiment from Generation '
                     'N°{1} to Generation N°{2}'.format(self._experiment_name, from_gen, to_gen))
 
@@ -429,7 +445,7 @@ def _update_experiment_info(self):
         else:
             # FIXME: Think what to do in the border case of number_of_gens == MAX_GENERATIONS
             from_gen_combo.addItems([str(x) for x in xrange(1, number_of_gens + 1)])
-            to_gen_combo.addItems([str(x) for x in xrange(number_of_gens + 1, ExperimentWindow.MAX_GENERATIONS)])
+            to_gen_combo.addItems([str(x) for x in xrange(2, ExperimentWindow.MAX_GENERATIONS)])
 
         # Fill the db_view
         gen_count_group = self._autogenerated_object.gen_count_group

MLC/Population/Creation/IndividualSelection.py

@@ -18,7 +18,7 @@ def __init__(self, selected_individuals):
         self.__individuals = []
 
     def create(self, gen_size):
-        self.__individuals = [-1]*gen_size
+        self.__individuals = [-1] * gen_size
 
         # Add Individuals
         for individual, positions in self.__selected_individuals.items():
@@ -31,7 +31,7 @@ def create(self, gen_size):
         for index, indiv_id in enumerate(self.__individuals):
             if indiv_id == -1:
                 if index > 0:
-                    self.__individuals[index] = self.__individuals[index-1]
+                    self.__individuals[index] = self.__individuals[index - 1]
                 else:
                     self.__individuals[index] = self.__individuals[index + 1]