Added Preevaluation test and correct Operations singleton bug

Ezetowers · Ezetowers · commit 870f23bcc3c2 · 2017-02-17T15:52:34.000-03:00
diff --git a/MLC/Application.py b/MLC/Application.py
@@ -2,6 +2,7 @@
 import MLC.Log.log as lg
 
 from MLC.Common.PreevaluationManager import PreevaluationManager
+from MLC.Common.Operations import Operations
 from MLC.db.mlc_repository import MLCRepository
 from MLC.Log.log import set_logger
 from MLC.mlc_parameters.mlc_parameters import Config
@@ -21,6 +22,8 @@ class Application(object):
 
     def __init__(self, simulation, callbacks={}, gen_creator=None):
         self._config = Config.get_instance()
+        # Reload the Operations supported
+        Operations.get_instance(reload_operations=True)
 
         self._simulation = simulation
         self._mlc_repository = MLCRepository.get_instance()
diff --git a/MLC/Common/Operations.py b/MLC/Common/Operations.py
@@ -21,12 +21,13 @@ def __init__(self):
         for operation_id in opsetrange:
             self._ops[operation_id] = available_operations[operation_id]
 
-
-    def get_operation_from_op_num(self, op_num):
+    def get_operation_from_op_num(self, op_num_index):
         try:
-            return self._ops[op_num]
+            return self._ops.values()[int(op_num_index) - 1]
         except KeyError:
-            raise IndexError("get_operation", "Index must be one of the following values: " + str(self._ops.keys()))
+            raise IndexError("get_operation_from_op_num",
+                             "Index must be one of the following values: {0}"
+                             .format(str(self._ops.keys())))
 
     def get_operation_from_op_string(self, str_op):
         for k, op in self._ops.iteritems():
@@ -40,8 +41,8 @@ def length(self):
         return len(self._ops)
 
     @staticmethod
-    def get_instance():
-        if Operations._instance is None:
+    def get_instance(reload_operations=False):
+        if reload_operations or Operations._instance is None:
             Operations._instance = Operations()
 
         return Operations._instance
diff --git a/MLC/GUI/Autogenerated/autogenerated.py b/MLC/GUI/Autogenerated/autogenerated.py
@@ -450,7 +450,7 @@ class Ui_ExperimentWindow(object):
     def setupUi(self, ExperimentWindow):
         ExperimentWindow.setObjectName("ExperimentWindow")
         ExperimentWindow.setWindowModality(QtCore.Qt.ApplicationModal)
-        ExperimentWindow.resize(961, 568)
+        ExperimentWindow.resize(965, 615)
         self.centralWidget = QtWidgets.QWidget(ExperimentWindow)
         self.centralWidget.setObjectName("centralWidget")
         self.horizontalLayout = QtWidgets.QHBoxLayout(self.centralWidget)
@@ -599,8 +599,37 @@ def setupUi(self, ExperimentWindow):
         self.test_indiv_edit.setObjectName("test_indiv_edit")
         self.gridLayout_4.addWidget(self.test_indiv_edit, 1, 3, 1, 1)
         self.verticalLayout_3.addWidget(self.groupBox_5)
+        self.groupBox_12 = QtWidgets.QGroupBox(self.frame_3)
+        self.groupBox_12.setObjectName("groupBox_12")
+        self.gridLayout_8 = QtWidgets.QGridLayout(self.groupBox_12)
+        self.gridLayout_8.setObjectName("gridLayout_8")
+        self.test_preev_indiv_edit = QtWidgets.QLineEdit(self.groupBox_12)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.test_preev_indiv_edit.sizePolicy().hasHeightForWidth())
+        self.test_preev_indiv_edit.setSizePolicy(sizePolicy)
+        self.test_preev_indiv_edit.setObjectName("test_preev_indiv_edit")
+        self.gridLayout_8.addWidget(self.test_preev_indiv_edit, 1, 1, 1, 1)
+        self.label_15 = QtWidgets.QLabel(self.groupBox_12)
+        self.label_15.setObjectName("label_15")
+        self.gridLayout_8.addWidget(self.label_15, 1, 0, 1, 1)
+        self.label_17 = QtWidgets.QLabel(self.groupBox_12)
+        self.label_17.setObjectName("label_17")
+        self.gridLayout_8.addWidget(self.label_17, 2, 0, 1, 1)
+        self.test_preev_indiv_result = QtWidgets.QLabel(self.groupBox_12)
+        self.test_preev_indiv_result.setFrameShape(QtWidgets.QFrame.Panel)
+        self.test_preev_indiv_result.setFrameShadow(QtWidgets.QFrame.Raised)
+        self.test_preev_indiv_result.setText("")
+        self.test_preev_indiv_result.setAlignment(QtCore.Qt.AlignCenter)
+        self.test_preev_indiv_result.setObjectName("test_preev_indiv_result")
+        self.gridLayout_8.addWidget(self.test_preev_indiv_result, 2, 1, 1, 1)
+        self.test_preev_indiv_button = QtWidgets.QPushButton(self.groupBox_12)
+        self.test_preev_indiv_button.setObjectName("test_preev_indiv_button")
+        self.gridLayout_8.addWidget(self.test_preev_indiv_button, 3, 1, 1, 1)
+        self.verticalLayout_3.addWidget(self.groupBox_12)
         self.groupBox_6 = QtWidgets.QGroupBox(self.frame_3)
-        self.groupBox_6.setFlat(True)
+        self.groupBox_6.setFlat(False)
         self.groupBox_6.setObjectName("groupBox_6")
         self.gridLayout_5 = QtWidgets.QGridLayout(self.groupBox_6)
         self.gridLayout_5.setObjectName("gridLayout_5")
@@ -828,7 +857,7 @@ def setupUi(self, ExperimentWindow):
         ExperimentWindow.setCentralWidget(self.centralWidget)
 
         self.retranslateUi(ExperimentWindow)
-        self.tabWidget.setCurrentIndex(1)
+        self.tabWidget.setCurrentIndex(0)
         self.next_gen_button.clicked.connect(ExperimentWindow.on_next_gen_button_clicked)
         self.save_config_button.clicked.connect(ExperimentWindow.on_save_config_button_clicked)
         self.dimension_check.clicked.connect(ExperimentWindow.on_dimension_check_clicked)
@@ -861,6 +890,7 @@ def setupUi(self, ExperimentWindow):
         self.first_remove_indiv.clicked.connect(ExperimentWindow.on_first_remove_indiv_button_clicked)
         self.gen_cut_button.clicked.connect(ExperimentWindow.on_gen_cut_button_clicked)
         self.gen_start_over_button.clicked.connect(ExperimentWindow.on_gen_start_over_button_clicked)
+        self.test_preev_indiv_button.clicked.connect(ExperimentWindow.on_test_preev_indiv_button_clicked)
         # QtCore.QMetaObject.connectSlotsByName(ExperimentWindow)
 
     def retranslateUi(self, ExperimentWindow):
@@ -884,6 +914,10 @@ def retranslateUi(self, ExperimentWindow):
         self.test_button.setText(_translate("ExperimentWindow", "Test"))
         self.label.setText(_translate("ExperimentWindow", "Test Result:"))
         self.label_2.setText(_translate("ExperimentWindow", "Test Individual:"))
+        self.groupBox_12.setTitle(_translate("ExperimentWindow", "Preevaluation"))
+        self.label_15.setText(_translate("ExperimentWindow", "Test Individual:"))
+        self.label_17.setText(_translate("ExperimentWindow", "Test Result:"))
+        self.test_preev_indiv_button.setText(_translate("ExperimentWindow", "Test"))
         self.groupBox_6.setTitle(_translate("ExperimentWindow", "Experiment"))
         self.start_button.setText(_translate("ExperimentWindow", "Start Experiment"))
         self.label_5.setText(_translate("ExperimentWindow", "To Generation:"))
diff --git a/MLC/GUI/Autogenerated/mlc_qtcreator/experiment.ui b/MLC/GUI/Autogenerated/mlc_qtcreator/experiment.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>961</width>
-    <height>568</height>
+    <width>965</width>
+    <height>615</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -274,13 +274,69 @@
              </layout>
             </widget>
            </item>
+           <item>
+            <widget class="QGroupBox" name="groupBox_12">
+             <property name="title">
+              <string>Preevaluation</string>
+             </property>
+             <layout class="QGridLayout" name="gridLayout_8">
+              <item row="1" column="1">
+               <widget class="QLineEdit" name="test_preev_indiv_edit">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="label_15">
+                <property name="text">
+                 <string>Test Individual:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="0">
+               <widget class="QLabel" name="label_17">
+                <property name="text">
+                 <string>Test Result:</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QLabel" name="test_preev_indiv_result">
+                <property name="frameShape">
+                 <enum>QFrame::Panel</enum>
+                </property>
+                <property name="frameShadow">
+                 <enum>QFrame::Raised</enum>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignCenter</set>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="1">
+               <widget class="QPushButton" name="test_preev_indiv_button">
+                <property name="text">
+                 <string>Test</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
            <item>
             <widget class="QGroupBox" name="groupBox_6">
              <property name="title">
               <string>Experiment</string>
              </property>
              <property name="flat">
-              <bool>true</bool>
+              <bool>false</bool>
              </property>
              <layout class="QGridLayout" name="gridLayout_5">
               <item row="2" column="1">
@@ -1270,6 +1326,22 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>test_preev_indiv_button</sender>
+   <signal>clicked()</signal>
+   <receiver>ExperimentWindow</receiver>
+   <slot>on_test_preev_indiv_button_clicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>860</x>
+     <y>359</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>482</x>
+     <y>304</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>on_closed_dialog()</slot>
@@ -1299,5 +1371,6 @@
   <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>
+  <slot>on_test_preev_indiv_button_clicked()</slot>
  </slots>
 </ui>
diff --git a/MLC/GUI/Experiment/ExperimentWindow.py b/MLC/GUI/Experiment/ExperimentWindow.py
@@ -8,6 +8,7 @@
 
 from MLC.Log.log import get_gui_logger
 from MLC.GUI.util import test_individual_value
+from MLC.GUI.util import check_if_indiv_pass_preevaluation
 from MLC.GUI.Autogenerated.autogenerated import Ui_ExperimentWindow
 from MLC.GUI.Experiment.ArduinoConfigManager.ArduinoBoardManager import ArduinoBoardManager
 from MLC.GUI.Experiment.ChartConfiguration import ChartConfiguration
@@ -203,7 +204,7 @@ def on_test_button_clicked(self):
         if test_indiv_edit.text() == "":
             logger.warn('[EXPERIMENT {0}] [TEST_BUTTON] - The individual value cannot be an empty string'
                         .format(self._experiment_name))
-            QMessageBox.information(self, "Test Individual",
+            QMessageBox.information(self, "Test Evaluation Script",
                                     "The individual value cannot be an empty string.", QMessageBox.Ok)
             return
 
@@ -217,6 +218,28 @@ def on_test_button_clicked(self):
             test_label_result = self._autogenerated_object.test_label_result
             test_label_result.setText(str(cost))
 
+    def on_test_preev_indiv_button_clicked(self):
+        logger.debug('[EXPERIMENT {0}] [TEST_BUTTON] - Executing on_test_button_clicked function'
+                     .format(self._experiment_name))
+
+        test_indiv_edit = self._autogenerated_object.test_preev_indiv_edit
+        if test_indiv_edit.text() == "":
+            logger.warn('[EXPERIMENT {0}] [TEST_BUTTON] - The individual value cannot be an empty string'
+                        .format(self._experiment_name))
+            QMessageBox.information(self, "Test Preevaluation Script",
+                                    "The individual value cannot be an empty string.", QMessageBox.Ok)
+            return
+
+        result = check_if_indiv_pass_preevaluation(parent=self,
+                                                   experiment_name=self._experiment_name,
+                                                   log_prefix="[EXPERIMENT_WINDOW]",
+                                                   indiv_value=test_indiv_edit.text(),
+                                                   config=Config.get_instance())
+
+        if result is not None:
+            test_label_result = self._autogenerated_object.test_preev_indiv_result
+            test_label_result.setText(str(result))
+
     def on_log_check_clicked(self):
         logger.debug('[EXPERIMENT {0}] [LOG_CHECK_CLICKED] - Executing on_log_check_clicked function'
                      .format(self._experiment_name))
diff --git a/MLC/GUI/util.py b/MLC/GUI/util.py
@@ -1,5 +1,6 @@
 from MLC.Common.LispTreeExpr.LispTreeExpr import LispTreeExpr
 from MLC.Common.LispTreeExpr.LispTreeExpr import ExprException
+from MLC.Common.PreevaluationManager import PreevaluationManager
 from MLC.individual.Individual import Individual
 from MLC.Log.log import get_gui_logger
 from MLC.Population.Evaluation.EvaluatorFactory import EvaluatorFactory
@@ -49,7 +50,6 @@ def test_individual_value(parent, experiment_name, log_prefix, indiv_value, conf
     return None
 
 
-
 def check_individual_value(parent, experiment_name, log_prefix, indiv_value, nodialog=False):
     try:
         """
@@ -71,4 +71,41 @@ def check_individual_value(parent, experiment_name, log_prefix, indiv_value, nod
                      "Error Msg: {2}"
                      .format(log_prefix, experiment_name,
                              err.message[err.message.find(']') + 2:]))
-    return False
+    return False
+
+
+def check_if_indiv_pass_preevaluation(parent, experiment_name, log_prefix, indiv_value, config):
+    try:
+        """
+        Evaluate an individual in order to check its correctness. Handle Exceptions
+        """
+        LispTreeExpr.check_expression(indiv_value)
+        individual = Individual.generate(config=config,
+                                         rhs_value=indiv_value)
+        callback = PreevaluationManager.get_callback()
+        return callback.preev(individual)
+    except ExprException, err:
+        # Print the error message returned in the exception,
+        # removing the prefix ([EXPR_EXCEPTION]])
+        QMessageBox.critical(parent,
+                             "Invalid Individual",
+                             "Individual inserted is not well-formed. "
+                             "Error Msg: {0}"
+                             .format(err.message[err.message.find(']') + 2:]))
+        logger.error("{0} Experiment {1} - "
+                     "Individual inserted is not well-formed. "
+                     "Error Msg: {2}"
+                     .format(log_prefix, experiment_name,
+                             err.message[err.message.find(']') + 2:]))
+    except Exception, err:
+        QMessageBox.critical(parent,
+                             "Invalid Evaluation Script",
+                             "Check the evaluation script to be correct. "
+                             "Error Msg: {0}.".format(err))
+        logger.error("{0} Experiment {1} - "
+                     "Individual inserted is not a valid individual. "
+                     "Check the evaluation script to be correct. "
+                     "Error Msg: {2}."
+                     .format(log_prefix, experiment_name, err))
+
+    return None
