Fixed bugs in update individual feature

* Value edition was removed because there is no functions in MLCLocal
  to edit this field #41

Author: Ezequiel Torres

MLC/GUI/Experiment/ExperimentDialog.py

@@ -257,6 +257,18 @@ def _config_table_edited(self, left, right):
                      .format(self._experiment_name, section, parameter, value))
         self._autogenerated_object.save_config_button.setDisabled(False)
 
+    def _get_db_view_stored_value(self, model_index, table_model, indiv_id):
+        indiv_data = self._mlc_local.get_individual(self._experiment_name, indiv_id)
+        old_value = None
+
+        if model_index.column() == 4:
+            # Cost modified
+            old_value = indiv_data.get_cost_history()[self._current_gen][0][0]
+        elif model_index.column() == 5:
+            # Value modified
+            old_value = indiv_data.get_value()
+        return old_value
+
     def _db_view_edited(self, left, right):
         db_view = self._autogenerated_object.db_view
         table_model = db_view.model()
@@ -269,24 +281,31 @@ def _db_view_edited(self, left, right):
         indiv_id = int(table_model.get_data(left.row(), 1))
         if response == QMessageBox.No:
             # Get the value stored in the database
-            indiv_data = self._mlc_local.get_individual(self._experiment_name, indiv_id)
-
-            if left.column() == 4:
-                # Cost modified
-                old_value = indiv_data.get_cost_history()[self._current_gen][0][0]
-                logger.info('[EXPERIMENT {0}] [DB_VIEW_EDITED] - '
-                            'Edition was canceled. Cell({1}, {2}) - Old value: {3}'
-                            .format(self._experiment_name, left.row(),
-                                    left.column(), old_value))
-                table_model.set_data(left.row(), left.column(), str(old_value))
-            elif left.column() == 5:
-                # Value modified
-                # TODO:
-                pass
+            old_value = self._get_db_view_stored_value(model_index=left, 
+                                                       table_model=table_model, 
+                                                       indiv_id=indiv_id)
+            logger.info('[EXPERIMENT {0}] [DB_VIEW_EDITED] - '
+                        'Edition was canceled. Cell({1}, {2}) - Old value: {3}'
+                        .format(self._experiment_name, left.row(),
+                                left.column(), old_value))
+            table_model.set_data(left.row(), left.column(), str(old_value))
         else:
             value = table_model.get_data(left.row(), left.column())
 
             if left.column() == 4:
+                try:
+                    float(value)
+                except ValueError:
+                    logger.info("[EXPERIMENT {0}] [DB_VIEW_EDITED] - "
+                                "Cost inserted is not valid. Individual won't be updated)")
+                    QMessageBox.critical(self, "Invalid cost", 
+                                         "Cost inserted is not valid. Individual won't be updated ")
+                    old_value = self._get_db_view_stored_value(model_index=left, 
+                                                               table_model=table_model, 
+                                                               indiv_id=indiv_id)
+                    table_model.set_data(left.row(), left.column(), str(old_value))
+                    return
+
                 logger.info('[EXPERIMENT {0}] [DB_VIEW_EDITED] - '
                             'Updating database. Cell ({1}, {2}) - Value: {3}'
                             .format(self._experiment_name, left.row(),
@@ -296,6 +315,8 @@ def _db_view_edited(self, left, right):
                                                        new_cost=float(value),
                                                        new_ev_time=time.time(),
                                                        generation=self._current_gen)
+                QMessageBox.information(self, "Experiment updated", 
+                                        "Individual was succesfully updated")
             elif left.column() == 5:
                 # TODO
                 pass
@@ -382,7 +403,10 @@ def _update_experiment_info(self):
                 self._current_gen = 1
 
             header = ['Population Index', 'Individual Index', 'Gen Method', 'Appearences', 'Cost', 'Value']
-            editable_columns = [4, 5]
+            # TODO: Add support for value edition
+            # editable_columns = [4, 5]
+            editable_columns = [4]
+
             table_model = ConfigTableModel("DB TABLE", self._individuals_per_generation[self._current_gen - 1],
                                            header, self)
             db_view = self._autogenerated_object.db_view

MLC/db/sqlite/sqlite_repository.py

@@ -4,9 +4,12 @@
 from MLC.db.mlc_repository import MLCRepository
 from MLC.db.mlc_repository import MLCRepositoryHelper, IndividualData
 from MLC.individual.Individual import Individual
+from MLC.Log.log import get_gui_logger
 from MLC.Simulation import Simulation
 from sql_statements import *
 
+logger = get_gui_logger()
+
 
 class SQLiteRepository(MLCRepository):
     IN_MEMORY_DB = ":memory:"
@@ -208,7 +211,8 @@ def update_individual_cost(self, individual_id, cost, evaluation_time, generatio
         else:
             stmt_to_update_cost = stmt_update_cost(individual_id, cost, evaluation_time, generation)
 
-        print ">>> STMT:%s" % stmt_to_update_cost
+        logger.debug("[SQLITE_REPO] [UPDATE_INDIV_COST] - Query executed: {0}"
+                     .format(stmt_to_update_cost))
         self.__execute(stmt_to_update_cost)
 
     def __execute(self, statement):