diff --git a/analysis-master/analysis.egg-info/PKG-INFO b/analysis-master/analysis.egg-info/PKG-INFO index 0528787b..aeeb9d14 100644 --- a/analysis-master/analysis.egg-info/PKG-INFO +++ b/analysis-master/analysis.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: analysis -Version: 1.0.0.0 +Version: 1.0.0.1 Summary: analysis package developed by Titan Scouting for The Red Alliance Home-page: https://github.com/titanscout2022/tr2022-strategy Author: The Titan Scouting Team diff --git a/analysis-master/build/lib/analysis/analysis.py b/analysis-master/build/lib/analysis/analysis.py index 40c12eac..82409a16 100644 --- a/analysis-master/build/lib/analysis/analysis.py +++ b/analysis-master/build/lib/analysis/analysis.py @@ -7,10 +7,12 @@ # current benchmark of optimization: 1.33 times faster # setup: -__version__ = "1.1.12.003" +__version__ = "1.1.12.004" # changelog should be viewed using print(analysis.__changelog__) __changelog__ = """changelog: + 1.1.12.004: + - renamed gliko to glicko 1.1.12.003: - removed depreciated code 1.1.12.002: @@ -235,7 +237,7 @@ __all__ = [ 'histo_analysis', 'regression', 'elo', - 'gliko2', + 'glicko2', 'trueskill', 'RegressionMetrics', 'ClassificationMetrics', @@ -249,7 +251,7 @@ __all__ = [ 'random_forest_classifier', 'random_forest_regressor', 'Regression', - 'Gliko2', + 'Glicko2', # all statistics functions left out due to integration in other functions ] @@ -390,9 +392,9 @@ def elo(starting_score, opposing_score, observed, N, K): return starting_score + K*(np.sum(observed) - np.sum(expected)) @jit(forceobj=True) -def gliko2(starting_score, starting_rd, starting_vol, opposing_score, opposing_rd, observations): +def glicko2(starting_score, starting_rd, starting_vol, opposing_score, opposing_rd, observations): - player = Gliko2(rating = starting_score, rd = starting_rd, vol = starting_vol) + player = Glicko2(rating = starting_score, rd = starting_rd, vol = starting_vol) player.update_player([x for x in opposing_score], [x for x in opposing_rd], observations) @@ -852,7 +854,7 @@ class Regression: optim.step() return kernel -class Gliko2: +class Glicko2: _tau = 0.5 diff --git a/analysis-master/dist/analysis-1.0.0.0.tar.gz b/analysis-master/dist/analysis-1.0.0.0.tar.gz deleted file mode 100644 index f91c5e05..00000000 Binary files a/analysis-master/dist/analysis-1.0.0.0.tar.gz and /dev/null differ diff --git a/analysis-master/dist/analysis-1.0.0.0-py3-none-any.whl b/analysis-master/dist/analysis-1.0.0.1-py3-none-any.whl similarity index 52% rename from analysis-master/dist/analysis-1.0.0.0-py3-none-any.whl rename to analysis-master/dist/analysis-1.0.0.1-py3-none-any.whl index af33f8a6..d9d2a7e9 100644 Binary files a/analysis-master/dist/analysis-1.0.0.0-py3-none-any.whl and b/analysis-master/dist/analysis-1.0.0.1-py3-none-any.whl differ diff --git a/analysis-master/dist/analysis-1.0.0.1.tar.gz b/analysis-master/dist/analysis-1.0.0.1.tar.gz new file mode 100644 index 00000000..7106238f Binary files /dev/null and b/analysis-master/dist/analysis-1.0.0.1.tar.gz differ diff --git a/analysis-master/setup.py b/analysis-master/setup.py index 5901fdf4..680f53c8 100644 --- a/analysis-master/setup.py +++ b/analysis-master/setup.py @@ -2,7 +2,7 @@ import setuptools setuptools.setup( name="analysis", # Replace with your own username - version="1.0.0.000", + version="1.0.0.001", author="The Titan Scouting Team", author_email="titanscout2022@gmail.com", description="analysis package developed by Titan Scouting for The Red Alliance", diff --git a/data analysis/superscript.py b/data analysis/superscript.py index f25c5931..b86f93eb 100644 --- a/data analysis/superscript.py +++ b/data analysis/superscript.py @@ -163,6 +163,14 @@ def metricsloop(tbakey, apikey, competition, timestamp): # listener based metric red = load_metrics(apikey, competition, matches, "red") blu = load_metrics(apikey, competition, matches, "blue") + elo_red_total = 0 + elo_blu_total = 0 + + gl2_red_total = 0 + gl2_blu_total + 0 + + for team in red: + return def load_metrics(apikey, competition, matches, group_name): @@ -177,7 +185,7 @@ def load_metrics(apikey, competition, matches, group_name): if d.get_team_metrics_data(apikey, competition, team) == None: - elo = {"score": 1500, "N": 1500, "K": 1500} + elo = {"score": 1500} gl2 = {"score": 1500, "rd": 250, "vol": 0.06} ts = {"mu": 25, "sigma": 25/3} @@ -202,8 +210,8 @@ testing() Metrics Defaults: elo starting score = 1500 -elo N = 1500 -elo K = 32 +elo N = 400 +elo K = 24 gl2 starting score = 1500 gl2 starting rd = 350