From 24adb571043b9dbf2cbdfdcc6661a780970f2cdc Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Sat, 1 Feb 2020 10:39:48 +0100 Subject: [PATCH] fix quality http query --- StorrageBackend.py | 8 ++++---- httpAPI.py | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/StorrageBackend.py b/StorrageBackend.py index 1004b26..0a805a2 100644 --- a/StorrageBackend.py +++ b/StorrageBackend.py @@ -171,19 +171,19 @@ def getBalancedTeams(players, buddies=None, teamCount=2): i += 1 return ret -def qualityForTeams(teamArray, useNames=True): +def qualityForTeams(teamArray, useNames=False): '''Get quality for number of teams with players''' if not teamArray or len(teamArray) < 2 or not teamArray[0]: raise ValueError("Team Array must be more than one team with more than one player each") if useNames: - teamArray = [ [ searchPlayerByName(playerID)[0] for playerID in team ] for team in teamArray ] + teamArray = [ [ Player.DummyPlayer(searchPlayerByName(playerID)[0][0]) + for playerID in team ] for team in teamArray ] elif type(teamArray[0][0]) == str: teamArray = [ [ Player.DummyPlayer(playerID) for playerID in team ] for team in teamArray ] for team in teamArray: - print(team[0].steamid) sync_from_database(team) teamAsRatings = [ [ player.rating for player in team ] for team in teamArray ] @@ -205,7 +205,7 @@ def qualityForRatings(team1, team2, names1 = [""], names2 = [""]): sig2 = sum(r.sigma for r in team2) sigtot = sig1 + sig2 - print(team1, team2) + # print(team1, names1, team2, names2) diff = abs(mu1 - mu2) percent = 50 + diff/mu_tot*100 diff --git a/httpAPI.py b/httpAPI.py index 2c6aeb6..86e2324 100644 --- a/httpAPI.py +++ b/httpAPI.py @@ -52,8 +52,9 @@ def getBalancedTeams(): def quality(): '''Get a game quality estimate for two or more given teams''' string = flask.request.args.get("playerswithteams") + useNames = flask.request.args.get("names") teams = string.split("|") if len(teams) < 2: flask.abort("Invalid input string: {}".format(string)) teams = [ x.split(",") for x in teams ] - return SB.qualityForTeams(teams) + return SB.qualityForTeams(teams, useNames=bool(useNames))