Revert "Updated grammar analyser to print out scientific numbers. Add…

…ed new functions to utilities.fitness.math_functions for enabling printing of very large (i.e. long) scientific numbers." This reverts commit 3b6a5eb.
PonyGE · Jul 25, 2017 · cf7e0d1 · cf7e0d1
1 parent 3b6a5eb
commit cf7e0d1
Show file tree

Hide file tree

Showing 42 changed files with 58 additions and 394 deletions.
diff --git a/datasets/Dow/Test.csv b/datasets/Dow/Test.csv
diff --git a/datasets/Dow/Train.csv b/datasets/Dow/Train.csv
diff --git a/datasets/Keijzer6/Test.txt b/datasets/Keijzer6/Test.txt
diff --git a/datasets/Keijzer6/Train.txt b/datasets/Keijzer6/Train.txt
diff --git a/datasets/Paige1/Test.txt b/datasets/Paige1/Test.txt
diff --git a/datasets/Paige1/Train.txt b/datasets/Paige1/Train.txt
diff --git a/datasets/Vladislavleva4/Test.txt b/datasets/Vladislavleva4/Test.txt
diff --git a/datasets/Vladislavleva4/Train.txt b/datasets/Vladislavleva4/Train.txt
diff --git a/datasets/make_Banknote.sh b/datasets/make_Banknote.sh
diff --git a/grammars/letter.bnf b/grammars/letter.bnf
diff --git a/grammars/moo/moo_zdt123.bnf b/grammars/moo/moo_zdt123.bnf
diff --git a/grammars/supervised_learning/Dow.bnf b/grammars/supervised_learning/Dow.bnf
diff --git a/grammars/supervised_learning/Keijzer6.bnf b/grammars/supervised_learning/Keijzer6.bnf
diff --git a/grammars/supervised_learning/Vladislavleva4.bnf b/grammars/supervised_learning/Vladislavleva4.bnf
diff --git a/src/algorithm/parameters.py b/src/algorithm/parameters.py
@@ -34,7 +34,7 @@
 
         # Set grammar file
         'GRAMMAR_FILE': "supervised_learning/Vladislavleva4.bnf",
-
+    
         # Set the number of depths permutations are calculated for
         # (starting from the minimum path of the grammar).
         # Mainly for use with the grammar analyser script.
@@ -81,7 +81,7 @@
         # Boolean flag for selecting whether or not mutation is confined to
         # within the used portion of the genome. Default set to True.
         'WITHIN_USED': True,
-
+        
         # CROSSOVER
         # Set crossover operator.
         'CROSSOVER': "operators.crossover.variable_onepoint",
@@ -126,7 +126,7 @@
         # Save a plot of the evolution of the best fitness result for each
         # generation.
         'SAVE_PLOTS': True,
-
+        
         # MULTIPROCESSING
         # Multi-core parallel processing of phenotype evaluations.
         'MULTICORE': False,
@@ -144,7 +144,7 @@
         # full file path to the desired state file. Note that state files have
         # no file type.
         'LOAD_STATE': None,
-
+        
         # SEEDING
         # Specify a list of PonyGE2 individuals with which to seed the initial
         # population.
@@ -158,7 +158,7 @@
         # Set Random Seed for all Random Number Generators to be used by
         # PonyGE2, including the standard Python RNG and the NumPy RNG.
         'RANDOM_SEED': None,
-
+        
         # CACHING
         # The cache tracks unique individuals across evolution by saving a
         # string of each phenotype in a big list of all phenotypes. Saves all
@@ -175,11 +175,11 @@
         # with mutated versions of the original individual. Hopefully this will
         # encourage diversity in the population.
         'MUTATE_DUPLICATES': False,
-
+        
         # OTHER
         # Set machine name (useful for doing multiple runs)
         'MACHINE': machine_name
-
+        
 }
 
 
@@ -204,19 +204,19 @@ def load_params(file_name):
         content = parameters.readlines()
 
         for line in content:
-
+            
             # Parameters files are parsed by finding the first instance of a
             # colon.
             split = line.find(":")
-
+            
             # Everything to the left of the colon is the parameter key,
             # everything to the right is the parameter value.
             key, value = line[:split], line[split+1:].strip()
-
+            
             # Evaluate parameters.
             try:
                 value = eval(value)
-
+            
             except:
                 # We can't evaluate, leave value as a string.
                 pass
@@ -236,24 +236,24 @@ def set_params(command_line_args, create_files=True):
     :param command_line_args: Command line arguments specified by the user.
     :return: Nothing.
     """
-    print("Importing various things ")
+
     from utilities.algorithm.initialise_run import initialise_run_params
     from utilities.algorithm.initialise_run import set_param_imports
     from utilities.fitness.math_functions import return_one_percent
-    from utilities.algorithm.command_line_parser import parse_cmd_args
-    from utilities.stats import trackers, clean_stats
     from representation import grammar
-    print("Parsing command line args")
-    cmd_args, unknown = parse_cmd_args(command_line_args)
+    import utilities.algorithm.command_line_parser as parser
+    from utilities.stats import trackers, clean_stats
 
+    cmd_args, unknown = parser.parse_cmd_args(command_line_args)
+
     if unknown:
         # We currently do not parse unknown parameters. Raise error.
         s = "algorithm.parameters.set_params\nError: " \
             "unknown parameters: %s\nYou may wish to check the spelling, " \
             "add code to recognise this parameter, or use " \
             "--extra_parameters" % str(unknown)
         raise Exception(s)
-    print("Loading params dict")
+
     # LOAD PARAMETERS FILE
     # NOTE that the parameters file overwrites all previously set parameters.
     if 'PARAMETERS' in cmd_args:
@@ -282,25 +282,25 @@ def set_params(command_line_args, create_files=True):
             # Set steady state step and replacement.
             params['STEP'] = "steady_state_step"
             params['GENERATION_SIZE'] = 2
-
+        
         else:
             # Elite size is set to either 1 or 1% of the population size,
             # whichever is bigger if no elite size is previously set.
             if params['ELITE_SIZE'] is None:
                 params['ELITE_SIZE'] = return_one_percent(1, params[
                     'POPULATION_SIZE'])
-
+    
             # Set the size of a generation
             params['GENERATION_SIZE'] = params['POPULATION_SIZE'] - \
                                         params['ELITE_SIZE']
-        print("Initialising run lists and folders")
+
         # Initialise run lists and folders before we set imports.r
         initialise_run_params(create_files)
-        print("Setting param imports")
+
         # Set correct param imports for specified function options, including
         # error metrics and fitness functions.
         set_param_imports()
-        print("Cleaning stats")
+
         # Clean the stats dict to remove unused stats.
         clean_stats.clean_stats()
 
@@ -310,20 +310,20 @@ def set_params(command_line_args, create_files=True):
             params['GENOME_OPERATIONS'] = True
         else:
             params['GENOME_OPERATIONS'] = False
-
+        
         # Ensure correct operators are used if multiple fitness functions used.
         if hasattr(params['FITNESS_FUNCTION'], 'multi_objective'):
-
+            
             # Check that multi-objective compatible selection is specified.
             if not hasattr(params['SELECTION'], "multi_objective"):
                 s = "algorithm.parameters.set_params\n" \
                     "Error: multi-objective compatible selection " \
                     "operator not specified for use with multiple " \
                     "fitness functions."
                 raise Exception(s)
-
+            
             if not hasattr(params['REPLACEMENT'], "multi_objective"):
-
+    
                 # Check that multi-objective compatible replacement is
                 # specified.
                 if not hasattr(params['REPLACEMENT'], "multi_objective"):
@@ -332,17 +332,17 @@ def set_params(command_line_args, create_files=True):
                         "operator not specified for use with multiple " \
                         "fitness functions."
                     raise Exception(s)
-        print("Parsing grammar")
+
         # Parse grammar file and set grammar class.
         params['BNF_GRAMMAR'] = grammar.Grammar(path.join("..", "grammars",
                                                 params['GRAMMAR_FILE']))
 
         # Population loading for seeding runs (if specified)
         if params['TARGET_SEED_FOLDER']:
-
+            
             # Import population loading function.
             from operators.initialisation import load_population
-            print("Loading population")
+
             # A target folder containing seed individuals has been given.
             params['SEED_INDIVIDUALS'] = load_population(
                 params['TARGET_SEED_FOLDER'])
@@ -352,6 +352,6 @@ def set_params(command_line_args, create_files=True):
 
             # Import GE LR Parser.
             from scripts import GE_LR_parser
-            print("Parsing seed individual")
+
             # Parse seed individual and store in params.
             params['SEED_INDIVIDUALS'] = [GE_LR_parser.main()]
diff --git a/src/algorithm/search_loop.py b/src/algorithm/search_loop.py
diff --git a/src/algorithm/step.py b/src/algorithm/step.py
diff --git a/src/fitness/__init__.py b/src/fitness/__init__.py
diff --git a/src/fitness/evaluation.py b/src/fitness/evaluation.py
diff --git a/src/fitness/multi_objective/binary_phenotype_to_float.py b/src/fitness/multi_objective/binary_phenotype_to_float.py
diff --git a/src/fitness/string_match.py b/src/fitness/string_match.py
diff --git a/src/fitness/supervised_learning/classification.py b/src/fitness/supervised_learning/classification.py
diff --git a/src/fitness/supervised_learning/regression.py b/src/fitness/supervised_learning/regression.py
diff --git a/src/fitness/supervised_learning/supervised_learning.py b/src/fitness/supervised_learning/supervised_learning.py
@@ -5,7 +5,6 @@
 from utilities.fitness.get_data import get_data
 from utilities.fitness.math_functions import *
 from utilities.fitness.optimize_constants import optimize_constants
-from utilities.fitness.evaluate import eval_or_exec
 
 from fitness.base_ff_classes.base_ff import base_ff
 
@@ -82,25 +81,17 @@ def evaluate(self, ind, **kwargs):
                 # this string has been created during training
                 phen = ind.phenotype_consec_consts
                 c = ind.opt_consts
-
-                # Combine local and global dictionaries.
-                locals().update(globals())
-
                 # phen will refer to x (ie test_in), and possibly to c
-                yhat = eval_or_exec(phen, locals())
+                yhat = eval(phen)
                 assert np.isrealobj(yhat)
 
                 # let's always call the error function with the
                 # true values first, the estimate second
                 return params['ERROR_METRIC'](y, yhat)
 
         else:
-
-            # Combine local and global dictinoaries.
-            locals().update(globals())
-
             # phenotype won't refer to C
-            yhat = eval_or_exec(ind.phenotype, locals())
+            yhat = eval(ind.phenotype)
             assert np.isrealobj(yhat)
 
             # let's always call the error function with the true

diff --git a/src/operators/__init__.py b/src/operators/__init__.py
diff --git a/src/operators/crossover.py b/src/operators/crossover.py
diff --git a/src/operators/mutation.py b/src/operators/mutation.py
diff --git a/src/operators/replacement.py b/src/operators/replacement.py
diff --git a/src/operators/selection.py b/src/operators/selection.py
diff --git a/src/ponyge.py b/src/ponyge.py
diff --git a/src/representation/__init__.py b/src/representation/__init__.py