Merge branch 'master' into persist_board_configuration

Conflicts:
	MLC/api/MLCLocal.py
	tests/mlc/api/test_mlc.py

Author: raulopez0

MLC/Application.py

@@ -79,8 +79,6 @@ def _set_numpy_parameters(self):
         np.set_printoptions(threshold=np.inf)
         # Don't show scientific notation
         np.set_printoptions(suppress=True)
-        # Transform printed warnings to real warnings
-        np.seterr(all='raise')
 
     def go(self, to_generation, from_generation=None, display_best=False):
         """
@@ -155,9 +153,6 @@ def go(self, to_generation, from_generation=None, display_best=False):
         # emit app finish event
         self.__callbacks_manager.on_event(MLC_CALLBACKS.ON_FINISH)
 
-        # Return the numpy warning configuration to its original value
-        np.seterr(all='warn')
-
     def get_simulation(self):
         return self._simulation
 

MLC/Common/LispTreeExpr/LispTreeExpr.py

@@ -25,6 +25,7 @@ def __init__(self, expression):
                                "[EXPR_EXCEPTION] Root node was not found. Expression: {0}"
                                .format(expression))
 
+
 class TrailingTrashExprException(ExprException):
 
     def __init__(self, expression):
@@ -122,9 +123,9 @@ def check_operands(expr):
 
                 if expr[pos] == '(':
                     # The argument is another operator. Process it recursively
-                     argument_len = check_operands(expr[pos:])
-                     pos += argument_len
-                     if expr[pos] == ' ':
+                    argument_len = check_operands(expr[pos:])
+                    pos += argument_len
+                    if expr[pos] == ' ':
                         pos += 1
                 else:
                     # The argument is a number or a sensor
@@ -143,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.
@@ -181,6 +181,8 @@ def visit_leaf_node(self, node):
         # First, replace the sensors
         visitor = Replace_Sensors_Visitor(sensor_replacement_list)
         self._root.accept(visitor)
+
+        # Transform printed warnings to real warnings
         return self._root.compute()
 
     def get_root_node(self):

MLC/Common/LispTreeExpr/OperationNodes.py

@@ -340,10 +340,15 @@ def simplify(self):
         return self
 
     def compute(self):
+        np.seterr(all='raise')
         if len(self._nodes) == 1:
-            return self._nodes[0].compute()
+            result = self._nodes[0].compute()
+            np.seterr(all='warn')
+            return result
 
-        return [node.compute() for node in self._nodes]
+        result = [node.compute() for node in self._nodes]
+        np.seterr(all='warn')
+        return result
 
     def formal(self):
         if len(self._nodes) == 1:

MLC/Common/PreevaluationManager.py

@@ -18,10 +18,26 @@ def get_callback():
         """
         # Check if the preevaluation is activated
         if Config.get_instance().getboolean('EVALUATOR', 'preevaluation'):
-            module_name = Config.get_instance().get('EVALUATOR', 'preev_function')
+            function_name = Config.get_instance().get('EVALUATOR', 'preev_function')
+            module_name = "Preevaluation.{0}".format(function_name)
+
+            try:
+                # WARNING: I am unloading manually the evaluation function module. I need to do this
+                # because Python does not support module unloading and my evaluation functions are
+                # all the same, so when one experiment loads his module, other project with the same
+                # name of module won't be able to load yours
+                preev_module = sys.modules["Preevaluation"]
+                del sys.modules['Preevaluation']
+                del preev_module
+                lg.logger_.debug("[EV_FACTORY] Module {0} was removed"
+                                 .format(sys.modules["Preevaluation"]))
+            except KeyError, err:
+                # If the module cannot be unload because it does not exists, continue
+                pass
+
             lg.logger_.debug('[PREEV_MANAGER] Importing module {0}'.format(module_name))
             try:
-                module = importlib.import_module('Preevaluation.' + module_name)
+                module = importlib.import_module(module_name)
                 reload(module)
                 return module
             except ImportError:

MLC/GUI/Autogenerated/autogenerated.py

@@ -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

@@ -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
@@ -417,6 +416,83 @@ 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 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)
+            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 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):
         config_table = self._autogenerated_object.config_table
         table_model = config_table.model()
@@ -626,18 +702,12 @@ def _update_experiment_info(self):
         else:
             self._current_gen = 0
             gen_count_group.setTitle("Generation: 0/0")
+            db_view = self._autogenerated_object.db_view
+            db_view.setModel(None)
 
     def _update_individuals_figure(self):
+        chart_layout = self._autogenerated_object.chart_layout
         if self._current_gen != 0:
-            chart_layout = self._autogenerated_object.chart_layout
-
-            # Matplotlib graphs
-            # indiv_canvas = CostPerIndividualCanvas(indiv_graph_frame, width=5, height=4, dpi=85)
-            # indiv_canvas.set_costs(current_generation.get_costs())
-            # indiv_canvas.set_xlabel('Individuals')
-            # indiv_canvas.set_ylabel('Costs')
-            # indiv_canvas.set_title('Cost Per Individual')
-            # indiv_canvas.compute_initial_figure(self._autogenerated_object.log_check.isChecked())
 
             # Draw current generation
             current_generation = self._mlc_local.get_generation(self._experiment_name, self._current_gen)
@@ -664,13 +734,18 @@ def _update_individuals_figure(self):
                     costs = gen.get_costs()
                     indiv_chart.add_data(samples, costs, color=Qt.blue, line_width=1)
 
-            indiv_canvas = indiv_chart.get_widget()
-
             # Remove all previous widgets before rendering again
             for i in reversed(range(chart_layout.count())):
                 chart_layout.itemAt(i).widget().setParent(None)
+
             # Add the Indiv Canvas
+            indiv_canvas = indiv_chart.get_widget()
             chart_layout.addWidget(indiv_canvas)
+        else:
+            # Remove all previous widgets before rendering again
+            for i in reversed(range(chart_layout.count())):
+                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] - '

MLC/GUI/Experiment/ExperimentWindow.py

@@ -226,14 +226,3 @@ def _load_table(self):
         table_model.set_editable_columns([1])
         table_model.set_data_changed_callback(self.modify_individual)
         table_model.sort_by_col(0)
-
-    def _test_individual_value(self, indiv_value):
-        """
-        Evaluate an individual in order to check its correctness. If the evaluation
-        throw any exception, it won't be handled in this method
-        """
-        LispTreeExpr.check_expression(indiv_value)
-        individual = Individual.generate(config=Config.get_instance(),
-                                         rhs_value=indiv_value)
-        callback = EvaluatorFactory.get_callback()
-        return callback.cost(individual)

MLC/GUI/Experiment/FirstIndividualsManager.py

@@ -9,15 +9,31 @@
 class EvaluatorFactory(object):
     @staticmethod
     def get_callback():
-        module_name = Config.get_instance().get('EVALUATOR', 'evaluation_function')
+        function_name = Config.get_instance().get('EVALUATOR', 'evaluation_function')
+        module_name = 'Evaluation.{0}'.format(function_name)
+
+        try:
+            # WARNING: I am unloading manually the evaluation function module. I need to do this
+            # because Python does not support module unloading and my evaluation functions are
+            # all the same, so when one experiment loads his module, other project with the same
+            # name of module won't be able to load yours
+            ev_module = sys.modules["Evaluation"]
+            del sys.modules['Evaluation']
+            del ev_module
+            lg.logger_.debug("[EV_FACTORY] Module {0} was removed".format(sys.modules["Evaluation"]))
+        except KeyError, err:
+            # If the module cannot be unload because it does not exists, continue
+            pass
+
         lg.logger_.debug('[EV_FACTORY] Importing module {0}'.format(module_name))
         try:
-            module = importlib.import_module('Evaluation.' + module_name)
+            # lg.logger_.debug("[EV_FACTORY] Sys.path: {0}".format(sys.path))
+            module = importlib.import_module(module_name)
             reload(module)
             return module
-        except ImportError:
-            lg.logger_.debug("[EV_FACTORY] Evaluation function doesn't exists. " +
-                             "Aborting program...")
+        except ImportError, err:
+            lg.logger_.debug("[EV_FACTORY] Evaluation function doesn't exists. "
+                             "Aborting program. Error Msg: {0}".format(err))
             sys.exit(-1)
 
     @staticmethod