Added best indiv description in experiment info

Ezetowers · Ezetowers · commit 6a70544d49d1 · 2017-01-18T11:07:43.000-03:00
* #36
diff --git a/MLC/GUI/Autogenerated/untitled/untitled.pro.user b/MLC/GUI/Autogenerated/untitled/untitled.pro.user
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.1.0, 2017-01-16T12:04:30. -->
+<!-- Written by QtCreator 4.2.0, 2017-01-17T23:56:31. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
-  <value type="QByteArray">{89aaf96f-e2f6-40f4-bca5-8aa7dd8dc388}</value>
+  <value type="QByteArray">{350f9065-16e4-4481-9d13-d542c79185b9}</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -59,14 +59,14 @@
  <data>
   <variable>ProjectExplorer.Project.Target.0</variable>
   <valuemap type="QVariantMap">
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{f92ecf44-e715-45cb-84a0-3754f1e7bcc1}</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.7.1 GCC 64bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.7.1 GCC 64bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.57.gcc_64_kit</value>
    <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/media/home/etorres/Facultad/TP_Profesional/MLC_GUI/MLC/GUI/Autogenerated/build-untitled-Desktop-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/etorres/Facultad/TP_Profesional/MLC_GUI/MLC/GUI/Autogenerated/build-untitled-Desktop_Qt_5_7_1_GCC_64bit-Debug</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -126,7 +126,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/media/home/etorres/Facultad/TP_Profesional/MLC_GUI/MLC/GUI/Autogenerated/build-untitled-Desktop-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/etorres/Facultad/TP_Profesional/MLC_GUI/MLC/GUI/Autogenerated/build-untitled-Desktop_Qt_5_7_1_GCC_64bit-Release</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -186,7 +186,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/media/home/etorres/Facultad/TP_Profesional/MLC_GUI/MLC/GUI/Autogenerated/build-untitled-Desktop-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/etorres/Facultad/TP_Profesional/MLC_GUI/MLC/GUI/Autogenerated/build-untitled-Desktop_Qt_5_7_1_GCC_64bit-Profile</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -304,7 +304,7 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">untitled</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/media/home/etorres/Facultad/TP_Profesional/MLC_GUI/MLC/GUI/Autogenerated/untitled/untitled.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/etorres/Facultad/TP_Profesional/MLC_GUI/MLC/GUI/Autogenerated/untitled/untitled.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">untitled.pro</value>
diff --git a/MLC/api/MLCLocal.py b/MLC/api/MLCLocal.py
@@ -8,6 +8,7 @@
 import tarfile
 import time
 
+from collections import OrderedDict
 from MLC.api.Experiment import Experiment
 from MLC.api.mlc import MLC
 from MLC.api.mlc import ClosedExperimentException
@@ -183,14 +184,18 @@ def get_experiment_info(self, experiment_name):
 
         simulation = self._open_experiments[experiment_name].get_simulation()
 
-        experiment_info = {
-            "name": experiment_name,
-            "generations": simulation.number_of_generations(),
-            "individuals": MLCRepository.get_instance().count_individual(),
-            "individuals_per_generation": Config.get_instance().getint("POPULATION", "size"),
-            "filename": experiment_name + ".mlc"
-        }
-
+        experiment_info = OrderedDict()
+        experiment_info["name"] = experiment_name
+        experiment_info["generations"] = simulation.number_of_generations()
+        experiment_info["individuals"] = MLCRepository.get_instance().count_individual()
+        experiment_info["individuals_per_generation"] = Config.get_instance().getint("POPULATION", "size")
+
+        if MLCRepository.get_instance().count_individual() != 0:
+            # Get the best indiv description
+            min_indiv_id = MLCRepository.get_instance().get_individual_with_min_cost()
+            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()
         return experiment_info
 
     def go(self, experiment_name, to_generation, from_generation=0, callbacks={}):
diff --git a/MLC/db/mlc_repository.py b/MLC/db/mlc_repository.py
@@ -87,6 +87,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):
+        raise NotImplementedError("This method must be implemented")
+
     def get_individual(self, individual_id):
         raise NotImplementedError("This method must be implemented")
 
diff --git a/MLC/db/sqlite/sql_statements.py b/MLC/db/sqlite/sql_statements.py
@@ -21,10 +21,12 @@ def stmt_delete_generation(generation):
     return """DELETE FROM population
               WHERE gen = %s""" % (generation,)
 
+
 def stmt_delete_from_generations(from_generation):
     return """DELETE FROM population
               WHERE gen >= %s""" % (from_generation,)
 
+
 def stmt_delete_unused_individuals():
     return '''DELETE FROM individual
               WHERE indiv_id NOT IN (SELECT DISTINCT indiv_id FROM population)'''
@@ -39,6 +41,7 @@ def stmt_delete_unused_individuals():
     return '''DELETE FROM individual
               WHERE indiv_id NOT IN (SELECT DISTINCT indiv_id FROM population)'''
 
+
 def stmt_get_generations():
     return '''SELECT distinct gen FROM population'''
 
@@ -61,6 +64,7 @@ def stmt_get_individuals_from_population(generation):
 
 
 class SQLSaveFormal:
+
     @staticmethod
     def to_sql(indiv_formal):
         if isinstance(indiv_formal, str):
@@ -72,12 +76,14 @@ def to_sql(indiv_formal):
     def from_sql(indiv_formal_column):
         return indiv_formal_column.split('@')
 
+
 def stmt_insert_individual(individual_id, individual):
     return '''INSERT INTO individual VALUES (%s, "%s", "%s", %s)''' % (individual_id,
                                                                        individual.get_value(),
                                                                        SQLSaveFormal.to_sql(individual.get_formal()),
                                                                        individual.get_complexity())
 
+
 def stmt_get_all_individuals():
     return '''SELECT indiv_id, value, formal, complexity
               from individual
@@ -89,11 +95,13 @@ def stmt_get_individual_data(indiv_id):
               FROM population
               WHERE indiv_id = %s''' % (indiv_id)
 
+
 def stmt_get_individuals_data():
     return '''SELECT indiv_id, gen, cost, evaluation_time
               FROM   population
               ORDER BY indiv_id'''
 
+
 def stmt_update_all_costs(individual_id, cost, evaluation_time):
     return '''UPDATE population
               SET cost = %s, evaluation_time = %s
@@ -107,5 +115,13 @@ 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'''
+
 def stmt_enable_foreign_key():
-    return '''PRAGMA foreign_keys = ON'''
+    return '''PRAGMA foreign_keys = ON'''
diff --git a/MLC/db/sqlite/sqlite_repository.py b/MLC/db/sqlite/sqlite_repository.py
@@ -159,6 +159,15 @@ 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):
+        conn = self.__get_db_connection()
+        cursor = conn.execute(stmt_get_individual_with_min_cost())
+
+        # We are expecting just one result
+        min_indiv_id = cursor.fetchone()[0]
+        cursor.close()
+        return min_indiv_id
+
     def get_individual(self, individual_id):
         try:
             return self.__individuals[individual_id]
diff --git a/templates/toy_problem.py b/templates/toy_problem.py
@@ -75,7 +75,7 @@ def show_best(index, generation, indiv, cost, block=True):
     fig.canvas.manager.window.setWindowModality(Qt.ApplicationModal)
 
     plt.suptitle("Generation N#{0} - Individual N#{1}\n"
-                 "Cost: {1}\n Formal: {3}".format(generation,
+                 "Cost: {2}\n Formal: {3}".format(generation,
                                                   index,
                                                   cost,
                                                   indiv.get_formal()))
diff --git a/tests/integration_tests/test_basic/default_evaluation_script.py b/tests/integration_tests/test_basic/default_evaluation_script.py
@@ -74,7 +74,7 @@ def show_best(index, generation, indiv, cost, block=True):
     fig.canvas.manager.window.setWindowModality(Qt.ApplicationModal)
 
     plt.suptitle("Generation N#{0} - Individual N#{1}\n"
-                 "Cost: {1}\n Formal: {3}".format(generation,
+                 "Cost: {2}\n Formal: {3}".format(generation,
                                                   index,
                                                   cost,
                                                   indiv.get_formal()))
diff --git a/tests/integration_tests/test_multiple_controls/default_evaluation_script.py b/tests/integration_tests/test_multiple_controls/default_evaluation_script.py
@@ -74,7 +74,7 @@ def show_best(index, generation, indiv, cost, block=True):
     fig.canvas.manager.window.setWindowModality(Qt.ApplicationModal)
 
     plt.suptitle("Generation N#{0} - Individual N#{1}\n"
-                 "Cost: {1}\n Formal: {3}".format(generation,
+                 "Cost: {2}\n Formal: {3}".format(generation,
                                                   index,
                                                   cost,
                                                   indiv.get_formal()))
diff --git a/tests/integration_tests/test_persist_reusing_simulations/default_evaluation_script.py b/tests/integration_tests/test_persist_reusing_simulations/default_evaluation_script.py
@@ -74,7 +74,7 @@ def show_best(index, generation, indiv, cost, block=True):
     fig.canvas.manager.window.setWindowModality(Qt.ApplicationModal)
 
     plt.suptitle("Generation N#{0} - Individual N#{1}\n"
-                 "Cost: {1}\n Formal: {3}".format(generation,
+                 "Cost: {2}\n Formal: {3}".format(generation,
                                                   index,
                                                   cost,
                                                   indiv.get_formal()))
diff --git a/tests/integration_tests/test_persist_simulation/default_evaluation_script.py b/tests/integration_tests/test_persist_simulation/default_evaluation_script.py
@@ -74,7 +74,7 @@ def show_best(index, generation, indiv, cost, block=True):
     fig.canvas.manager.window.setWindowModality(Qt.ApplicationModal)
 
     plt.suptitle("Generation N#{0} - Individual N#{1}\n"
-                 "Cost: {1}\n Formal: {3}".format(generation,
+                 "Cost: {2}\n Formal: {3}".format(generation,
                                                   index,
                                                   cost,
                                                   indiv.get_formal()))
diff --git a/tests/mlc/api/test_mlc.py b/tests/mlc/api/test_mlc.py
@@ -1,22 +1,23 @@
 from nose.tools import nottest
-import unittest
-import shutil
-import os
+import ConfigParser
 import MLC.api
+import os
+import shutil
+import unittest
 
+from collections import OrderedDict
 from MLC.api.MLCLocal import MLCLocal
 from MLC.api.Experiment import Experiment
 
-from MLC.Simulation import Simulation
-from MLC.mlc_parameters.mlc_parameters import Config
 from MLC.config import set_working_directory
 from MLC.Common.RandomManager import RandomManager
-from MLC.Log.log import set_logger
+from MLC.db.mlc_repository import IndividualData
 from MLC.individual.Individual import Individual as MLCIndividual
+from MLC.Log.log import set_logger
+from MLC.mlc_parameters.mlc_parameters import Config
 from MLC.Population.Population import Population as MLCPopulation
-from MLC.db.mlc_repository import IndividualData
+from MLC.Simulation import Simulation
 
-import ConfigParser
 
 
 class MLCWorkspaceTest(unittest.TestCase):
@@ -194,7 +195,6 @@ def test_get_info_empty_simulation(self):
         info = mlc.get_experiment_info(MLCWorkspaceTest.ORIGINAL_EXPERIMENT)
 
         self._assert_key_value(info, "name", MLCWorkspaceTest.ORIGINAL_EXPERIMENT)
-        self._assert_key_value(info, "filename", MLCWorkspaceTest.ORIGINAL_EXPERIMENT + ".mlc")
         self._assert_key_value(info, "generations", 0)
         self._assert_key_value(info, "individuals", 0)
         self._assert_key_value(info, "individuals_per_generation", 10)
@@ -216,7 +216,6 @@ def test_go_and_check_simulation_info(self):
             # check simulation info
             info = mlc.get_experiment_info("test_go_and_check")
             self._assert_key_value(info, "name", "test_go_and_check")
-            self._assert_key_value(info, "filename", "test_go_and_check" + ".mlc")
             self._assert_key_value(info, "generations", 2)
             self._assert_key_value(info, "individuals", 11)
             self._assert_key_value(info, "individuals_per_generation", 10)
@@ -331,7 +330,7 @@ def test_import_experiment_with_erroneous_path(self):
             self.assertFalse("test5" in mlc.get_workspace_experiments())
 
     def _assert_key_value(self, dictionary, key, value):
-        self.assertIsInstance(dictionary, dict)
+        self.assertIsInstance(dictionary, OrderedDict)
         self.assertIn(key, dictionary)
         self.assertEqual(dictionary[key], value)
 
