Merge branch 'master' of github.com:Ezetowers/taller3_final

Author: raulopez0

MLC/GUI/Autogenerated/autogenerated.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file './mlc_qtcreator/arduinoconnectiontest.ui'
 #
-# Created by: PyQt5 UI code generator 5.7
+# Created by: PyQt5 UI code generator 5.7.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -48,7 +48,7 @@ def retranslateUi(self, ArduinoConnectionDialog):
 
 # Form implementation generated from reading ui file './mlc_qtcreator/pinout_design.ui'
 #
-# Created by: PyQt5 UI code generator 5.7
+# Created by: PyQt5 UI code generator 5.7.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -84,7 +84,7 @@ def retranslateUi(self, ArduinoBoardDialog):
 
 # Form implementation generated from reading ui file './mlc_qtcreator/mainwindow.ui'
 #
-# Created by: PyQt5 UI code generator 5.7
+# Created by: PyQt5 UI code generator 5.7.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -251,7 +251,7 @@ def retranslateUi(self, MLCManager):
 
 # Form implementation generated from reading ui file './mlc_qtcreator/experiment_in_progress.ui'
 #
-# Created by: PyQt5 UI code generator 5.7
+# Created by: PyQt5 UI code generator 5.7.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -352,7 +352,7 @@ def retranslateUi(self, ExperimentInProgressWindow):
 
 # Form implementation generated from reading ui file './mlc_qtcreator/experiment.ui'
 #
-# Created by: PyQt5 UI code generator 5.7
+# Created by: PyQt5 UI code generator 5.7.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -407,9 +407,6 @@ def setupUi(self, ExperimentWindow):
         self.label_7 = QtWidgets.QLabel(self.groupBox_7)
         self.label_7.setObjectName("label_7")
         self.gridLayout_6.addWidget(self.label_7, 0, 0, 1, 1)
-        self.marker_combo = QtWidgets.QComboBox(self.groupBox_7)
-        self.marker_combo.setObjectName("marker_combo")
-        self.gridLayout_6.addWidget(self.marker_combo, 0, 5, 1, 1)
         self.overflow_color_combo = QtWidgets.QComboBox(self.groupBox_7)
         self.overflow_color_combo.setObjectName("overflow_color_combo")
         self.gridLayout_6.addWidget(self.overflow_color_combo, 6, 1, 1, 1)
@@ -431,9 +428,6 @@ def setupUi(self, ExperimentWindow):
         self.max_cost_combo = QtWidgets.QComboBox(self.groupBox_7)
         self.max_cost_combo.setObjectName("max_cost_combo")
         self.gridLayout_6.addWidget(self.max_cost_combo, 0, 1, 1, 1)
-        self.label_14 = QtWidgets.QLabel(self.groupBox_7)
-        self.label_14.setObjectName("label_14")
-        self.gridLayout_6.addWidget(self.label_14, 0, 4, 1, 1)
         self.min_cost_combo = QtWidgets.QComboBox(self.groupBox_7)
         self.min_cost_combo.setObjectName("min_cost_combo")
         self.gridLayout_6.addWidget(self.min_cost_combo, 0, 3, 1, 1)
@@ -443,24 +437,24 @@ def setupUi(self, ExperimentWindow):
         self.valid_points_combo = QtWidgets.QComboBox(self.groupBox_7)
         self.valid_points_combo.setObjectName("valid_points_combo")
         self.gridLayout_6.addWidget(self.valid_points_combo, 1, 1, 1, 1)
-        self.label_12 = QtWidgets.QLabel(self.groupBox_7)
-        self.label_12.setObjectName("label_12")
-        self.gridLayout_6.addWidget(self.label_12, 1, 2, 1, 1)
-        self.overflow_value_combo = QtWidgets.QComboBox(self.groupBox_7)
-        self.overflow_value_combo.setObjectName("overflow_value_combo")
-        self.gridLayout_6.addWidget(self.overflow_value_combo, 1, 3, 1, 1)
-        self.label_15 = QtWidgets.QLabel(self.groupBox_7)
-        self.label_15.setObjectName("label_15")
-        self.gridLayout_6.addWidget(self.label_15, 1, 4, 1, 1)
-        self.points_combo = QtWidgets.QComboBox(self.groupBox_7)
-        self.points_combo.setObjectName("points_combo")
-        self.gridLayout_6.addWidget(self.points_combo, 1, 5, 1, 1)
         self.label_13 = QtWidgets.QLabel(self.groupBox_7)
         self.label_13.setObjectName("label_13")
-        self.gridLayout_6.addWidget(self.label_13, 6, 2, 1, 1)
+        self.gridLayout_6.addWidget(self.label_13, 7, 2, 1, 1)
         self.nan_value_combo = QtWidgets.QComboBox(self.groupBox_7)
         self.nan_value_combo.setObjectName("nan_value_combo")
-        self.gridLayout_6.addWidget(self.nan_value_combo, 6, 3, 1, 1)
+        self.gridLayout_6.addWidget(self.nan_value_combo, 7, 3, 1, 1)
+        self.label_12 = QtWidgets.QLabel(self.groupBox_7)
+        self.label_12.setObjectName("label_12")
+        self.gridLayout_6.addWidget(self.label_12, 6, 2, 1, 1)
+        self.overflow_value_combo = QtWidgets.QComboBox(self.groupBox_7)
+        self.overflow_value_combo.setObjectName("overflow_value_combo")
+        self.gridLayout_6.addWidget(self.overflow_value_combo, 6, 3, 1, 1)
+        self.label_14 = QtWidgets.QLabel(self.groupBox_7)
+        self.label_14.setObjectName("label_14")
+        self.gridLayout_6.addWidget(self.label_14, 1, 2, 1, 1)
+        self.marker_combo = QtWidgets.QComboBox(self.groupBox_7)
+        self.marker_combo.setObjectName("marker_combo")
+        self.gridLayout_6.addWidget(self.marker_combo, 1, 3, 1, 1)
         self.verticalLayout_4.addWidget(self.groupBox_7)
         self.horizontalLayout_2.addWidget(self.frame_4)
         self.frame_3 = QtWidgets.QFrame(self.experiment_tab)
@@ -705,7 +699,6 @@ def setupUi(self, ExperimentWindow):
         self.start_button.clicked.connect(ExperimentWindow.on_start_button_clicked)
         self.valid_points_combo.currentTextChanged['QString'].connect(ExperimentWindow.on_chart_config_changed)
         self.overflow_color_combo.currentTextChanged['QString'].connect(ExperimentWindow.on_chart_config_changed)
-        self.points_combo.currentTextChanged['QString'].connect(ExperimentWindow.on_chart_config_changed)
         self.marker_combo.currentTextChanged['QString'].connect(ExperimentWindow.on_chart_config_changed)
         self.overflow_value_combo.currentTextChanged['QString'].connect(ExperimentWindow.on_chart_config_changed)
         self.nan_value_combo.currentTextChanged['QString'].connect(ExperimentWindow.on_chart_config_changed)
@@ -726,11 +719,10 @@ def retranslateUi(self, ExperimentWindow):
         self.label_8.setText(_translate("ExperimentWindow", "Overflow Color:"))
         self.label_11.setText(_translate("ExperimentWindow", "Min Cost:"))
         self.label_10.setText(_translate("ExperimentWindow", "NaN/Inf Color:"))
-        self.label_14.setText(_translate("ExperimentWindow", "Marker Size:"))
         self.label_9.setText(_translate("ExperimentWindow", "Valid Points Color:"))
-        self.label_12.setText(_translate("ExperimentWindow", "Overflow Value:"))
-        self.label_15.setText(_translate("ExperimentWindow", "Visualized Points:"))
         self.label_13.setText(_translate("ExperimentWindow", "NaN/Inf Value:"))
+        self.label_12.setText(_translate("ExperimentWindow", "Overflow Value:"))
+        self.label_14.setText(_translate("ExperimentWindow", "Marker Size:"))
         self.groupBox_2.setTitle(_translate("ExperimentWindow", "Scripts"))
         self.ev_edit_button.setText(_translate("ExperimentWindow", "Edit"))
         self.preev_edit_button.setText(_translate("ExperimentWindow", "Edit"))
@@ -774,7 +766,7 @@ def retranslateUi(self, ExperimentWindow):
 
 # Form implementation generated from reading ui file './mlc_qtcreator/genealogy.ui'
 #
-# Created by: PyQt5 UI code generator 5.7
+# Created by: PyQt5 UI code generator 5.7.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -813,7 +805,7 @@ def retranslateUi(self, GenealogyWindow):
 
 # Form implementation generated from reading ui file './mlc_qtcreator/board_config_design.ui'
 #
-# Created by: PyQt5 UI code generator 5.7
+# Created by: PyQt5 UI code generator 5.7.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -1086,7 +1078,7 @@ def retranslateUi(self, BoardConfigurationWindow):
 
 # Form implementation generated from reading ui file './mlc_qtcreator/edit_properties.ui'
 #
-# Created by: PyQt5 UI code generator 5.7
+# Created by: PyQt5 UI code generator 5.7.1
 #
 # WARNING! All changes made in this file will be lost!
 

MLC/GUI/Autogenerated/mlc_qtcreator/experiment.ui

@@ -81,9 +81,6 @@
                 </property>
                </widget>
               </item>
-              <item row="0" column="5">
-               <widget class="QComboBox" name="marker_combo"/>
-              </item>
               <item row="6" column="1">
                <widget class="QComboBox" name="overflow_color_combo"/>
               </item>
@@ -120,13 +117,6 @@
               <item row="0" column="1">
                <widget class="QComboBox" name="max_cost_combo"/>
               </item>
-              <item row="0" column="4">
-               <widget class="QLabel" name="label_14">
-                <property name="text">
-                 <string>Marker Size:</string>
-                </property>
-               </widget>
-              </item>
               <item row="0" column="3">
                <widget class="QComboBox" name="min_cost_combo"/>
               </item>
@@ -140,35 +130,35 @@
               <item row="1" column="1">
                <widget class="QComboBox" name="valid_points_combo"/>
               </item>
-              <item row="1" column="2">
-               <widget class="QLabel" name="label_12">
+              <item row="7" column="2">
+               <widget class="QLabel" name="label_13">
                 <property name="text">
-                 <string>Overflow Value:</string>
+                 <string>NaN/Inf Value:</string>
                 </property>
                </widget>
               </item>
-              <item row="1" column="3">
-               <widget class="QComboBox" name="overflow_value_combo"/>
+              <item row="7" column="3">
+               <widget class="QComboBox" name="nan_value_combo"/>
               </item>
-              <item row="1" column="4">
-               <widget class="QLabel" name="label_15">
+              <item row="6" column="2">
+               <widget class="QLabel" name="label_12">
                 <property name="text">
-                 <string>Visualized Points:</string>
+                 <string>Overflow Value:</string>
                 </property>
                </widget>
               </item>
-              <item row="1" column="5">
-               <widget class="QComboBox" name="points_combo"/>
+              <item row="6" column="3">
+               <widget class="QComboBox" name="overflow_value_combo"/>
               </item>
-              <item row="6" column="2">
-               <widget class="QLabel" name="label_13">
+              <item row="1" column="2">
+               <widget class="QLabel" name="label_14">
                 <property name="text">
-                 <string>NaN/Inf Value:</string>
+                 <string>Marker Size:</string>
                 </property>
                </widget>
               </item>
-              <item row="6" column="3">
-               <widget class="QComboBox" name="nan_value_combo"/>
+              <item row="1" column="3">
+               <widget class="QComboBox" name="marker_combo"/>
               </item>
              </layout>
             </widget>
@@ -862,22 +852,6 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>points_combo</sender>
-   <signal>currentTextChanged(QString)</signal>
-   <receiver>ExperimentWindow</receiver>
-   <slot>on_chart_config_changed(QString)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>203</x>
-     <y>484</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>480</x>
-     <y>273</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>marker_combo</sender>
    <signal>currentTextChanged(QString)</signal>

MLC/GUI/Experiment/ChartConfiguration.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import math
 import numpy as np
 import os
 import random
@@ -47,9 +48,8 @@ def __init__(self, autogenerated_object):
         self._overflow_value_combo = self._autogenerated_object.overflow_value_combo
         self._valid_points_combo = self._autogenerated_object.valid_points_combo
         self._marker_combo = self._autogenerated_object.marker_combo
-        self._points_combo = self._autogenerated_object.points_combo
 
-    def init(self):
+    def init(self, population_size):
         # Variable used to determine when the chart can be updated
         self._update_chart = False
         # Load the colors in the combos
@@ -68,18 +68,14 @@ def init(self):
                                                             ChartConfiguration.MARKER_SIZE_VALUES[1] +
                                                             ChartConfiguration.MARKER_SIZE_VALUES[2],
                                                             ChartConfiguration.MARKER_SIZE_VALUES[2])])
-        self._points_combo.addItems([str(x) for x in xrange(ChartConfiguration.AMOUNT_POINTS[0],
-                                                            ChartConfiguration.AMOUNT_POINTS[1] +
-                                                            ChartConfiguration.AMOUNT_POINTS[2],
-                                                            ChartConfiguration.AMOUNT_POINTS[2])])
         self._set_defaults()
-        self._create_new_chart()
+        self._create_new_chart(population_size)
         self._update_chart = True
 
-    def update_chart(self):
+    def update_chart(self, population_size, indiv_costs):
         if self._update_chart:
             self._set_default_overflow_and_nan_values()
-            self._create_new_chart()
+            self._create_new_chart(population_size, indiv_costs)
 
     def chart_params(self):
         chart_params = {"max_cost": int(self._max_cost_combo.currentText()),
@@ -96,7 +92,6 @@ def _set_defaults(self):
         self._min_cost_combo.setCurrentIndex(0)
         self._max_cost_combo.setCurrentIndex(self._max_cost_combo.count() - 1)
         self._marker_combo.setCurrentIndex(self._marker_combo.count() / 2 - 1)
-        self._points_combo.setCurrentIndex(0)
         self._valid_points_combo.setCurrentIndex(int(self._valid_points_combo.findText("DarkGreen")))
         self._overflow_color_combo.setCurrentIndex(int(self._overflow_color_combo.findText("Red")))
         self._nan_color_combo.setCurrentIndex(int(self._nan_color_combo.findText("Magenta")))
@@ -148,7 +143,7 @@ def _refresh_overflow_and_nan_combos(self):
             self._nan_value_combo.setCurrentIndex(
                 self._nan_value_combo.findText(str(nan_value)))
 
-    def _create_new_chart(self):
+    def _create_new_chart(self, population_size, indiv_costs=None):
         # Insert the widget into the widget
         chart_conf_layout = self._autogenerated_object.chart_conf_layout
 
@@ -177,30 +172,39 @@ def _create_new_chart(self):
         # Yellow: Nan and Inf points
         indiv_chart.add_scatter(marker_size=marker_size, color=nan_color, legend="Nan or Inf")
 
-        amount_points = int(self._points_combo.currentText())
+        amount_points = int(population_size)
         indiv_canvas = indiv_chart.get_widget()
         indiv_canvas.chart().axisX().setRange(1, amount_points)
 
-        min_range = int(self._min_cost_combo.currentText())
-        max_range = int(self._max_cost_combo.currentText())
-        indiv_canvas.chart().axisY().setRange(min_range, max_range)
-        self._max_cost = 0
-
-        # Add Points
-        for index in xrange(1, amount_points + 1):
-            if index % 11 == 0:
-                # Add an overflow point every 11 points
-                overflow_value = int(self._overflow_value_combo.currentText())
-                indiv_chart.append_point(1, index, overflow_value)
-            elif index % 17 == 0:
-                # Add a nan point every 17 points
-                nan_value = int(self._nan_value_combo.currentText())
-                indiv_chart.append_point(2, index, nan_value)
-            else:
-                # Draw a cosine
-                amp = max_range / 2
-                value = amp * np.cos(2 * np.pi * index / amount_points) + amp
-                indiv_chart.append_point(0, index, value)
+        min_cost = int(self._min_cost_combo.currentText())
+        max_cost = int(self._max_cost_combo.currentText())
+        indiv_canvas.chart().axisY().setRange(min_cost, max_cost)
+
+        overflow_value = int(self._overflow_value_combo.currentText())
+        nan_value = int(self._nan_value_combo.currentText())
+        if not indiv_costs:
+            # Add Points
+            for index in xrange(1, amount_points + 1):
+                if index % 11 == 0:
+                    # Add an overflow point every 11 points
+                    indiv_chart.append_point(1, index, overflow_value)
+                elif index % 17 == 0:
+                    # Add a nan point every 17 points
+                    indiv_chart.append_point(2, index, nan_value)
+                else:
+                    # Draw a cosine
+                    amp = max_cost / 2
+                    value = amp * np.cos(2 * np.pi * index / amount_points) + amp
+                    indiv_chart.append_point(0, index, value)
+        else:
+            for index in xrange(1, amount_points + 1):
+                indiv_cost = indiv_costs[index - 1]
+                if indiv_cost > max_cost:
+                    indiv_chart.append_point(1, index, overflow_value)
+                elif math.isnan(indiv_cost) or math.isinf(indiv_cost):
+                    indiv_chart.append_point(2, index, nan_value)
+                else:
+                    indiv_chart.append_point(0, index, indiv_cost)
 
         # Remove all previous widgets before rendering again
         for i in reversed(range(chart_conf_layout.count())):

MLC/GUI/Experiment/ExperimentInProgress.py

@@ -51,6 +51,7 @@ def continue_experiment(self):
 
     def cancel_experiment(self):
         self._condition.acquire()
+        self._experiment_stopped = False
         self._experiment_cancelled = True
         self._condition.notify()
         self._condition.release()
@@ -148,7 +149,7 @@ def _update_dialog(self, indivs_per_gen_counter, total_indivs_counter, gen_count
         self._update_current_gen_experiment(indivs_per_gen_counter, cost)
 
     def _simulation_finished(self):
-        logger.debug('{0} [SIM_FINISHED] - Executing simulation_finished function'.format(self._log_prefix))
+        logger.debug('{0} [SIM_FINISHED] - Executing _simulation_finished function'.format(self._log_prefix))
         self._parent_signal.emit(self._experiment_condition.experiment_cancelled())
 
     def _update_current_gen_experiment(self, indiv_index, cost):
@@ -290,7 +291,9 @@ def close_window(self):
         self._dialog.close()
 
     def _check_if_project_stopped_or_cancelled(self):
-        if self._experiment_condition.wait_if_experiment_stopped():
-            # Check if the experiment was cancelled
-            if self._experiment_condition.experiment_cancelled():
-                raise ThreadCancelException()
+        self._experiment_condition.wait_if_experiment_stopped()
+        # Check if the experiment was cancelled
+        if self._experiment_condition.experiment_cancelled():
+            logger.debug('{0} [CHECK_IF_PROJECT_CANCELLED] - Raising ThreadCancelException'
+                         .format(self._log_prefix))
+            raise ThreadCancelException()