From 1c6ac7ff5bfc021bf817a481ed2b2a258c22b5ea Mon Sep 17 00:00:00 2001 From: Kai Staats Date: Thu, 9 Feb 2017 10:00:16 -0700 Subject: [PATCH] method name change, version update --- karoo_gp_base_class.py | 8 ++++---- karoo_gp_main.py | 4 ++-- karoo_gp_server.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/karoo_gp_base_class.py b/karoo_gp_base_class.py index e8aff44..5ef9bed 100644 --- a/karoo_gp_base_class.py +++ b/karoo_gp_base_class.py @@ -11,9 +11,9 @@ this application. While your computer will not burst into flames nor will the su likely find more enjoyment of this particular flavour of GP with a little understanding of its intent and design. ''' -import csv -import os import sys +import os +import csv import numpy as np import sklearn.metrics as skm @@ -1420,7 +1420,7 @@ class Base_GP(object): pairwise_fitness = self.fx_fitness_train_match(result, solution) # elif self.kernel == '[other]': # [OTHER] kernel - # pairwise_fitness = self.fx_fitness_function_[other](result ?, solution ?) + # pairwise_fitness = self.fx_fitness_train_[other](result ?, solution ?) else: raise Exception('Kernel type is wrong or missing. You entered {}'.format(self.kernel)) @@ -1567,7 +1567,7 @@ class Base_GP(object): return tf.cast(tf.equal(solution, result), tf.int32) - # def fx_fitness_function_[other](self, result, solution): # [OTHER] kernel + # def fx_fitness_train_[other](self, result, solution): # [OTHER] kernel # ''' # Creates element-wise fitness computation TensorFlow (TF) sub-graph for [other] kernel. diff --git a/karoo_gp_main.py b/karoo_gp_main.py index 5c69c4c..8505845 100644 --- a/karoo_gp_main.py +++ b/karoo_gp_main.py @@ -2,7 +2,7 @@ # Use Genetic Programming for Classification and Symbolic Regression # by Kai Staats, MSc; see LICENSE.md # Thanks to Emmanuel Dufourq and Arun Kumar for support during 2014-15 devel; TensorFlow support provided by Iurii Milovanov -# version 1.0.1 +# version 1.0 ''' A word to the newbie, expert, and brave-- @@ -143,7 +143,7 @@ else: # if any other kernel is selected menu = ['i','g','m','s','db',''] while True: try: - gp.display = raw_input('\t Display (i)nteractive, (g)eneration, (m)iminal, or (s)ilent (default m): ') + gp.display = raw_input('\t Display (i)nteractive, (g)eneration, (m)iminal, (s)ilent, or (d)e(b)ug (default m): ') if gp.display not in menu: raise ValueError() gp.display = gp.display or 'm'; break except ValueError: print '\t\033[32m Select from the options given. Try again ...\n\033[0;0m' diff --git a/karoo_gp_server.py b/karoo_gp_server.py index 3a6e8ed..63e262e 100644 --- a/karoo_gp_server.py +++ b/karoo_gp_server.py @@ -2,7 +2,7 @@ # Use Genetic Programming for Classification and Symbolic Regression # by Kai Staats, MSc; see LICENSE.md # Thanks to Emmanuel Dufourq and Arun Kumar for support during 2014-15 devel; TensorFlow support provided by Iurii Milovanov -# version 1.0.1 +# version 1.0 ''' A word to the newbie, expert, and brave--