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

WIP

Browse Source
This commit is contained in:
LSaldyt
2017-10-26 19:02:39 -07:00
parent 80b6e49581
commit 20b25125d8
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
copycat/copycat.py
View File

@ -32,18 +32,14 @@ class Copycat(object):
self.temperature = Temperature() self.temperature = Temperature()
self.workspace = Workspace(self) self.workspace = Workspace(self)
self.reporter = reporter or Reporter() self.reporter = reporter or Reporter()
self.showgui = showgui
self.gui = GUI('Copycat') self.gui = GUI('Copycat')
self.lastUpdate = float('-inf') self.lastUpdate = float('-inf')
def step(self): def step(self):
if (not self.showgui) or (self.showgui and (not self.gui.app.primary.control.paused or self.gui.app.primary.control.has_step())): self.coderack.chooseAndRunCodelet()
self.coderack.chooseAndRunCodelet() self.reporter.report_coderack(self.coderack)
self.reporter.report_coderack(self.coderack) self.reporter.report_temperature(self.temperature)
self.reporter.report_temperature(self.temperature) self.reporter.report_workspace(self.workspace)
self.reporter.report_workspace(self.workspace)
if (self.showgui):
self.gui.update(self)
def update_workspace(self, currentTime): def update_workspace(self, currentTime):
self.workspace.updateEverything() self.workspace.updateEverything()
@ -73,8 +69,6 @@ class Copycat(object):
self.update_workspace(currentTime) self.update_workspace(currentTime)
self.step() self.step()
if self.showgui:
self.gui.refresh()
def runTrial(self): def runTrial(self):
"""Run a trial of the copycat algorithm""" """Run a trial of the copycat algorithm"""
@ -101,8 +95,8 @@ class Copycat(object):
if self.check_reset(): if self.check_reset():
answers = {} answers = {}
answer = self.runTrial() answer = self.runTrial()
if self.showgui: self.gui.refresh()
self.gui.app.log('Answered: {}'.format(answer['answer'])) self.gui.update(self)
d = answers.setdefault(answer['answer'], { d = answers.setdefault(answer['answer'], {
'count': 0, 'count': 0,
'sumtemp': 0, 'sumtemp': 0,
@ -111,8 +105,7 @@ class Copycat(object):
d['count'] += 1 d['count'] += 1
d['sumtemp'] += answer['temp'] d['sumtemp'] += answer['temp']
d['sumtime'] += answer['time'] d['sumtime'] += answer['time']
if self.showgui: self.gui.add_answers(answers)
self.gui.add_answers(answers)
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']
@ -125,8 +118,6 @@ class Copycat(object):
if self.check_reset(): if self.check_reset():
answers = {} answers = {}
answer = self.runTrial() answer = self.runTrial()
if self.showgui:
self.gui.app.log('Answered: {}'.format(answer['answer']))
d = answers.setdefault(answer['answer'], { d = answers.setdefault(answer['answer'], {
'count': 0, 'count': 0,
'sumtemp': 0, 'sumtemp': 0,
@ -135,8 +126,6 @@ class Copycat(object):
d['count'] += 1 d['count'] += 1
d['sumtemp'] += answer['temp'] d['sumtemp'] += answer['temp']
d['sumtime'] += answer['time'] d['sumtime'] += answer['time']
if self.showgui:
self.gui.add_answers(answers)
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']