Fix best individual description bug

* The problem was fixed changing the query to gather
  the best individual of the last population
* Hide convergence button until it is implemented

Author: Ezetowers

MLC/GUI/Experiment/ExperimentWindow.py

@@ -133,6 +133,9 @@ def __init__(self, mlc_local,
         if self._autogenerated_object.disable_board_check.checkState() == Qt.Checked:
             self.on_disable_arduino_toggle(True)
 
+        # FIXME: The code of show_convergence button is not implemented yet. Hide the button
+        self._autogenerated_object.convergence_button.setVisible(False)
+
     def closeEvent(self, event):
         logger.debug('[EXPERIMENT {0}] [CLOSE_DIALOG] - Executing overriden closeEvent function'
                      .format(self._experiment_name))

MLC/api/MLCLocal.py

@@ -299,7 +299,7 @@ def get_experiment_info(self, experiment_name):
 
         if simulation.number_of_generations() != 0:
             # Get the best indiv description
-            min_indiv_id = MLCRepository.get_instance().get_individual_with_min_cost()
+            min_indiv_id = MLCRepository.get_instance().get_individual_with_min_cost_in_last_pop()
             min_indiv_data = MLCRepository.get_instance().get_individual_data(min_indiv_id)
             experiment_info["best_indiv_id"] = min_indiv_id
             experiment_info["best_indiv_value"] = min_indiv_data.get_value()

MLC/db/mlc_repository.py

@@ -108,7 +108,7 @@ def update_individual(self, individual_id, individual):
     def remove_individual(self, individual_id):
         raise NotImplementedError("This method must be implemented")
 
-    def get_individual_with_min_cost(self):
+    def get_individual_with_min_cost_in_last_pop(self):
         raise NotImplementedError("This method must be implemented")
 
     def get_individual(self, individual_id):

MLC/db/sqlite/sql_statements.py

@@ -139,13 +139,17 @@ def stmt_update_cost(individual_id, cost, evaluation_time, generation):
                                                      evaluation_time,
                                                      individual_id,
                                                      generation)
-
-
-def stmt_get_individual_with_min_cost():
-    return '''SELECT indiv_id
-              FROM population
-              ORDER BY cost ASC
-              LIMIT 1'''
+"""
+The individual with the least cost in the last population 
+is considered to be the best individual
+"""
+def stmt_get_individual_with_min_cost_in_last_pop():
+    return '''SELECT indiv_id, 
+                     cost 
+                FROM population 
+            ORDER BY gen DESC, 
+                     cost ASC 
+               LIMIT 1'''
 
 def stmt_enable_foreign_key():
     return '''PRAGMA foreign_keys = ON'''

MLC/db/sqlite/sqlite_repository.py

@@ -208,9 +208,9 @@ def update_individual(self, individual_id, individual):
     def remove_individual(self, individual_id):
         raise NotImplementedError("This method must be implemented")
 
-    def get_individual_with_min_cost(self):
+    def get_individual_with_min_cost_in_last_pop(self):
         conn = self.__get_db_connection()
-        cursor = conn.execute(stmt_get_individual_with_min_cost())
+        cursor = conn.execute(stmt_get_individual_with_min_cost_in_last_pop())
 
         # We are expecting just one resultte
         min_indiv_id = cursor.fetchone()[0]