Several bug fixes found today in the lab session with Thomas

Author: Ezetowers

MLC/Common/LispTreeExpr/LispTreeExpr.py

@@ -20,6 +20,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>
 
 import MLC.Log.log as lg
+import re
 from MLC.mlc_parameters.mlc_parameters import Config
 from MLC.Common.Operations import Operations
 from MLC.Common.LispTreeExpr.TreeNodes import LeafNode, InternalNode
@@ -108,6 +109,16 @@ def check_expression(expression):
         if expression.find("(root") != 0:
             raise RootNotFoundExprException(expression)
 
+        # Check that the expression is just a sensor
+        r = re.compile("\(root S[0-9]*\)$")
+        if r.match(expression) != None:
+            return True
+
+        # Check that the expression is just a number
+        r = re.compile("\(root [0-9,\-]*\.{0,1}[0-9]*\)$")
+        if r.match(expression) != None:
+            return True
+
         # Check the amount of parenthesis to be balanced
         open_parenthesis = "("
         close_parenthesis = ")"

MLC/GUI/Experiment/ChartConfiguration.py

@@ -55,7 +55,7 @@ class ChartConfiguration():
 
     # Min, Max, Step
     AMOUNT_POINTS = [100, 1000, 100]
-    MAX_COST_VALUES = [50, 1000, 50]
+    MAX_COST_VALUES = [50, 5000, 50]
     MIN_COST_VALUES = [-200, 0, 50]
     MARKER_SIZE_VALUES = [1, 10, 1]
 

MLC/GUI/Experiment/ExperimentInProgress.py

@@ -26,6 +26,7 @@
 import os
 import sys
 import threading
+import traceback
 sys.path.append(os.path.abspath(".") + "/../..")
 
 from MLC.Application import MLC_CALLBACKS
@@ -282,6 +283,11 @@ def run(self):
             logger.info('{0} [RUN] - Thread was cancelled by the user'
                         .format(self._log_prefix))
             self._dialog.simulation_finished.emit()
+        except Exception:
+            logger.info('{0} [RUN] - Unknown Exception catch. Aborting experiment'
+                        .format(self._log_prefix))
+            traceback.print_exc()
+            sys.exit(-1)
 
     def indiv_evaluated(self, individual_id, cost):
         logger.debug('{0} [INDIV_EV] - Executing indiv_evaluated callback. '

MLC/GUI/Experiment/ExperimentWindow.py

@@ -94,9 +94,6 @@ def __init__(self, mlc_local,
         # Disable save_config_button until some change is made
         self._autogenerated_object.save_config_button.setDisabled(True)
 
-        if self._current_gen != 0:
-            self._autogenerated_object.tabWidget.setTabEnabled(3, False)
-
         # Connect the function that updates the graphics of the Window when the
         # experiment evaluation finished
         self.experiment_finished.connect(self._update_experiment)
@@ -235,7 +232,7 @@ def on_test_button_clicked(self):
                                      indiv_value=test_indiv_edit.text(),
                                      config=Config.get_instance())
 
-        if cost:
+        if cost != None:
             test_label_result = self._autogenerated_object.test_label_result
             test_label_result.setText(str(cost))
 
@@ -639,10 +636,12 @@ def _update_individuals_per_generation_list(self):
             # Disable Experiment tab buttons
             self._autogenerated_object.left_menu_frame.setDisabled(True)
             self._autogenerated_object.right_menu_frame.setDisabled(True)
+            self._autogenerated_object.tabWidget.setTabEnabled(3, True)
             return
         else:
             self._autogenerated_object.left_menu_frame.setDisabled(False)
             self._autogenerated_object.right_menu_frame.setDisabled(False)
+            self._autogenerated_object.tabWidget.setTabEnabled(3, False)
 
         # Complete the list
         individuals = self._mlc_local.get_individuals(self._experiment_name)

MLC/GUI/mlc_gui.py

@@ -117,7 +117,12 @@ def on_new_button_clicked(self):
                         break
 
                 # Create the new experiment and refresh the View
-                self._experiments_manager.add_experiment_even_if_repeated(experiment_name)
+                if not self._experiments_manager.add_experiment(experiment_name):
+                    QMessageBox.critical(self, 'New Experiment',
+                                         ('Experiment {0} already exists but has errors. '
+                                          'Check it to be correct in your workspace'
+                                          .format(experiment_name)))
+                    return
                 self._refresh_experiment_list_view()
                 self._clean_experiment_selection()
 

MLC/Population/Population.py

@@ -285,7 +285,7 @@ def evolve(self, next_population):
                             new_ind = old_indiv.mutate()
 
                         except OperationOverIndividualFail, ex:
-                            pass
+                            lg.logger_.warn(str(ex))
 
                     number, repeated = self._mlc_repository.add_individual(new_ind)
                     next_population.update_individual(dest_index=pop_idv_index_dest, rhs_pop=self,
@@ -326,7 +326,7 @@ def evolve(self, next_population):
                         try:
                             new_ind, new_ind2, fail = old_indiv.crossover(old_indiv2)
                         except OperationOverIndividualFail, ex:
-                            lg.logger_.debug(str(ex))
+                            lg.logger_.warn(str(ex))
 
                     number, repeated = self._mlc_repository.add_individual(new_ind)
                     next_population.update_individual(dest_index=pop_idv_index_dest, rhs_pop=self,

MLC/individual/Individual.py

@@ -35,8 +35,9 @@ class IndividualException(Exception):
 
 
 class OperationOverIndividualFail(IndividualException):
+
     def __init__(self, individual_value, operation_name, cause):
-        IndividualException.__init__(self, "Operation '%s' over individual '%s' fail due %s" % (operation_name, individual_value, cause) )
+        IndividualException.__init__(self, "Operation '%s' over individual '%s' fail due %s" % (operation_name, individual_value, cause))
 
 
 class TreeException(Exception):
@@ -146,7 +147,10 @@ def crossover(self, other_individual):
             # Check if the individual is valid
             preev_function = PreevaluationManager.get_callback()
             success = True
-            if preev_function is not None:
+            if preev_function is None:
+                success = True
+            else:
+                preev_function = PreevaluationManager.get_callback()
                 success = preev_function.preev(indiv1) and preev_function.preev(indiv2)
 
             return Individual(new_value_1), Individual(new_value_2), not success
@@ -206,7 +210,8 @@ def __crossover_tree(self, other_individual):
             count += 1
 
         if not correct:
-            raise TreeException("we could not find a candidate substitution in %s tests" % maxtries)
+            raise TreeException("[CROSSOVER] Candidate could not found a "
+                                "substitution {0} tests".format(maxtries))
 
         # Replacing subtrees
         value_1 = value_1.replace('@', sm2)
@@ -249,48 +254,65 @@ def __mutate_tree(self, mutation_type):
                         for i in range(len(config_sensor_list)):
                             new_individual_value = new_individual_value.replace("z%d" % i, "S%d" % config_sensor_list[i])
 
-                except TreeException:
-                    pass
-
-                # Preevaluate the Individual
-                preev_function = PreevaluationManager.get_callback()
-                if preev_function is not None:
-                    preevok = preev_function.preev(Individual(new_individual_value))
-                else:
-                    preevok = True
+                        # Preevaluate the Individual
+                        preevok = self._preevaluate_individual(new_individual_value)
+                    else:
+                        raise TreeException()
 
-            if not new_individual_value:
-                raise TreeException("Subtree cannot be generated")
+                except TreeException:
+                    raise TreeException("[MUTATE_TREE] A non subtractable Individual was generated. "
+                                        "Individual: {0}".format(self._tree.get_expanded_tree_as_string()))
 
             return new_individual_value
 
         elif mutation_type == Individual.MutationType.REPARAMETRIZATION:
-            return self.__reparam_tree(LispTreeExpr(self.get_value()))
+            new_individual_value = None
+            preevok = False
+            while not preevok:
+                new_individual_value = self.__reparam_tree(LispTreeExpr(self.get_value()))
+                preevok = self._preevaluate_individual(new_individual_value)
+
+            return new_individual_value
 
         elif mutation_type == Individual.MutationType.HOIST:
-            controls = self._config.getint("POPULATION", "controls")
-            prob_threshold = 1 / float(controls)
+            preevok = False
+            counter = 0
+            maxtries = self._config.getint("GP", "maxtries")
+
+            while not preevok and counter < maxtries:
+                counter += 1
+                controls = self._config.getint("POPULATION", "controls")
+                prob_threshold = 1 / float(controls)
 
-            cl = [stree.to_string() for stree in self.get_tree().get_root_node()._nodes]
+                cl = [stree.to_string() for stree in self.get_tree().get_root_node()._nodes]
 
-            changed = False
-            k = 0
+                changed = False
+                k = 0
 
-            for nc in RandomManager.randperm(controls):
-                k += 1
-                # control law is cropped if it is the last one and no change happend before
-                if (RandomManager.rand() < prob_threshold) or (k == controls and not changed):
+                for nc in RandomManager.randperm(controls):
+                    k += 1
+                    # control law is cropped if it is the last one and no change happend before
+                    if (RandomManager.rand() < prob_threshold) or (k == controls and not changed):
 
-                    try:
-                        _, sm, _ = self.__extract_subtree(LispTreeExpr('(root '+cl[nc - 1]+')'), mutmindepth+1, maxdepth, maxdepth+1)
-                        cl[nc - 1] = sm
-                        changed = True
+                        try:
+                            _, sm, _ = self.__extract_subtree(LispTreeExpr('(root ' + cl[nc - 1] + ')'),
+                                                              mutmindepth + 1,
+                                                              maxdepth,
+                                                              maxdepth + 1)
+                            cl[nc - 1] = sm
+                            changed = True
 
-                    except TreeException:
-                        changed = False
+                        except TreeException:
+                            changed = False
 
-            return "(root %s)" % " ".join(cl[:controls])
+                new_individual_value = "(root %s)" % " ".join(cl[:controls])
+                preevok = self._preevaluate_individual(new_individual_value)
 
+            if counter == maxtries:
+                raise TreeException("[MUTATE HOIST] Candidate could not found a "
+                                    "substitution {0} tests".format(maxtries))
+
+            return new_individual_value
         else:
             raise NotImplementedError("Mutation type %s not implemented" % mutation_type)
 
@@ -381,7 +403,7 @@ def __generate_indiv_regressive_tree(value, config, indiv_type):
         # Check if the seed character is in the string
         index = value.find('@')
         if index == -1:
-            return
+            return None
 
         # Split the value in two strings, not containing the first seed character
         begin_str = value[:index]
@@ -412,7 +434,7 @@ def __generate_indiv_regressive_tree(value, config, indiv_type):
                 precision = config.get('POPULATION', 'precision')
                 # Generate a float number between -range and +range with a precision of 'precision'
                 new_exp = (("%." + precision + "f") % (
-                (RandomManager.rand() - 0.5) * 2 * range))
+                    (RandomManager.rand() - 0.5) * 2 * range))
                 new_value = begin_str + new_exp + end_str
         else:
             # Create a node
@@ -428,6 +450,13 @@ def __generate_indiv_regressive_tree(value, config, indiv_type):
                 new_value = Individual.__generate_indiv_regressive_tree(new_value, config, indiv_type)
         return new_value
 
+    def _preevaluate_individual(self, new_indiv):
+        preev_function = PreevaluationManager.get_callback()
+        if preev_function is not None:
+            return preev_function.preev(Individual(new_indiv))
+        else:
+            return True
+
     @staticmethod
     def __simplify_and_sensors_tree(value, config):
         sensor_list = ()
@@ -455,4 +484,4 @@ def __cmp__(self, other):
         self._value == other.get_value()
 
     def __hash__(self):
-        return hash(self._value)
+        return hash(self._value)

tests/mlc/common/LispTreeExpr/test_expression_tree.py

@@ -85,6 +85,29 @@ def test_check_expression_complex_incorrect_plus_arguments_amount(self):
         expression = '(root (+ (* 2 3 5) 8))'
         self.assert_check_expression_with_exception(expression, OperationArgumentsAmountException)
 
+    def test_check_expression_with_just_a_sensor(self):
+        expression = '(root S0)'
+        self.assert_check_expression_without_exception(expression)
+
+        expression = '(root S1)'
+        self.assert_check_expression_without_exception(expression)
+
+        expression = '(root S23)'
+        self.assert_check_expression_without_exception(expression)
+
+    def test_check_expression_with_just_a_number(self):
+        expression = '(root 4)'
+        self.assert_check_expression_without_exception(expression)
+
+        expression = '(root -4)'
+        self.assert_check_expression_without_exception(expression)
+
+        expression = '(root 4.23)'
+        self.assert_check_expression_without_exception(expression)
+
+        expression = '(root -234.23)'
+        self.assert_check_expression_without_exception(expression)
+
     def test_check_expression_simple_correct_plus_arguments_amount(self):
         expression = '(root (+ 2 3))'
         self.assert_check_expression_without_exception(expression)