Fixed integration tests configuration files

* Added rules to ignore file to avoid adding SQLite files or script generated files
* Changed integration tests configuration file to generate a DB file per test with
  the test name
* Fixes in generate_tests_file scripts. Indexes problems solved
* Issue #27

Author: Ezetowers

.gitignore

@@ -9,3 +9,12 @@ tests/.coverage
 # Ctags folders
 .tags
 .tags_sorted_by_file
+
+# Ignore files generated by precision_bug scripts
+bugs/precision_bug/*.txt
+
+# Ignore files generated by MATLAB test file generators
+scripts/*.txt
+
+# Ignore SQLite DBs
+*.db

MLC/Application.py

@@ -98,7 +98,8 @@ def go(self, to_generation, fig, from_generation=None):
         self.evaluate_population(self._simulation.get_last_generation(),
                                  self._simulation.number_of_generations())
 
-        self.show_best(self._simulation.get_last_generation())
+        if fig:
+            self.show_best(self._simulation.get_last_generation())
         MLCTable.get_instance().commit_changes()
 
         for i in range(from_generation + 1, self._simulation.number_of_generations() + 1):

matlab_code/@MLCparameters/private/MLCparameters_multiple_controls.txt

@@ -0,0 +1,70 @@
+parameters.size=100;
+        parameters.sensors=1;
+        parameters.sensor_spec=0;
+        parameters.controls=3;
+        parameters.sensor_prob=0.33;
+        parameters.leaf_prob=0.3;
+        parameters.range=10;
+        parameters.precision=4;
+        parameters.opsetrange=1:9; 
+        parameters.formal=1;
+        parameters.end_character='';
+        parameters.individual_type='tree';
+
+
+        %%  GP algortihm parameters (CHANGE IF YOU KNOW WHAT YOU DO)
+        parameters.maxdepth=15;
+        parameters.maxdepthfirst=5;
+        parameters.mindepth=2;
+        parameters.mutmindepth=2;
+        parameters.mutmaxdepth=15;
+        parameters.mutsubtreemindepth=2;
+        parameters.generation_method='mixed_ramped_gauss';
+        parameters.gaussigma=3;
+        parameters.ramp=[2:8];
+        parameters.maxtries=10;
+%         parameters.no_of_cascades=0;
+%         parameters.no_of_gen_per_cascade=0;
+%         parameters.archive_size=0;
+        parameters.mutation_types=1:4;
+
+
+        %%  Optimization parameters
+        parameters.elitism=10;
+        parameters.probrep=0.25;
+        parameters.probmut=0.0;
+        parameters.probcro=0.75;
+        parameters.selectionmethod='tournament';
+        parameters.tournamentsize=7;
+        parameters.lookforduplicates=1;
+        parameters.simplify=0;
+        parameters.cascade=[1 1];
+
+        %%  Evaluator parameters 
+        %parameters.evaluation_method='standalone_function';
+        %parameters.evaluation_method='standalone_files';
+        parameters.evaluation_method='mfile_standalone';
+        parameters.evaluation_function='toy_problem';
+        parameters.indfile='ind.dat';
+        parameters.Jfile='J.dat';
+        parameters.exchangedir=fullfile(pwd,'evaluator0');
+        parameters.evaluate_all=0;
+        parameters.ev_again_best=0;
+        parameters.ev_again_nb=5;
+        parameters.ev_again_times=5;
+        parameters.artificialnoise=0;
+        parameters.execute_before_evaluation='';
+        parameters.badvalue=10^36;
+        parameters.badvalues_elim='first';
+        %parameters.badvalues_elim='none';
+        %parameters.badvalues_elim='all';
+        parameters.preevaluation=0;
+        parameters.preev_function='';
+        parameters.problem_variables.gamma=0.1;
+        %% MLC behaviour parameters 
+        parameters.save=1;
+        parameters.saveincomplete=1;
+        parameters.verbose=2;
+        parameters.fgen=250; 
+        parameters.show_best=1;
+        parameters.savedir=fullfile(pwd,'save_GP');

scripts/generate_tests_files.m

@@ -23,9 +23,9 @@
 for idx = 1:numel(indiv)
     formal_value = indiv(idx).formal;
     if iscell(formal_value)
-        formal_value = indiv(idx).formal{1}
-        for i=2:length(indiv(idx).formal)
-            formal_value = [formal_value  ' ' indiv(idx).formal{j}]
+        formal_value = indiv(idx).formal{1};
+        for i=2:length(indiv(idx).formal);
+            formal_value = [formal_value  ' ' indiv(idx).formal{i}];
         end
     end
 

tests/integration_tests/test_basic/configuration.ini

@@ -76,6 +76,6 @@ verbose = 2
 fgen = 250
 stopongraph = false
 showeveryitbest = false
-save = false
-saveincomplete = false
-savedir = fullfile(pwd,save_GP)
+save = 1
+saveincomplete = 1
+savedir = test_basic.db

tests/integration_tests/test_basic/generation.txt

@@ -76,9 +76,9 @@ verbose = 2
 fgen = 250
 stopongraph = false
 showeveryitbest = true
-save = false
-saveincomplete = false
-savedir = fullfile(pwd,save_GP)
+save = 1
+saveincomplete = 1
+savedir = test_multiple_controls.db
 
 [ARDUINO]
 baudrate = 115200

tests/integration_tests/test_multiple_controls/configuration.ini

@@ -75,6 +75,6 @@ save = 1
 saveincomplete = 1
 verbose = 2
 fgen = 250
-savedir = fullfile(pwd,save_GP)
+savedir = test_persist_reusing_simulations.db
 stopongraph = false
 showeveryitbest = false