From 3cfad69de3f2d190dc31bce3996f601171a289a3 Mon Sep 17 00:00:00 2001
From: Michael Fenton <michaelfenton1@gmail.com>
Date: Fri, 14 Jul 2017 22:09:09 +0200
Subject: [PATCH] Updated parameters for example problems.

---
 parameters/moo/regression_bloat_control.txt | 13 +++++--------
 parameters/moo/zdt1.txt                     | 10 ++++------
 2 files changed, 9 insertions(+), 14 deletions(-)
 mode change 100755 => 100644 parameters/moo/regression_bloat_control.txt
 mode change 100755 => 100644 parameters/moo/zdt1.txt

diff --git a/parameters/moo/regression_bloat_control.txt b/parameters/moo/regression_bloat_control.txt
old mode 100755
new mode 100644
index c5815acb..aeed3168
--- a/parameters/moo/regression_bloat_control.txt
+++ b/parameters/moo/regression_bloat_control.txt
@@ -1,3 +1,4 @@
+CACHE:                  True
 CODON_SIZE:             100000
 CROSSOVER:              subtree
 CROSSOVER_PROBABILITY:  0.75
@@ -6,6 +7,7 @@ DATASET_TEST:           Vladislavleva4/Test.txt
 DEBUG:                  False
 ERROR_METRIC:           mse
 GENERATIONS:            50
+MAX_GENOME_LENGTH:      500
 GRAMMAR_FILE:           supervised_learning/Vladislavleva4.bnf
 INITIALISATION:         PI_grow
 INVALID_SELECTION:      False
@@ -13,14 +15,9 @@ MAX_INIT_TREE_DEPTH:    10
 MAX_TREE_DEPTH:         17
 MUTATION:               subtree
 POPULATION_SIZE:        500
-REPLACEMENT:            generational
-TOURNAMENT_SIZE:        2
-VERBOSE:                False
-SAVE_ALL:               False
-ELITE_SIZE:             0
 FITNESS_FUNCTION:       supervised_learning.regression, minimise_nodes
-SELECTION:              nsga2_selection
 REPLACEMENT:            nsga2_replacement
-CACHE:                  True
+SELECTION:              nsga2_selection
+TOURNAMENT_SIZE:        2
+VERBOSE:                True
 MUTATE_DUPLICATES:      True
-VERBOSE:                True
\ No newline at end of file
diff --git a/parameters/moo/zdt1.txt b/parameters/moo/zdt1.txt
old mode 100755
new mode 100644
index 7d26bb42..ca7f3c25
--- a/parameters/moo/zdt1.txt
+++ b/parameters/moo/zdt1.txt
@@ -1,18 +1,16 @@
 GRAMMAR_FILE:           moo/moo_zdt123.bnf
 FITNESS_FUNCTION:       multi_objective.binary_phenotype_to_float, multi_objective.zdt1
 CODON_SIZE:             1000
-POPULATION_SIZE:        50
+POPULATION_SIZE:        500
 GENERATIONS:            50
 MUTATION_PROBABILITY:   0.01
-CROSSOVER_PROBABILITY:  0.8
+CROSSOVER_PROBABILITY:  0.75
 INITIALISATION:         uniform_genome
-SAVE_ALL:               False
 TOURNAMENT_SIZE:        2
-RANDOM_SEED:            0
 INIT_GENOME_LENGTH:     1230
 CROSSOVER:              fixed_onepoint
 MUTATION:               int_flip_per_codon
-ELITE_SIZE:             0
 SELECTION:              nsga2_selection
 REPLACEMENT:            nsga2_replacement
-VERBOSE:                True
\ No newline at end of file
+VERBOSE:                True
+CACHE:                  True