analysis pkg v 1.0.0.9

Testing

.gitignore

@@ -18,4 +18,7 @@ data analysis/arthur_pull.ipynb
 data analysis/keys.txt
 data analysis/check_for_new_matches.ipynb
 data analysis/test.ipynb
-data analysis/visualize_pit.ipynb
+data analysis/visualize_pit.ipynb
+data analysis/config/keys.config
+analysis-master/analysis/__pycache__/
+data analysis/__pycache__/

analysis-master/analysis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: analysis
-Version: 1.0.0.8
+Version: 1.0.0.9
 Summary: analysis package developed by Titan Scouting for The Red Alliance
 Home-page: https://github.com/titanscout2022/tr2022-strategy
 Author: The Titan Scouting Team

analysis-master/analysis/analysis.py

@@ -7,10 +7,12 @@
 #    current benchmark of optimization: 1.33 times faster
 # setup:
 
-__version__ = "1.1.13.006"
+__version__ = "1.1.13.007"
 
 # changelog should be viewed using print(analysis.__changelog__)
 __changelog__ = """changelog:
+    1.1.13.007:
+        - fixed bug with trueskill
     1.1.13.006:
         - cleaned up imports
     1.1.13.005:
@@ -461,13 +463,13 @@ def trueskill(teams_data, observations): # teams_data is array of array of tuple
     team_ratings = []
 
     for team in teams_data:
-        team_temp = []
+        team_temp = ()
         for player in team:
             player = Trueskill.Rating(player[0], player[1])
-            team_temp.append(player)
+            team_temp = team_temp + (player,)
         team_ratings.append(team_temp)
 
-    return Trueskill.rate(teams_data, observations)
+    return Trueskill.rate(team_ratings, ranks=observations)
 
 class RegressionMetrics():
 

analysis-master/build/lib/analysis/analysis.py

@@ -7,10 +7,12 @@
 #    current benchmark of optimization: 1.33 times faster
 # setup:
 
-__version__ = "1.1.13.006"
+__version__ = "1.1.13.007"
 
 # changelog should be viewed using print(analysis.__changelog__)
 __changelog__ = """changelog:
+    1.1.13.007:
+        - fixed bug with trueskill
     1.1.13.006:
         - cleaned up imports
     1.1.13.005:
@@ -461,13 +463,13 @@ def trueskill(teams_data, observations): # teams_data is array of array of tuple
     team_ratings = []
 
     for team in teams_data:
-        team_temp = []
+        team_temp = ()
         for player in team:
             player = Trueskill.Rating(player[0], player[1])
-            team_temp.append(player)
+            team_temp = team_temp + (player,)
         team_ratings.append(team_temp)
 
-    return Trueskill.rate(teams_data, observations)
+    return Trueskill.rate(team_ratings, ranks=observations)
 
 class RegressionMetrics():
 

analysis-master/setup.py

@@ -2,7 +2,7 @@ import setuptools
 
 setuptools.setup(
     name="analysis", # Replace with your own username
-    version="1.0.0.008",
+    version="1.0.0.009",
     author="The Titan Scouting Team",
     author_email="titanscout2022@gmail.com",
     description="analysis package developed by Titan Scouting for The Red Alliance",

data analysis/config/competition.config

@@ -0,0 +1 @@
+2020ilch

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

data analysis/superscript.py

@@ -3,10 +3,12 @@
 # Notes:
 # setup:
 
-__version__ = "0.0.4.002"
+__version__ = "0.0.5.000"
 
 # changelog should be viewed using print(analysis.__changelog__)
 __changelog__ = """changelog:
+    0.0.5.000:
+        improved user interface
     0.0.4.002:
         - removed unessasary code
     0.0.4.001:
@@ -83,6 +85,8 @@ from analysis import analysis as an
 import data as d
 import numpy as np
 import matplotlib.pyplot as plt
+from os import system, name
+from pathlib import Path
 import time
 import warnings
 
@@ -91,16 +95,16 @@ def main():
     while(True):
 
         current_time = time.time()
-        print("time: " + str(current_time))
+        print("[OK] time: " + str(current_time))
 
-        print(" loading config")
-        competition, config = load_config("config.csv")
-        print(" config loaded")
+        start = time.time()
+        config = load_config(Path("config/stats.config"))
+        competition = an.load_csv(Path("config/competition.config"))[0][0]
+        print("[OK] configs loaded")
 
-        print(" loading database keys")
-        apikey = an.load_csv("keys.txt")[0][0]
-        tbakey = an.load_csv("keys.txt")[1][0]
-        print(" loaded keys")
+        apikey = an.load_csv(Path("config/keys.config"))[0][0]
+        tbakey = an.load_csv(Path("config/keys.config"))[1][0]
+        print("[OK] loaded keys")
 
         previous_time = d.get_analysis_flags(apikey, "latest_update")
 
@@ -113,38 +117,55 @@ def main():
 
             previous_time = previous_time["latest_update"]
 
-        print(" analysis backtimed to: " + str(previous_time))
+        print("[OK] analysis backtimed to: " + str(previous_time))
 
-        print(" loading data")
+        print("[OK] loading data")
+        start = time.time()
         data = d.get_match_data_formatted(apikey, competition)
         pit_data = d.pit = d.get_pit_data_formatted(apikey, competition)
-        print(" loaded data")
+        print("[OK] loaded data in " + str(time.time() - start) + " seconds")
 
-        print(" running tests")
+        print("[OK] running tests")
+        start = time.time()
         results = simpleloop(data, config)
-        print(" finished tests")
+        print("[OK] finished tests in " + str(time.time() - start) + " seconds")
 
-        print(" running metrics")
+        print("[OK] running metrics")
+        start = time.time()
         metricsloop(tbakey, apikey, competition, previous_time)
-        print(" finished metrics")
+        print("[OK] finished metrics in " + str(time.time() - start) + " seconds")
 
-        print(" running pit analysis")
+        print("[OK] running pit analysis")
+        start = time.time()
         pit = pitloop(pit_data, config)
-        print(" finished pit analysis")
+        print("[OK] finished pit analysis in " + str(time.time() - start) + " seconds")
 
         d.set_analysis_flags(apikey, "latest_update", {"latest_update":current_time})
         
-        print(" pushing to database")
+        print("[OK] pushing to database")
+        start = time.time()
         push_to_database(apikey, competition, results, pit)
-        print(" pushed to database")
+        print("[OK] pushed to database in " + str(time.time() - start) + " seconds")
+
+        clear()
+
+def clear(): 
+    
+    # for windows 
+    if name == 'nt': 
+        _ = system('cls') 
+  
+    # for mac and linux(here, os.name is 'posix') 
+    else: 
+        _ = system('clear')
 
 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]