Skip to content

S
Seminar-HFO
Commit 45a4d465 authored by Matthew Hausknecht's avatar Matthew Hausknecht
Browse files
Options

Fixed bug causing trials to end prematurely due to OOT.

parent 79e8f216
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
bin/Trainer.py
View file @ 45a4d465
...@@ -568,6 +568,7 @@ class Trainer(object): ...@@ -568,6 +568,7 @@ class Trainer(object):
self._lastFrameBallTouched = self._frame self._lastFrameBallTouched = self._frame
if self.trialOver(team_holding_ball): if self.trialOver(team_holding_ball):
self.updateResults(team_holding_ball) self.updateResults(team_holding_ball)
self._lastFrameBallTouched = self._frame
self.reset() self.reset()
def updateResults(self, team_holding_ball): def updateResults(self, team_holding_ball):
...@@ -585,7 +586,6 @@ class Trainer(object): ...@@ -585,7 +586,6 @@ class Trainer(object):
result = 'Defense Captured' result = 'Defense Captured'
self.send('(say CAPTURED_BY_DEFENSE)') self.send('(say CAPTURED_BY_DEFENSE)')
elif self._frame - self._lastFrameBallTouched > self.UNTOUCHED_LENGTH: elif self._frame - self._lastFrameBallTouched > self.UNTOUCHED_LENGTH:
self._lastFrameBallTouched = self._frame
self._numOutOfTime += 1 self._numOutOfTime += 1
result = 'Ball untouched for too long' result = 'Ball untouched for too long'
self.send('(say OUT_OF_TIME)') self.send('(say OUT_OF_TIME)')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment