Fix in tests and in last changes made about Preevaluation

Author: Ezetowers

MLC/Common/PreevaluationManager.py

@@ -44,5 +44,6 @@ def get_callback():
                 lg.logger_.debug("[PREEV_MANAGER] Preevaluation function doesn't exists. " +
                                  "Aborting program...")
                 sys.exit(-1)
+        return None
 
 

MLC/individual/Individual.py

@@ -124,7 +124,10 @@ def crossover(self, other_individual):
 
             # Check if the individual is valid
             preev_function = PreevaluationManager.get_callback()
-            success = preev_function.preev(indiv1) and preev_function.preev(indiv2)
+            success = True
+            if preev_function is not None:
+                success = preev_function.preev(indiv1) and preev_function.preev(indiv2)
+
             return Individual(new_value_1), Individual(new_value_2), not success
 
         except TreeException, ex:
@@ -230,7 +233,10 @@ def __mutate_tree(self, mutation_type):
 
                 # Preevaluate the Individual
                 preev_function = PreevaluationManager.get_callback()
-                preevok = preev_function.preev(Individual(new_individual_value))
+                if preev_function is not None:
+                    preevok = preev_function.preev(Individual(new_individual_value))
+                else:
+                    preevok = True
 
             if not new_individual_value:
                 raise TreeException("Subtree cannot be generated")

tests/mlc/db/test_mlc_repository.py

@@ -793,9 +793,9 @@ def test_save_serial_connection(self):
 
         loaded_serial_connection = mlc_repo.load_serial_connection(board_id)
 
-        self.assertEquals(serial_connection.port, loaded_serial_connection.port)
+        self.assertEquals(serial_connection.port, int(loaded_serial_connection.port))
         self.assertEquals(serial_connection.baudrate, loaded_serial_connection.baudrate)
-        self.assertEquals(serial_connection.parity, loaded_serial_connection.parity)
+        self.assertEquals(serial_connection.parity, int(loaded_serial_connection.parity))
         self.assertEquals(serial_connection.stopbits, loaded_serial_connection.stopbits)
         self.assertEquals(serial_connection.bytesize, loaded_serial_connection.bytesize)
 
@@ -827,8 +827,8 @@ def test_update_serial_connection(self):
         self.assertEqual(updated_serial_connection_id, serial_connection_id)
         serial_connection = mlc_repo.load_serial_connection(board_id)
 
-        self.assertEquals(serial_connection.port, updated_serial_connection.port)
+        self.assertEquals(serial_connection.port, str(updated_serial_connection.port))
         self.assertEquals(serial_connection.baudrate, updated_serial_connection.baudrate)
-        self.assertEquals(serial_connection.parity, updated_serial_connection.parity)
+        self.assertEquals(serial_connection.parity, str(updated_serial_connection.parity))
         self.assertEquals(serial_connection.stopbits, updated_serial_connection.stopbits)
         self.assertEquals(serial_connection.bytesize, updated_serial_connection.bytesize)

tests/mlc/individual/test_individual.py

@@ -107,7 +107,7 @@ def test_crossover_same_level_0(self):
         individual_1 = Individual("(root (cos 5.046))", Config.get_instance())
         individual_2 = Individual("(root (cos 5.046))", Config.get_instance())
 
-        new_ind_1, new_ind_2 = individual_1.crossover(individual_2)
+        new_ind_1, new_ind_2, _ = individual_1.crossover(individual_2)
 
         self._assert_individual(new_ind_1, complexity=4,
                                 value="(root (cos 5.046))",
@@ -120,7 +120,7 @@ def test_crossover_same_level_0(self):
     def test_crossover_same_level_2(self):
         individual_1 = Individual("(root (cos (* (+ (* -1.912 -9.178) (cos S0)) 3.113)))", Config.get_instance())
         individual_2 = Individual("(root (cos (* (+ (* -1.912 -9.178) (cos S0)) 3.113)))", Config.get_instance())
-        new_ind_1, new_ind_2 = individual_1.crossover(individual_2)
+        new_ind_1, new_ind_2, _ = individual_1.crossover(individual_2)
 
         self._assert_individual(new_ind_1, complexity=8,
                                 value="(root (cos (* (* -1.912 -9.178) 3.113)))",
@@ -135,13 +135,13 @@ def test_crossover_same_level_4(self):
         individual_2 = Individual("(root S0)", Config.get_instance())
 
         try:
-            new_ind_1, new_ind_2 = individual_1.crossover(individual_2)
+            new_ind_1, new_ind_2, _ = individual_1.crossover(individual_2)
             self.assertFalse(True, "crossover with individual type 4 should fail")
         except OperationOverIndividualFail, ex:
             self.assertTrue(True)
 
     def test_crossover_same_individual(self):
-        new_ind_1, new_ind_2 = self._individual_l2.crossover(self._individual_l2)
+        new_ind_1, new_ind_2, _ = self._individual_l2.crossover(self._individual_l2)
 
         self._assert_individual(new_ind_1, complexity=8,
                                 value="(root (cos (* (* -1.912 -9.178) 3.113)))",
@@ -153,7 +153,7 @@ def test_crossover_same_individual(self):
 
     def test_crossover_different_levels_2_3(self):
         # self._engine.rand('seed', 40.0, nargout=0)
-        new_ind_1, new_ind_2 = self._individual_l2.crossover(self._individual_l3)
+        new_ind_1, new_ind_2, _ = self._individual_l2.crossover(self._individual_l3)
 
         self._assert_individual(new_ind_1, complexity=8,
                                 value="(root (cos (* (- -8.815 -3.902) 3.113)))",
@@ -164,7 +164,7 @@ def test_crossover_different_levels_2_3(self):
                                 formal="my_log((my_div((sin(4.37) .* (((-1.912) .* (-9.178)) + cos(S0))),my_log((2.025 + (-8.685))))))")
 
         # make another to crossover in order to check randomness
-        new_ind_1, new_ind_2 = self._individual_l2.crossover(self._individual_l3)
+        new_ind_1, new_ind_2, _ = self._individual_l2.crossover(self._individual_l3)
 
         self._assert_individual(new_ind_1, complexity=8,
                                 value="(root (log (+ 2.025 -8.685)))",
@@ -176,7 +176,7 @@ def test_crossover_different_levels_2_3(self):
 
     def test_crossover_different_levels_0_3(self):
         # self._engine.rand('seed', 40.0, nargout=0)
-        new_ind_1, new_ind_2 = self._individual_l0.crossover(self._individual_l3)
+        new_ind_1, new_ind_2, _ = self._individual_l0.crossover(self._individual_l3)
 
         self._assert_individual(new_ind_1, complexity=3,
                                 value="(root (- -8.815 -3.902))",