alex/copycat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes to pbest only formula

Browse Source
This commit is contained in:
LSaldyt
2017-11-12 15:24:08 -07:00
parent 906799e32d
commit 20d754faa7
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
copycat/copycat.py
View File

@ -71,26 +71,25 @@ class Copycat(object):
self.workspace.resetWithStrings(initial, modified, target) self.workspace.resetWithStrings(initial, modified, target)
answers = {} answers = {}
for formula in ['original', 'best', 'sbest', 'pbest', 'none']: formula = 'pbest'
self.temperature.useAdj(formula) self.temperature.useAdj(formula)
answers = {} for i in range(iterations):
for i in range(iterations): answer = self.runTrial()
answer = self.runTrial() d = answers.setdefault(answer['answer'], {
d = answers.setdefault(answer['answer'], { 'count': 0,
'count': 0, 'sumtemp': 0, # TODO: use entropy
'sumtemp': 0, # TODO: use entropy 'sumtime': 0
'sumtime': 0 })
}) d['count'] += 1
d['count'] += 1 d['sumtemp'] += answer['temp'] # TODO: use entropy
d['sumtemp'] += answer['temp'] # TODO: use entropy d['sumtime'] += answer['time']
d['sumtime'] += answer['time']
for answer, d in answers.items(): for answer, d in answers.items():
d['avgtemp'] = d.pop('sumtemp') / d['count'] d['avgtemp'] = d.pop('sumtemp') / d['count']
d['avgtime'] = d.pop('sumtime') / d['count'] d['avgtime'] = d.pop('sumtime') / d['count']
print('The formula {} provided:'.format(formula)) print('The formula {} provided:'.format(formula))
print('Average difference: {}'.format(self.temperature.getAverageDifference())) print('Average difference: {}'.format(self.temperature.getAverageDifference()))
pprint(answers) pprint(answers)
return answers return answers