Added start over button functionality

* #49

Author: Ezequiel Torres

MLC/Common/LispTreeExpr/LispTreeExpr.py

@@ -144,7 +144,6 @@ def check_operands(expr):
                     break
 
             if arg_counter != expr_op["nbarg"]:
-                print arg_counter
                 raise OperationArgumentsAmountException(expr)
 
             # The position always finished in the last bracket.

MLC/GUI/Autogenerated/mlc_qtcreator/experiment.ui

@@ -24,7 +24,7 @@
        <enum>QTabWidget::North</enum>
       </property>
       <property name="currentIndex">
-       <number>1</number>
+       <number>0</number>
       </property>
       <widget class="QWidget" name="experiment_tab">
        <property name="layoutDirection">

MLC/GUI/Experiment/ExperimentWindow.py

@@ -24,7 +24,6 @@
 from MLC.Population.Population import Population
 from PyQt5.QtCore import pyqtSignal
 from PyQt5.QtCore import QFileSystemWatcher
-# from PyQt5.QtCore import QHeaderView
 from PyQt5.QtCore import Qt
 from PyQt5.QtCore import QUrl
 from PyQt5.QtGui import QDesktopServices
@@ -435,29 +434,65 @@ def on_gen_cut_button_clicked(self):
                                        QMessageBox.No)
 
         if response == QMessageBox.Yes:
-            logger.info("[GEN_CUT_BUTTON] Proceed to remove {0} generations (From {1} onwards)"
+            logger.info("[GEN_CUT_BUTTON] Proceed to remove {0} generations (From Generation N°{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._current_gen = experiment_info["generations"]
             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)"
+                                    "{0} Generations were succesfully removed (From N°{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))
 
+        response = QMessageBox.warning(self, "Start Over",
+                                       "Except for Generation N°{0}, all generations will be removed. "
+                                       "Do you really want to continue?"
+                                       .format(self._current_gen),
+                                       QMessageBox.Yes | QMessageBox.No,
+                                       QMessageBox.No)
+
+        if response == QMessageBox.Yes:
+            chosen_generation = self._current_gen
+            logger.info("[GEN_START_OVER] Removing all the experiment generations "
+                        "except for generation N°{0}".format(self._current_gen))
+
+            experiment_info = self._mlc_local.get_experiment_info(self._experiment_name)
+            number_of_gens = experiment_info["generations"]
+
+            if self._current_gen != number_of_gens:
+                self._mlc_local.remove_generations_from(self._experiment_name,
+                                                        self._current_gen + 1)
+
+            if self._current_gen != 1:
+                self._mlc_local.remove_generations_to(self._experiment_name,
+                                                      self._current_gen - 1)
+
+            # Recalculate the amount of generations in the project
+            experiment_info = self._mlc_local.get_experiment_info(self._experiment_name)
+            self._current_gen = experiment_info["generations"]
+            self._update_individuals_per_generation_list()
+            self._update_experiment_info()
+            self._update_individuals_figure()
+            self._update_scatter_chart()
+
+            QMessageBox.information(self, "Star Over Generations",
+                                    "Experiment was succesfully pruned. Past Generation "
+                                    "N°{0} is the only generation of the experiment"
+                                    .format(chosen_generation))
+
+
 ################################### VIEW AND MODEL METHODS #########################################
 
     def _config_table_edited(self, left, right):
@@ -714,7 +749,6 @@ def _update_individuals_figure(self):
                 chart_layout.itemAt(i).widget().setParent(None)
             chart_layout.addWidget(self._autogenerated_object.textEdit_2)
 
-
     def _reload_experiment_config(self, some_string):
         logger.debug('[EXPERIMENT {0}] [EXPERIMENT_CONF_FILE_CHANGED] - '
                      'Executing _experiment_conf_file_changed function'

MLC/api/MLCLocal.py

@@ -219,7 +219,7 @@ 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, 
+    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)
@@ -273,6 +273,16 @@ def remove_generations_from(self, experiment_name, gen_number):
         MLCRepository.get_instance().remove_population_from(gen_number)
         MLCRepository.get_instance().remove_unused_individuals()
 
+    def remove_generations_to(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_to(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/mlc.py

@@ -190,7 +190,15 @@ def get_generation(self, experiment_name, generation_number):
 
     def remove_generations_from(self, experiment_name, gen_number):
         """
-        Remove all the generations above the given as a parameter
+        Remove all the generations above the given as a parameter (include the gen given)
+        :param experiment_name
+        :param gen_number
+        """
+
+    def remove_generations_to(self, experiment_name, gen_number):
+        """
+        Remove all the generations below the given as a parameter (include the gen given)
+        the one passed as an argument
         :param experiment_name
         :param gen_number
         """

MLC/db/sqlite/sqlite_repository.py

@@ -129,7 +129,7 @@ def remove_population_to(self, to_generation):
         if self.__generations == 0:
             self.__base_gen = 1
         else:
-            self.__base_gen = to_generation + 1
+            self.__base_gen = self.__base_gen + to_generation
 
     def remove_unused_individuals(self):
         to_delete = []

tests/mlc/db/test_mlc_repository.py

@@ -541,6 +541,90 @@ def test_cut_generation(self):
         individual = mlc_repo.get_individual(4)
         self.assertEqual(individual.get_value(), "4+4")
 
+
+    def test_cut_generations_more_than_once(self):
+        """
+        Cut a generation using remove_population_from/remove_population_last
+        :return:
+        """
+        mlc_repo = self.__get_new_repo()
+
+        # add individuals
+        mlc_repo.add_individual(Individual("1+1"))
+        mlc_repo.add_individual(Individual("2+2"))
+        mlc_repo.add_individual(Individual("3+3"))
+        mlc_repo.add_individual(Individual("4+4"))
+        mlc_repo.add_individual(Individual("5+5"))
+        mlc_repo.add_individual(Individual("6+6"))
+        mlc_repo.add_individual(Individual("7+7"))
+        mlc_repo.add_individual(Individual("8+8"))
+
+        # add  population
+        p = Population(3, 0, Config.get_instance(), mlc_repo)
+        p._individuals = [1, 1, 1]
+        mlc_repo.add_population(p)
+
+        # add population
+        p = Population(3, 0, Config.get_instance(), mlc_repo)
+        p._individuals = [2, 2, 2]
+        mlc_repo.add_population(p)
+
+        # add population
+        p = Population(3, 0, Config.get_instance(), mlc_repo)
+        p._individuals = [3, 3, 3]
+        mlc_repo.add_population(p)
+
+        # add population
+        p = Population(3, 0, Config.get_instance(), mlc_repo)
+        p._individuals = [4, 4, 4]
+        mlc_repo.add_population(p)
+
+        # add population
+        p = Population(3, 0, Config.get_instance(), mlc_repo)
+        p._individuals = [5, 5, 5]
+        mlc_repo.add_population(p)
+
+        self.assertEqual(mlc_repo.count_population(), 5)
+
+        # Cut population 4
+        mlc_repo.remove_population_from(4+1)
+        mlc_repo.remove_population_to(4-1)
+
+        p = Population(3, 0, Config.get_instance(), mlc_repo)
+        p._individuals = [5, 5, 5]
+        mlc_repo.add_population(p)
+
+        p = Population(3, 0, Config.get_instance(), mlc_repo)
+        p._individuals = [6, 6, 6]
+        mlc_repo.add_population(p)
+
+        p = Population(3, 0, Config.get_instance(), mlc_repo)
+        p._individuals = [7, 7, 7]
+        mlc_repo.add_population(p)
+
+        p = Population(3, 0, Config.get_instance(), mlc_repo)
+        p._individuals = [8, 8, 8]
+        mlc_repo.add_population(p)
+
+        self.assertEqual(mlc_repo.count_population(), 5)
+
+        # Cut population 4
+        mlc_repo.remove_population_from(4+1)
+        mlc_repo.remove_population_to(4-1)
+
+        # remove unused individuals
+        mlc_repo.remove_unused_individuals()
+
+        self.assertEqual(mlc_repo.count_population(), 1)
+        self.assertEqual(mlc_repo.count_individual(), 1)
+
+        p = mlc_repo.get_population(1)
+        self.assertEqual(p._individuals, [7, 7, 7])
+
+        individual = mlc_repo.get_individual(7)
+        self.assertEqual(individual.get_value(), "7+7")
+
+
     def test_remove_population_to_from_bad_values(self):
         mlc_repo = self.__get_new_repo()