#44

Author: raulopez0

MLC/db/sqlite/sqlite_repository.py

@@ -110,13 +110,19 @@ def count_population(self):
 
     # special methods
     def remove_population_from(self, from_generation):
+        if from_generation>self.__generations:
+            return
+
         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:
             self.__base_gen = 1
 
     def remove_population_to(self, to_generation):
+        if to_generation > self.__generations:
+            to_generation = self.__generations
+
         gen_id = self.__base_gen + to_generation - 1
         self.__execute(stmt_delete_to_generations(gen_id))
         self.__generations = self.__generations-to_generation

tests/mlc/db/test_mlc_repository.py

@@ -539,4 +539,35 @@ def test_cut_generation(self):
         self.assertEqual(p._individuals, [4, 4, 4])
 
         individual = mlc_repo.get_individual(4)
-        self.assertEqual(individual.get_value(), "4+4")
+        self.assertEqual(individual.get_value(), "4+4")
+
+    def test_remove_population_to_from_bad_values(self):
+        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"))
+
+        # 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)
+
+        self.assertEqual(mlc_repo.count_population(), 3)
+
+        # Remove all generations (1 to 3)
+        mlc_repo.remove_population_to(10)
+        self.assertEqual(mlc_repo.count_population(), 0)