This commit is contained in:
LSaldyt
2017-11-02 16:19:01 -07:00
parent ac99a2ad9a
commit 6b02fe3ca0
2 changed files with 5 additions and 2 deletions

View File

@ -71,7 +71,7 @@ class Copycat(object):
self.workspace.resetWithStrings(initial, modified, target)
answers = {}
for formula in ['original', 'best', 'sbest', 'pbest']:
for formula in ['original', 'best', 'sbest', 'pbest', 'none']:
self.temperature.useAdj(formula)
answers = {}
for i in range(iterations):

View File

@ -80,6 +80,8 @@ def _parameterized_best(temp, prob):
u = prob ** r if prob < .5 else prob ** (1/r)
return _weighted(temp, prob, s, u)
def _none(temp, prob):
return prob
class Temperature(object):
def __init__(self):
@ -96,7 +98,8 @@ class Temperature(object):
'average_alt' : _averaged_alt,
'best' : _working_best,
'sbest' : _soft_best,
'pbest' : _parameterized_best}
'pbest' : _parameterized_best,
'none' : _none}
self.diffs = 0
self.ndiffs = 0