Added cut generations feature

* No validations are being made at the moment #49

Author: Ezetowers

MLC/GUI/Autogenerated/autogenerated.py

@@ -24,7 +24,7 @@
        <enum>QTabWidget::North</enum>
       </property>
       <property name="currentIndex">
-       <number>0</number>
+       <number>1</number>
       </property>
       <widget class="QWidget" name="experiment_tab">
        <property name="layoutDirection">
@@ -473,27 +473,26 @@
            <item>
             <widget class="QGroupBox" name="groupBox_3">
              <property name="title">
-              <string>DB</string>
+              <string>Generations</string>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_13">
               <item>
-               <widget class="QPushButton" name="pushButton_3">
-                <property name="text">
-                 <string>Create</string>
+               <widget class="QPushButton" name="gen_cut_button">
+                <property name="toolTip">
+                 <string>Remove generations ahead of the current generation</string>
                 </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QPushButton" name="pushButton_4">
                 <property name="text">
                  <string>Cut</string>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="QPushButton" name="pushButton_8">
+               <widget class="QPushButton" name="gen_start_over_button">
+                <property name="toolTip">
+                 <string>Remove all the generations, maintaining only the last generation computed</string>
+                </property>
                 <property name="text">
-                 <string>Import</string>
+                 <string>Start Over</string>
                 </property>
                </widget>
               </item>
@@ -1239,6 +1238,38 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>gen_cut_button</sender>
+   <signal>clicked()</signal>
+   <receiver>ExperimentWindow</receiver>
+   <slot>on_gen_cut_button_clicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>835</x>
+     <y>309</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>480</x>
+     <y>283</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>gen_start_over_button</sender>
+   <signal>clicked()</signal>
+   <receiver>ExperimentWindow</receiver>
+   <slot>on_gen_start_over_button_clicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>835</x>
+     <y>337</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>480</x>
+     <y>283</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>on_closed_dialog()</slot>
@@ -1266,5 +1297,7 @@
   <slot>on_first_add_indiv_button_clicked()</slot>
   <slot>on_first_remove_indiv_button_clicked()</slot>
   <slot>on_first_add_indiv_from_textfile_button_clicked()</slot>
+  <slot>on_gen_cut_button_clicked()</slot>
+  <slot>on_gen_start_over_button_clicked()</slot>
  </slots>
 </ui>

MLC/GUI/Autogenerated/mlc_qtcreator/experiment.ui

@@ -419,6 +419,45 @@ def on_first_remove_indiv_button_clicked(self):
                      .format(self._experiment_name))
         self._first_indivs_manager.remove_individual()
 
+    def on_gen_cut_button_clicked(self):
+        logger.debug('[EXPERIMENT {0}] [GEN_CUT_BUTTON] - '
+                     'Executing on_gen_cut_button_clicked function'
+                     .format(self._experiment_name))
+        experiment_info = self._mlc_local.get_experiment_info(self._experiment_name)
+        number_of_gens = experiment_info["generations"]
+
+        amount_of_gen_losts = number_of_gens - self._current_gen + 1
+        response = QMessageBox.warning(self, "Cut Generations",
+                                       "{0} generations will be lost with this operation. "
+                                       "Do you really want to continue?"
+                                       .format(amount_of_gen_losts),
+                                       QMessageBox.Yes | QMessageBox.No,
+                                       QMessageBox.No)
+
+        if response == QMessageBox.Yes:
+            logger.info("[GEN_CUT_BUTTON] Proceed to remove {0} generations (From {1} onwards)"
+                        .format(amount_of_gen_losts, self._current_gen))
+            self._mlc_local.remove_generations_from(self._experiment_name,
+                                                    self._current_gen)
+            last_gen_removed = self._current_gen
+            # Recalculate the amount of generations in the project
+            experiment_info = self._mlc_local.get_experiment_info(self._experiment_name)
+            number_of_gens = experiment_info["generations"]
+            self._current_gen = number_of_gens
+            self._update_individuals_per_generation_list()
+            self._update_experiment_info()
+            self._update_individuals_figure()
+            self._update_scatter_chart()
+
+            QMessageBox.information(self, "Cut Generations",
+                                    "{0} generations were succesfully removed (From {1} onwards)"
+                                    .format(amount_of_gen_losts, last_gen_removed))
+
+    def on_gen_start_over_button_clicked(self):
+        logger.debug('[EXPERIMENT {0}] [GEN_START_OVER_BUTTON] - '
+                     'Executing on_gen_start_over_button_clicked function'
+                     .format(self._experiment_name))
+
     def _config_table_edited(self, left, right):
         config_table = self._autogenerated_object.config_table
         table_model = config_table.model()

MLC/GUI/Experiment/ExperimentWindow.py

@@ -263,6 +263,16 @@ def get_generation(self, experiment_name, generation_number):
 
         return simulation.get_generation(generation_number)
 
+    def remove_generations_from(self, experiment_name, gen_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)
+
+        MLCRepository.get_instance().remove_population_from(gen_number)
+        MLCRepository.get_instance().remove_unused_individuals()
+
     def get_individual(self, experiment_name, individual_id):
         if experiment_name not in self._experiments:
             raise ExperimentNotExistException(experiment_name)

MLC/api/MLCLocal.py

@@ -188,6 +188,13 @@ def get_generation(self, experiment_name, generation_number):
         """
         raise NotImplementedError("MLC::get_generation not implemented")
 
+    def remove_generations_from(self, experiment_name, gen_number):
+        """
+        Remove all the generations above the given as a parameter
+        :param experiment_name
+        :param gen_number
+        """
+
     def get_individuals(self, experiment_name):
         """
             Obtained generated individuals during the simulation.
@@ -204,7 +211,8 @@ def get_individual(self, experiment_name, individual_id):
         """
         raise NotImplementedError("MLC::get_individual not implemented")
 
-    def update_individual_cost(self, experiment_name, indiv_id, new_cost, new_ev_time, generation=-1):
+    def update_individual_cost(self, experiment_name, indiv_id,
+                               new_cost, new_ev_time, generation=-1):
         """
             Update individual cost. If generation == -1 Individual cost will
             be updated in all generations.
@@ -215,10 +223,10 @@ def update_individual_cost(self, experiment_name, indiv_id, new_cost, new_ev_tim
 
     def show_best(self, experiment_name, generation_number):
         """
-        Plot the best individual of the populations evaluated. This method ought not 
+        Plot the best individual of the populations evaluated. This method ought not
         to be called before calling the function go at least once
         :param experiment_name:
-        :param generation_number: The generation in which we are looking 
+        :param generation_number: The generation in which we are looking
         for the best individual
         """
         raise NotImplementedError("MLC::get_individuals not implemented")

MLC/api/mlc.py

@@ -71,6 +71,12 @@ def count_population(self):
     def remove_population_from(self, from_generation):
         raise NotImplementedError("This method must be implemented")
 
+    def remove_population_to(self, to_generation):
+        raise NotImplementedError("This method must be implemented")
+
+    def remove_unused_individuals(self):
+        raise NotImplementedError("This method must be implemented")
+
     # operations over individuals
     def add_individual(self, individual):
         raise NotImplementedError("This method must be implemented")
@@ -97,10 +103,8 @@ def count_individual(self):
         raise NotImplementedError("This method must be implemented")
 
     # special methods
-    def update_individual_cost(self, individual_id, cost, evaluation_time, generation=-1):
-        raise NotImplementedError("This method must be implemented")
-
-    def remove_unused_individuals(self):
+    def update_individual_cost(self, individual_id, cost,
+                               evaluation_time, generation=-1):
         raise NotImplementedError("This method must be implemented")
 
     @staticmethod

MLC/db/mlc_repository.py

@@ -79,7 +79,7 @@ def add_population(self, population):
         cursor = conn.cursor()
 
         try:
-            next_gen_id = self.__base_gen+self.__generations
+            next_gen_id = self.__base_gen + self.__generations
             for i in range(len(population._individuals)):
                 individual_id = population._individuals[i]
                 individual_cost = population._costs[i]
@@ -110,10 +110,10 @@ def count_population(self):
 
     # special methods
     def remove_population_from(self, from_generation):
-        if from_generation>self.__generations:
+        if from_generation > self.__generations:
             return
 
-        gen_id = self.__base_gen+from_generation-1
+        gen_id = self.__base_gen + from_generation - 1
         self.__execute(stmt_delete_from_generations(gen_id))
         self.__generations = from_generation - 1
         if from_generation == 1:
@@ -125,7 +125,7 @@ def remove_population_to(self, to_generation):
 
         gen_id = self.__base_gen + to_generation - 1
         self.__execute(stmt_delete_to_generations(gen_id))
-        self.__generations = self.__generations-to_generation
+        self.__generations = self.__generations - to_generation
         if self.__generations == 0:
             self.__base_gen = 1
         else: