WIP
This commit is contained in:
@ -71,7 +71,7 @@ class Copycat(object):
|
|||||||
self.workspace.resetWithStrings(initial, modified, target)
|
self.workspace.resetWithStrings(initial, modified, target)
|
||||||
|
|
||||||
answers = {}
|
answers = {}
|
||||||
for formula in ['original', 'best', 'sbest', 'pbest']:
|
for formula in ['original', 'best', 'sbest', 'pbest', 'none']:
|
||||||
self.temperature.useAdj(formula)
|
self.temperature.useAdj(formula)
|
||||||
answers = {}
|
answers = {}
|
||||||
for i in range(iterations):
|
for i in range(iterations):
|
||||||
|
|||||||
@ -80,6 +80,8 @@ def _parameterized_best(temp, prob):
|
|||||||
u = prob ** r if prob < .5 else prob ** (1/r)
|
u = prob ** r if prob < .5 else prob ** (1/r)
|
||||||
return _weighted(temp, prob, s, u)
|
return _weighted(temp, prob, s, u)
|
||||||
|
|
||||||
|
def _none(temp, prob):
|
||||||
|
return prob
|
||||||
|
|
||||||
class Temperature(object):
|
class Temperature(object):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
@ -96,7 +98,8 @@ class Temperature(object):
|
|||||||
'average_alt' : _averaged_alt,
|
'average_alt' : _averaged_alt,
|
||||||
'best' : _working_best,
|
'best' : _working_best,
|
||||||
'sbest' : _soft_best,
|
'sbest' : _soft_best,
|
||||||
'pbest' : _parameterized_best}
|
'pbest' : _parameterized_best,
|
||||||
|
'none' : _none}
|
||||||
self.diffs = 0
|
self.diffs = 0
|
||||||
self.ndiffs = 0
|
self.ndiffs = 0
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user