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

Author: Marco-GG

MLC/Common/PreevaluationManager.py

@@ -21,8 +21,9 @@ def get_callback():
             module_name = Config.get_instance().get('EVALUATOR', 'preev_function')
             lg.logger_.debug('[PREEV_MANAGER] Importing module {0}'.format(module_name))
             try:
-                callback = importlib.import_module('Preevaluation.' + module_name)
-                return callback
+                module = importlib.import_module('Preevaluation.' + module_name)
+                reload(module)
+                return module
             except ImportError:
                 lg.logger_.debug("[PREEV_MANAGER] Preevaluation function doesn't exists. " +
                                  "Aborting program...")

MLC/GUI/Experiment/ExperimentWindow.py

@@ -35,6 +35,7 @@
 from PyQt5.QtWidgets import QInputDialog
 
 from MLC.arduino.protocol import ProtocolConfig
+from MLC.arduino.protocol import ArduinoInterfaceSingleton
 from MLC.arduino.connection.serialconnection import SerialConnectionConfig, SerialConnection
 from MLC.arduino.connection.base import BaseConnection
 
@@ -747,8 +748,8 @@ def _store_board_configuration(self, board_config, serial_conn):
 
         # Init the arduino singleton
         try:
-            ArduinoInterfaceSingleton.get_instance(protocol_setup=self._board_config,
-                                                   conn_setup=self._serial_conn)
+            ArduinoInterfaceSingleton.get_instance(protocol_config=self._board_config,
+                                                   conn_setup=self._serial_conn._asdict())
         except Exception, err:
             logger.debug('[EXPERIMENT {0}] [BOARD_CONFIG] - '
                          'Serial port could not be initialized. Error Msg: {1}'

MLC/GUI/Experiment/FirstIndividualsManager.py

@@ -200,8 +200,6 @@ def get_gen_creator(self):
         indivs_dict = {}
         for index in xrange(len(self._individuals)):
             indiv = Individual(self._individuals[index])
-            print type(indiv)
-            print indiv.get_value()
             indivs_dict[indiv] = [index]
 
         return IndividualSelection(indivs_dict, fill_creator)

MLC/Population/Evaluation/EvaluatorFactory.py

@@ -12,8 +12,9 @@ def get_callback():
         module_name = Config.get_instance().get('EVALUATOR', 'evaluation_function')
         lg.logger_.debug('[EV_FACTORY] Importing module {0}'.format(module_name))
         try:
-            callback = importlib.import_module('Evaluation.' + module_name)
-            return callback
+            module = importlib.import_module('Evaluation.' + module_name)
+            reload(module)
+            return module
         except ImportError:
             lg.logger_.debug("[EV_FACTORY] Evaluation function doesn't exists. " +
                              "Aborting program...")

MLC/arduino/protocol.py

@@ -1,6 +1,7 @@
 import collections
 import boards
 from collections import namedtuple
+import MLC.Log.log as lg
 
 _PROTOCOL_CMDS = {"ANALOG_PRECISION": '\x01\x01%s',
                   "SET_INPUT": '\x02\x01%s',
@@ -24,11 +25,20 @@
 class ArduinoInterfaceSingleton():
     _instance = None
 
-    def get_instance(cls, protocol_config=None, conn_setup=None):
+    @staticmethod
+    def get_instance(protocol_config=None, conn_setup=None):
         from MLC.arduino.connection.serialconnection import SerialConnection
-        if protocol_setup and conn_setup:
-            serial_conn = SerialConnection(**conn_setup)
-            protocol_config._replace(connection, serial_conn)
+        if protocol_config and conn_setup:
+
+            serial_conn = None
+            try:
+                serial_conn = SerialConnection(**conn_setup)
+            except Exception, err:
+                lg.logger_.info("[PROTOCOL] Error while loading SerialConnection. "
+                                "Err msg: {0}".format(err))
+                raise
+
+            protocol_config = protocol_config._replace(connection=serial_conn)
             ArduinoInterfaceSingleton._instance = BuildSerial(protocol_config)
 
         if ArduinoInterfaceSingleton._instance is None:
@@ -274,4 +284,7 @@ def BuildSerial(protocol_config):
     for port in protocol_config.analog_output_pins:
         interface.add_output(port)
 
+    # FIXME: Make this variable configurable
+    interface.set_precision(12)
+
     return interface