From ddf6faeecfe7bbf269c8a47673240404a7235816 Mon Sep 17 00:00:00 2001 From: Arthur Lu Date: Tue, 29 Mar 2022 21:15:24 +0000 Subject: [PATCH] fixed metrics processing ordering, added metrics logging --- src/data.py | 8 +++++--- src/module.py | 6 ++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/data.py b/src/data.py index 479f0a3..d4a1676 100644 --- a/src/data.py +++ b/src/data.py @@ -16,12 +16,14 @@ class Client: def pull_new_tba_matches(self, cutoff): competition = self.competition - api_key= self.tbakey + api_key= self.tbakey x=requests.get("https://www.thebluealliance.com/api/v3/event/"+competition+"/matches/simple", headers={"X-TBA-Auth-Key":api_key}) + json = x.json() out = [] - for i in x.json(): - if i["actual_time"] != None and i["actual_time"]-cutoff >= 0 and i["comp_level"] == "qm": + for i in json: + if i["actual_time"] != None and i["comp_level"] == "qm": out.append({"match" : i['match_number'], "blue" : list(map(lambda x: int(x[3:]), i['alliances']['blue']['team_keys'])), "red" : list(map(lambda x: int(x[3:]), i['alliances']['red']['team_keys'])), "winner": i["winning_alliance"]}) + out.sort(key=lambda x: x['match']) return out def get_team_match_data(self, team_num): diff --git a/src/module.py b/src/module.py index e2f8e12..31af481 100644 --- a/src/module.py +++ b/src/module.py @@ -164,6 +164,8 @@ class Metric (Module): def _process_data(self): + self.results = {} + elo_N = self.config["tests"]["elo"]["N"] elo_K = self.config["tests"]["elo"]["K"] @@ -253,6 +255,10 @@ class Metric (Module): temp_vector.update(red) temp_vector.update(blu) + print(match) + + self.results[match['match']] = temp_vector + self.client.push_metric(temp_vector) def _push_results(self):