From eb8914aa26affc4416b587d4ae058b1f792f3777 Mon Sep 17 00:00:00 2001 From: Dev Singh Date: Fri, 6 Mar 2020 11:27:32 -0600 Subject: [PATCH] maybe working --- data analysis/config.csv | 6 ++++-- data analysis/superscript.py | 27 +++++++++++++-------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/data analysis/config.csv b/data analysis/config.csv index d1975c6a..42e42922 100644 --- a/data analysis/config.csv +++ b/data analysis/config.csv @@ -1,9 +1,11 @@ 2020ilch balls-blocked,basic_stats,historical_analysis,regression_linear,regression_logarithmic,regression_exponential,regression_polynomial,regression_sigmoidal balls-collected,basic_stats,historical_analysis,regression_linear,regression_logarithmic,regression_exponential,regression_polynomial,regression_sigmoidal -balls-lower,basic_stats,historical_analysis,regression_linear,regression_logarithmic,regression_exponential,regression_polynomial,regression_sigmoidal +balls-lower-teleop,basic_stats,historical_analysis,regression_linear,regression_logarithmic,regression_exponential,regression_polynomial,regression_sigmoidal +balls-lower-auto,basic_stats,historical_analysis,regression_linear,regression_logarithmic,regression_exponential,regression_polynomial,regression_sigmoidal balls-started,basic_stats,historical_analyss,regression_linear,regression_logarithmic,regression_exponential,regression_polynomial,regression_sigmoidal -balls-upper,basic_stats,historical_analysis,regression_linear,regression_logarithmic,regression_exponential,regression_polynomial,regression_sigmoidal +balls-upper-teleop,basic_stats,historical_analysis,regression_linear,regression_logarithmic,regression_exponential,regression_polynomial,regression_sigmoidal +balls-upper-auto,basic_stats,historical_analysis,regression_linear,regression_logarithmic,regression_exponential,regression_polynomial,regression_sigmoidal wheel-mechanism low-balls high-balls diff --git a/data analysis/superscript.py b/data analysis/superscript.py index 7cdfee98..7ee79e5d 100644 --- a/data analysis/superscript.py +++ b/data analysis/superscript.py @@ -114,7 +114,7 @@ def main(): print(" finished tests") print(" running metrics") - metrics = metricsloop(tbakey, apikey, competition, previous_time) + metricsloop(tbakey, apikey, competition, previous_time) print(" finished metrics") print(" running pit analysis") @@ -176,16 +176,12 @@ def simplestats(data, test): if(test == "regression_sigmoidal"): return an.regression(list(range(len(data))), data, ['sig']) -def push_to_database(apikey, competition, results, metrics, pit): +def push_to_database(apikey, competition, results, pit): for team in results: d.push_team_tests_data(apikey, competition, team, results[team]) - for team in temp_vector: - - d.push_team_metrics_data(apikey, competition, team, temp_vector[team]) - for variable in pit: d.push_team_pit_data(apikey, competition, variable, pit[variable]) @@ -202,10 +198,10 @@ def metricsloop(tbakey, apikey, competition, timestamp): # listener based metric red = {} blu = {} - red = load_metrics(apikey, competition, match, "red") - blu = load_metrics(apikey, competition, match, "blue") - for match in matches: + + red = load_metrics(apikey, competition, match, "red") + blu = load_metrics(apikey, competition, match, "blue") elo_red_total = 0 elo_blu_total = 0 @@ -279,6 +275,14 @@ def metricsloop(tbakey, apikey, competition, timestamp): # listener based metric blu[team]["gl2"]["rd"] = blu[team]["gl2"]["rd"] + blu_gl2_delta["rd"] blu[team]["gl2"]["vol"] = blu[team]["gl2"]["vol"] + blu_gl2_delta["vol"] + temp_vector = {} + temp_vector.update(red) + temp_vector.update(blu) + + for team in temp_vector: + + d.push_team_metrics_data(apikey, competition, team, temp_vector[team]) + """ not functional for now red_trueskill = [] blu_trueskill = [] @@ -305,11 +309,6 @@ def metricsloop(tbakey, apikey, competition, timestamp): # listener based metric """ - return_vector.update(red) - return_vector.update(blue) - - return return_vector - def load_metrics(apikey, competition, match, group_name): group = {}