Added feature (with ton of bugs yet) of editing Individuals costs

* There are a lot of bugs to be fixed yet. #41

Author: Ezetowers

MLC/Application.py

@@ -71,7 +71,7 @@ def __init__(self, simulation, callbacks={}):
 
     def _set_numpy_parameters(self):
         # Set printable resolution (don't alter numpy interval resolution)
-        np.set_printoptions(precision=3)
+        np.set_printoptions(precision=9)
         # Show full arrays, no matter what size do they have
         np.set_printoptions(threshold=np.inf)
         # Don't show scientific notation

MLC/GUI/Experiment/ExperimentDialog.py

@@ -3,6 +3,7 @@
 import os
 import numpy as np
 import sys
+import time
 sys.path.append(os.path.abspath(".") + "/../..")
 
 from MLC.Log.log import get_gui_logger
@@ -104,10 +105,6 @@ def on_prev_gen_button_clicked(self):
 
         if self._current_gen > 1:
             self._current_gen -= 1
-
-            # Change combo box currentIndex
-            gen_count_combo = self._autogenerated_object.gen_count_combo
-
             self._update_experiment_info()
             self._update_individuals_figure()
 
@@ -118,10 +115,6 @@ def on_next_gen_button_clicked(self):
 
         if self._current_gen < number_of_gens:
             self._current_gen += 1
-
-            # Change combo box currentIndex
-            gen_count_combo = self._autogenerated_object.gen_count_combo
-
             self._update_experiment_info()
             self._update_individuals_figure()
 
@@ -140,7 +133,7 @@ def on_test_button_clicked(self):
         # Calculate individual cost
         try:
 
-            individual = Individual.generate(config=Config.get_instance(), 
+            individual = Individual.generate(config=Config.get_instance(),
                                              rhs_value=test_indiv_edit.text())
             callback = EvaluatorFactory.get_callback()
             cost = callback.cost(individual)
@@ -265,8 +258,47 @@ def _config_table_edited(self, left, right):
         self._autogenerated_object.save_config_button.setDisabled(False)
 
     def _db_view_edited(self, left, right):
-        # TODO
-        pass
+        db_view = self._autogenerated_object.db_view
+        table_model = db_view.model()
+
+        response = QMessageBox.information(self, "Editing Experiment DB",
+                                           "Do you really want to change value?",
+                                           QMessageBox.No | QMessageBox.Yes,
+                                           QMessageBox.No)
+
+        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
+        else:
+            value = table_model.get_data(left.row(), left.column())
+
+            if left.column() == 4:
+                logger.info('[EXPERIMENT {0}] [DB_VIEW_EDITED] - '
+                            'Updating database. Cell ({1}, {2}) - Value: {3}'
+                            .format(self._experiment_name, left.row(),
+                                    left.column(), value))
+                self._mlc_local.update_individual_cost(experiment_name=self._experiment_name,
+                                                       indiv_id=indiv_id,
+                                                       new_cost=float(value),
+                                                       new_ev_time=time.time(),
+                                                       generation=self._current_gen)
+            elif left.column() == 5:
+                # TODO
+                pass
 
     def _update_individuals_per_generation_list(self):
         # Clean up ye olde list
@@ -297,12 +329,12 @@ def _update_individuals_per_generation_list(self):
 
             for pop_index in xrange(1, indivs_per_gen + 1):
                 indiv_index = pop_individuals[pop_index - 1]
-                indiv_cost = costs[pop_index - 1]
+                indiv_cost = str(costs[pop_index - 1])
                 indiv_value = individuals[indiv_index].get_value()
                 indiv_appearences = individuals[indiv_index].get_appearances()
 
                 indiv_gen_method = Population.gen_method_description(gen_methods[pop_index - 1])
-                gens_list.append([pop_index, indiv_index + 1, indiv_gen_method,
+                gens_list.append([pop_index, indiv_index, indiv_gen_method,
                                   indiv_appearences, indiv_cost, indiv_value])
 
             self._individuals_per_generation.append(gens_list)
@@ -358,6 +390,7 @@ def _update_experiment_info(self):
             db_view.resizeColumnsToContents()
             db_view.setSortingEnabled(True)
             table_model.set_editable_columns(editable_columns)
+            table_model.set_data_changed_callback(self._db_view_edited)
             table_model.sort_by_col(0)
 
             # Refresh the gen_count_label

MLC/GUI/Tables/ConfigTableModel.py

@@ -88,6 +88,17 @@ def setData(self, index, value, role):
                              .format(self._name, index.row(), index.column()))
         return False
 
+    def set_data(self, row, col, value):
+        try:
+            # Check if the row exists, indexing the element to modify
+            self.layoutAboutToBeChanged.emit()
+            self._data[row][col] = value
+            self.layoutChanged.emit()
+        except IndexError:
+            logger.error("[TABLE_VIEW] [{0}] - [SET_DATA] IndexError while retrieving data. "
+                         "Row: {1} - Col: {2}"
+                         .format(self._name, index.row(), index.column()))
+
     def get_data(self, row, col):
         try:
             return self._data[row][col]

MLC/api/MLCLocal.py

@@ -211,11 +211,6 @@ def go(self, experiment_name, to_generation, from_generation=0, callbacks={}):
         return True
 
     def get_individuals(self, experiment_name):
-        """
-        Return a list with IndividualData (see MLCRepository::IndividualData)
-        :param experiment_name:
-        :return:
-        """
         if experiment_name not in self._experiments:
             raise ExperimentNotExistException(experiment_name)
 
@@ -229,6 +224,20 @@ def get_individuals(self, experiment_name):
         individuals = MLCRepository.get_instance().get_individuals_data()
         return individuals
 
+    def get_individual(self, experiment_name, individual_id):
+        if experiment_name not in self._experiments:
+            raise ExperimentNotExistException(experiment_name)
+
+        if experiment_name not in self._open_experiments:
+            raise ClosedExperimentException("get_experiment_info", experiment_name)
+
+        # get simulation in order to load mlc experiment database
+        simulation = self._open_experiments[experiment_name].get_simulation()
+
+        # obtain individuals from the database
+        individual = MLCRepository.get_instance().get_individual_data(individual_id)
+        return individual
+
     def update_individual_cost(self, experiment_name, indiv_id, new_cost, new_ev_time, generation=-1):
         if experiment_name not in self._experiments:
             raise ExperimentNotExistException(experiment_name)

MLC/api/mlc.py

@@ -35,12 +35,14 @@ def __init__(self, experiment_name, script_path):
                                     "existent evaluation script. Script: {1}"
                                     .format(experiment_name, script_path))
 
+
 class ImportExperimentPathNotExistException(MLCException):
 
     def __init__(self, experiment_path):
         MLCException.__init__(self, "Import Experiment Error: Path {0} does not exists."
                                     .format(experiment_path))
 
+
 class MLC:
 
     def open_experiment(self, experiment_name):
@@ -159,14 +161,22 @@ def get_generation(self, experiment_name, generation_number):
         """
         raise NotImplementedError("MLC::get_generation not implemented")
 
-    def get_individuals(self, experiment_name, individual_id=None):
+    def get_individuals(self, experiment_name):
         """
             Obtained generated individuals during the simulation.
             :param experiment_name:
             :return:
         """
         raise NotImplementedError("MLC::get_individuals not implemented")
 
+    def get_individual(self, experiment_name, individual_id):
+        """
+            Obtained generated individuals during the simulation.
+            :param experiment_name:
+            :return:
+        """
+        raise NotImplementedError("MLC::get_individual not implemented")
+
     def update_individual_cost(self, experiment_name, indiv_id, new_cost, new_ev_time, generation=-1):
         """
             Update individual cost. If generation == -1 Individual cost will

MLC/db/mlc_repository.py

@@ -8,6 +8,7 @@
 
 
 class MLCRepositoryHelper:
+
     @staticmethod
     def get_hash_for_individual(individual):
         m = hashlib.md5()
@@ -30,6 +31,7 @@ class IndividualData:
         appearances:
             number of time the individual appears
     """
+
     def __init__(self, value):
         self._value = value
         self._cost_history = defaultdict(list)