diff --git a/data analysis/__pycache__/data.cpython-37.pyc b/data analysis/__pycache__/data.cpython-37.pyc index 86de3e09..58b83c4a 100644 Binary files a/data analysis/__pycache__/data.cpython-37.pyc and b/data analysis/__pycache__/data.cpython-37.pyc differ diff --git a/data analysis/config/competition.config b/data analysis/config/competition.config new file mode 100644 index 00000000..511e258a --- /dev/null +++ b/data analysis/config/competition.config @@ -0,0 +1 @@ +2020ilch \ No newline at end of file diff --git a/data analysis/config/database.config b/data analysis/config/database.config new file mode 100644 index 00000000..e69de29b diff --git a/data analysis/config/keys.config b/data analysis/config/keys.config new file mode 100644 index 00000000..77a53a68 --- /dev/null +++ b/data analysis/config/keys.config @@ -0,0 +1,2 @@ +mongodb+srv://api-user-new:titanscout2022@2022-scouting-4vfuu.mongodb.net/test?authSource=admin&replicaSet=2022-scouting-shard-0&readPreference=primary&appname=MongoDB%20Compass&ssl=true +UDvKmPjPRfwwUdDX1JxbmkyecYBJhCtXeyVk9vmO2i7K0Zn4wqQPMfzuEINXJ7e5 \ No newline at end of file diff --git a/data analysis/config.csv b/data analysis/config/stats.config similarity index 98% rename from data analysis/config.csv rename to data analysis/config/stats.config index 42e42922..5b0501ac 100644 --- a/data analysis/config.csv +++ b/data analysis/config/stats.config @@ -1,4 +1,3 @@ -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-teleop,basic_stats,historical_analysis,regression_linear,regression_logarithmic,regression_exponential,regression_polynomial,regression_sigmoidal diff --git a/data analysis/superscript.py b/data analysis/superscript.py index 7190bd1f..66709017 100644 --- a/data analysis/superscript.py +++ b/data analysis/superscript.py @@ -81,6 +81,7 @@ __all__ = [ from analysis import analysis as an import data as d +from pathlib import Path import numpy as np import matplotlib.pyplot as plt import time @@ -94,12 +95,13 @@ def main(): print("time: " + str(current_time)) print(" loading config") - competition, config = load_config("config.csv") + config = load_config(Path("config/stats.config")) + competition = an.load_csv(Path("config/competition.config"))[0][0] print(" config loaded") print(" loading database keys") - apikey = an.load_csv("keys.txt")[0][0] - tbakey = an.load_csv("keys.txt")[1][0] + apikey = an.load_csv(Path("config/keys.config"))[0][0] + tbakey = an.load_csv(Path("config/keys.config"))[1][0] print(" loaded keys") previous_time = d.get_analysis_flags(apikey, "latest_update") @@ -141,10 +143,10 @@ def main(): def load_config(file): config_vector = {} file = an.load_csv(file) - for line in file[1:]: + for line in file: config_vector[line[0]] = line[1:] - return (file[0][0], config_vector) + return config_vector def simpleloop(data, tests): # expects 3D array with [Team][Variable][Match]