From 0d81d94c08bf17a7ea4817f53d84eb07cd521099 Mon Sep 17 00:00:00 2001 From: Stepan Bahnik Date: Mon, 26 May 2014 21:54:02 +0200 Subject: [PATCH] fixed a few bugs in robot avoidance --- Stuff/Modules/ra.py | 12 ++++++------ Stuff/Modules/version.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Stuff/Modules/ra.py b/Stuff/Modules/ra.py index b4a4203..7315be7 100644 --- a/Stuff/Modules/ra.py +++ b/Stuff/Modules/ra.py @@ -67,7 +67,7 @@ def __init__(self, nameA, nameR = "auto"): # caching RA.cache[(self.nameA, self.nameR)] = self.__dict__ if len(RA.cache) > 10: - CM.cache.popitem(last = False) + RA.cache.popitem(last = False) def _setRoomName(self, name): # ZMENIT rob na robot??? @@ -176,18 +176,18 @@ def getDistanceFromRobot(self, time = 20, startTime = 0, distances = False): time = time * 60000 start = self.findStart(startTime) - distances = [sqrt((line[2] - line[7])**2 + (line[3] - line[8])**2) for line - in self.data[start:] if line[1] < time] + dists = [sqrt((line[2] - line[7])**2 + (line[3] - line[8])**2) for line + in self.data[start:] if line[1] < time] if not distances: - result = (sum(distances) / len(distances)) / self.trackerResolution + result = (sum(dists) / len(dists)) / self.trackerResolution return format(result, "0.2f") else: - return distances + return dists def getDistanceBoxes(self, time = 20, startTime = 0, width = 10): - distances = self.getDistanceFromRobot(time = time, startTime = startTime) + distances = self.getDistanceFromRobot(time = time, startTime = startTime, distances = True) maximum = self.arenaDiameter * 100 counter = Counter([(dist / self.trackerResolution) // width for dist in distances]) boxes = [0] * ceil(maximum / width) diff --git a/Stuff/Modules/version.py b/Stuff/Modules/version.py index 2ab3047..e4b458f 100644 --- a/Stuff/Modules/version.py +++ b/Stuff/Modules/version.py @@ -21,7 +21,7 @@ def version(): return ['0', '4', '0'] def date(): - return "28 April 2014" + return "26 May 2014" def copyleft(): return "2013, 2014"