From 20d754faa7dbdcf97c116570bbfec70f19b44198 Mon Sep 17 00:00:00 2001 From: LSaldyt Date: Sun, 12 Nov 2017 15:24:08 -0700 Subject: [PATCH] Changes to pbest only formula --- copycat/copycat.py | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/copycat/copycat.py b/copycat/copycat.py index 2d41050..501a3d6 100644 --- a/copycat/copycat.py +++ b/copycat/copycat.py @@ -71,26 +71,25 @@ class Copycat(object): self.workspace.resetWithStrings(initial, modified, target) answers = {} - for formula in ['original', 'best', 'sbest', 'pbest', 'none']: - self.temperature.useAdj(formula) - answers = {} - for i in range(iterations): - answer = self.runTrial() - d = answers.setdefault(answer['answer'], { - 'count': 0, - 'sumtemp': 0, # TODO: use entropy - 'sumtime': 0 - }) - d['count'] += 1 - d['sumtemp'] += answer['temp'] # TODO: use entropy - d['sumtime'] += answer['time'] + formula = 'pbest' + self.temperature.useAdj(formula) + for i in range(iterations): + answer = self.runTrial() + d = answers.setdefault(answer['answer'], { + 'count': 0, + 'sumtemp': 0, # TODO: use entropy + 'sumtime': 0 + }) + d['count'] += 1 + d['sumtemp'] += answer['temp'] # TODO: use entropy + d['sumtime'] += answer['time'] - for answer, d in answers.items(): - d['avgtemp'] = d.pop('sumtemp') / d['count'] - d['avgtime'] = d.pop('sumtime') / d['count'] - print('The formula {} provided:'.format(formula)) - print('Average difference: {}'.format(self.temperature.getAverageDifference())) - pprint(answers) + for answer, d in answers.items(): + d['avgtemp'] = d.pop('sumtemp') / d['count'] + d['avgtime'] = d.pop('sumtime') / d['count'] + print('The formula {} provided:'.format(formula)) + print('Average difference: {}'.format(self.temperature.getAverageDifference())) + pprint(answers) return answers