diff --git a/data analysis/analysis/__pycache__/analysis.cpython-36.pyc b/data analysis/analysis/__pycache__/analysis.cpython-36.pyc index c61d176c..cd6c08c5 100644 Binary files a/data analysis/analysis/__pycache__/analysis.cpython-36.pyc and b/data analysis/analysis/__pycache__/analysis.cpython-36.pyc differ diff --git a/data analysis/analysis/analysis.py b/data analysis/analysis/analysis.py index b55012c4..bd12429d 100644 --- a/data analysis/analysis/analysis.py +++ b/data analysis/analysis/analysis.py @@ -312,11 +312,11 @@ def elo(starting_score, opposing_scores, observed, N, K): return starting_score + K*(np.sum(observed) - np.sum(expected)) -def gliko2(opp_ratings, opp_rd, observations, rating = 1500, rd = 350, vol = 0.06): +def gliko2(starting_score, starting_rd, starting_vol, opposing_scores, opposing_rd, observations): - player = gliko2_engine(rating = rating, rd = rd, vol = vol) + player = gliko2_engine(rating = starting_score, rd = starting_rd, vol = starting_vol) - player.update_player([x for x in opp_ratings], [x for x in opp_rd], observations) + player.update_player([x for x in opposing_scores], [x for x in opposing_rd], observations) return (player.rating, player.rd, player.vol)