X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonstat.git;a=blobdiff_plain;f=xonstat%2Fmodels.py;h=84a64ea9a665fc6c9d49e52f12c041d8d48bca17;hp=d53e1daeb4fa4cf3bd187d4ec105b6021c02a335;hb=36ee45a0e6f186a6978143f318a3bc7a75dd8fb0;hpb=ed2724e703b7b440bb87558df38043b1f6f9fe7e diff --git a/xonstat/models.py b/xonstat/models.py old mode 100755 new mode 100644 index d53e1da..84a64ea --- a/xonstat/models.py +++ b/xonstat/models.py @@ -1,3 +1,4 @@ +import json import logging import math import sqlalchemy @@ -7,7 +8,6 @@ from sqlalchemy.orm import mapper from sqlalchemy.orm import scoped_session from sqlalchemy.orm import sessionmaker from sqlalchemy.ext.declarative import declarative_base -from xonstat.elo import KREDUCTION, ELOPARMS from xonstat.util import strip_colors, html_colors, pretty_date log = logging.getLogger(__name__) @@ -33,20 +33,26 @@ class Player(object): return pretty_date(self.create_dt) def __repr__(self): - return "" % (self.player_id, - self.nick.encode('utf-8')) + return "" % (self.player_id, self.nick.encode('utf-8')) + + def to_dict(self): + return {'player_id':self.player_id, 'name':self.nick.encode('utf-8')} class GameType(object): def __repr__(self): - return "" % (self.game_type_cd, self.descr, - self.active_ind) + return "" % (self.game_type_cd, self.descr, self.active_ind) + + def to_dict(self): + return {'game_type_cd':self.game_type_cd, 'name':self.descr, 'active':self.active_ind} class Weapon(object): def __repr__(self): - return "" % (self.weapon_cd, self.descr, - self.active_ind) + return "" % (self.weapon_cd, self.descr, self.active_ind) + + def to_dict(self): + return {'weapon_cd':self.weapon_cd, 'name':self.descr, 'active':self.active_ind} class Server(object): @@ -58,6 +64,9 @@ class Server(object): def __repr__(self): return "" % (self.server_id, self.name.encode('utf-8')) + def to_dict(self): + return {'server_id':self.server_id, 'name':self.name.encode('utf-8')} + class Map(object): def __init__(self, name=None): @@ -66,6 +75,9 @@ class Map(object): def __repr__(self): return "" % (self.map_id, self.name, self.version) + def to_dict(self): + return {'map_id':self.map_id, 'name':self.name, 'version':self.version} + class Game(object): def __init__(self, game_id=None, start_dt=None, game_type_cd=None, @@ -78,118 +90,14 @@ class Game(object): self.winner = winner def __repr__(self): - return "" % (self.game_id, self.start_dt, - self.game_type_cd, self.server_id) + return "" % (self.game_id, self.start_dt, self.game_type_cd, self.server_id) + + def to_dict(self): + return {'game_id':self.game_id, 'start':self.start_dt.strftime('%Y-%m-%dT%H:%M:%SZ'), 'game_type_cd':self.game_type_cd, 'server_id':self.server_id} def fuzzy_date(self): return pretty_date(self.start_dt) - def process_elos(self, session, game_type_cd=None): - if game_type_cd is None: - game_type_cd = self.game_type_cd - - # we do not have the actual duration of the game, so use the - # maximum alivetime of the players instead - duration = 0 - for d in session.query(sfunc.max(PlayerGameStat.alivetime)).\ - filter(PlayerGameStat.game_id==self.game_id).\ - one(): - duration = d.seconds - - scores = {} - alivetimes = {} - for (p,s,a) in session.query(PlayerGameStat.player_id, - PlayerGameStat.score, PlayerGameStat.alivetime).\ - filter(PlayerGameStat.game_id==self.game_id).\ - filter(PlayerGameStat.alivetime > timedelta(seconds=0)).\ - filter(PlayerGameStat.player_id > 2).\ - all(): - # scores are per second - scores[p] = s/float(a.seconds) - alivetimes[p] = a.seconds - - player_ids = scores.keys() - - elos = {} - for e in session.query(PlayerElo).\ - filter(PlayerElo.player_id.in_(player_ids)).\ - filter(PlayerElo.game_type_cd==game_type_cd).all(): - elos[e.player_id] = e - - # ensure that all player_ids have an elo record - for pid in player_ids: - if pid not in elos.keys(): - elos[pid] = PlayerElo(pid, game_type_cd) - - for pid in player_ids: - elos[pid].k = KREDUCTION.eval(elos[pid].games, alivetimes[pid], - duration) - if elos[pid].k == 0: - del(elos[pid]) - del(scores[pid]) - del(alivetimes[pid]) - - elos = self.update_elos(elos, scores, ELOPARMS) - - # add the elos to the session for committing - for e in elos: - session.add(elos[e]) - - if game_type_cd == 'duel': - self.process_elos(session, "dm") - - def update_elos(self, elos, scores, ep): - eloadjust = {} - for pid in elos.keys(): - eloadjust[pid] = 0 - - if len(elos) < 2: - return elos - - pids = elos.keys() - - for i in xrange(0, len(pids)): - ei = elos[pids[i]] - for j in xrange(i+1, len(pids)): - ej = elos[pids[j]] - si = scores[ei.player_id] - sj = scores[ej.player_id] - - # normalize scores - ofs = min(0, si, sj) - si -= ofs - sj -= ofs - if si + sj == 0: - si, sj = 1, 1 # a draw - - # real score factor - scorefactor_real = si / float(si + sj) - - # estimated score factor by elo - elodiff = min(ep.maxlogdistance, max(-ep.maxlogdistance, - (float(ei.elo) - float(ej.elo)) * ep.logdistancefactor)) - scorefactor_elo = 1 / (1 + math.exp(-elodiff)) - - # how much adjustment is good? - # scorefactor(elodiff) = 1 / (1 + e^(-elodiff * logdistancefactor)) - # elodiff(scorefactor) = -ln(1/scorefactor - 1) / logdistancefactor - # elodiff'(scorefactor) = 1 / ((scorefactor) (1 - scorefactor) logdistancefactor) - # elodiff'(scorefactor) >= 4 / logdistancefactor - - # adjust'(scorefactor) = K1 + K2 - - # so we want: - # K1 + K2 <= 4 / logdistancefactor <= elodiff'(scorefactor) - # as we then don't overcompensate - - adjustment = scorefactor_real - scorefactor_elo - eloadjust[ei.player_id] += adjustment - eloadjust[ej.player_id] -= adjustment - for pid in pids: - elos[pid].elo = max(float(elos[pid].elo) + eloadjust[pid] * elos[pid].k * ep.global_K / float(len(elos) - 1), ep.floor) - elos[pid].games += 1 - return elos - class PlayerGameStat(object): def __init__(self, player_game_stat_id=None, create_dt=None): @@ -197,8 +105,10 @@ class PlayerGameStat(object): self.create_dt = create_dt def __repr__(self): - return "" \ - % (self.player_id, self.game_id, self.create_dt) + return "" % (self.player_id, self.game_id, self.create_dt) + + def to_dict(self): + return {'player_id':self.player_id, 'game_id':self.game_id, 'create_dt':self.create_dt.strftime('%Y-%m-%dT%H:%M:%SZ')} def nick_stripped(self): if self.nick is None: @@ -227,19 +137,26 @@ class PlayerGameStat(object): class Achievement(object): def __repr__(self): - return "" % (self.achievement_cd, self.descr, - self.limit) + return "" % (self.achievement_cd, self.descr, self.limit) + + def to_dict(self): + return {'achievement_cd':self.achievement_cd, 'name':self.descr, 'limit':self.limit} class PlayerAchievement(object): def __repr__(self): return "" % (self.player_id, self.achievement_cd) + def to_dict(self): + return {'player_id':self.player_id, 'achievement_cd':self.achievement_cd} + class PlayerWeaponStat(object): def __repr__(self): - return "" % (self.player_weapon_stats_id, - self.player_id, self.game_id) + return "" % (self.player_weapon_stats_id, self.player_id, self.game_id) + + def to_dict(self): + return {'player_weapon_stats_id':self.player_weapon_stats_id, 'player_id':self.player_id, 'game_id':self.game_id} class Hashkey(object): @@ -250,24 +167,32 @@ class Hashkey(object): def __repr__(self): return "" % (self.player_id, self.hashkey) + def to_dict(self): + return {'player_id':self.player_id, 'hashkey':self.hashkey} + class PlayerNick(object): def __repr__(self): return "" % (self.player_id, self.stripped_nick) + def to_dict(self): + return {'player_id':self.player_id, 'name':self.stripped_nick} + class PlayerElo(object): - def __init__(self, player_id=None, game_type_cd=None): + def __init__(self, player_id=None, game_type_cd=None, elo=None): self.player_id = player_id self.game_type_cd = game_type_cd + self.elo = elo self.score = 0 self.games = 0 - self.elo = ELOPARMS.initial def __repr__(self): - return "" % \ - (self.player_id, self.game_type_cd, self.elo) + return "" % (self.player_id, self.game_type_cd, self.elo) + + def to_dict(self): + return {'player_id':self.player_id, 'game_type_cd':self.game_type_cd, 'elo':self.elo} class PlayerRank(object): @@ -278,10 +203,11 @@ class PlayerRank(object): else: return html_colors(self.nick) - def __repr__(self): - return "" % \ - (self.player_id, self.game_type_cd, self.rank) + return "" % (self.player_id, self.game_type_cd, self.rank) + + def to_dict(self): + return {'player_id':self.player_id, 'game_type_cd':self.game_type_cd, 'rank':self.rank} def initialize_db(engine=None):