method name change, version update

pull/6/head
Kai Staats 2017-02-09 10:00:16 -07:00
parent 8f147721d8
commit 1c6ac7ff5b
3 changed files with 7 additions and 7 deletions

View File

@ -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.

View File

@ -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'

View File

@ -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--