X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=xonstat%2Fmodels.py;h=4e3bb63ce6f7dd8672c0943f72709931e9cd3e5c;hb=b00e86899c383e830ed57ca6fa8b51b137a193c7;hp=466bfa06e9f53276ee341d51c7cd22833ac9bc60;hpb=71f979dedf515938663214a945df2f113e3c8d90;p=xonotic%2Fxonstat.git diff --git a/xonstat/models.py b/xonstat/models.py index 466bfa0..4e3bb63 100644 --- a/xonstat/models.py +++ b/xonstat/models.py @@ -3,12 +3,12 @@ import logging import math import sqlalchemy import sqlalchemy.sql.functions as sfunc +from calendar import timegm from datetime import timedelta 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 ELOPARMS, KREDUCTION from xonstat.util import strip_colors, html_colors, pretty_date log = logging.getLogger(__name__) @@ -37,7 +37,13 @@ class Player(object): 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')} + return {'player_id':self.player_id, 'nick':self.nick, + 'joined':self.create_dt.strftime('%Y-%m-%dT%H:%M:%SZ'), + 'active_ind':self.active_ind, 'location':self.location, + 'stripped_nick':self.stripped_nick} + + def epoch(self): + return timegm(self.create_dt.timetuple()) class GameType(object): @@ -66,7 +72,14 @@ class Server(object): 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')} + return {'server_id':self.server_id, 'name':self.name, + 'ip_addr':self.ip_addr, 'location':self.location} + + def fuzzy_date(self): + return pretty_date(self.create_dt) + + def epoch(self): + return timegm(self.create_dt.timetuple()) class Map(object): @@ -77,7 +90,13 @@ class Map(object): return "" % (self.map_id, self.name, self.version) def to_dict(self): - return {'map_id':self.map_id, 'name':self.name, 'version':self.version} + return {'map_id':self.map_id, 'name':self.name, 'version':self.version,} + + def fuzzy_date(self): + return pretty_date(self.create_dt) + + def epoch(self): + return timegm(self.create_dt.timetuple()) class Game(object): @@ -94,152 +113,14 @@ class Game(object): 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} + 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 = {} - winners = [] - losers = [] - for (p,s,a,r,t) in session.query(PlayerGameStat.player_id, - PlayerGameStat.score, PlayerGameStat.alivetime, - PlayerGameStat.rank, PlayerGameStat.team).\ - 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 - - # winners are either rank 1 or on the winning team - # team games are where the team is set (duh) - if r == 1 or (t == self.winner and t is not None): - winners.append(p) - else: - losers.append(p) - - 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]) - - if pid in winners: - winners.remove(pid) - else: - losers.remove(pid) - - elos = self.update_elos(session, elos, scores, winners, losers, ELOPARMS) - - # add the elos to the session for committing - for e in elos: - session.add(elos[e]) - - def update_elos(self, session, elos, scores, winners, losers, ep): - if len(elos) < 2 or len(winners) == 0 or len(losers) == 0: - return elos - - pids = elos.keys() - - elo_deltas = {} - for w_pid in winners: - w_elo = elos[w_pid] - for l_pid in losers: - l_elo = elos[l_pid] - - w_q = math.pow(10, float(w_elo.elo)/400.0) - l_q = math.pow(10, float(l_elo.elo)/400.0) - - w_delta = w_elo.k * ELOPARMS.global_K * (1 - w_q/(w_q + l_q)) - l_delta = l_elo.k * ELOPARMS.global_K * (0 - l_q/(l_q + w_q)) - - elo_deltas[w_pid] = (elo_deltas.get(w_pid, 0.0) + w_delta) - elo_deltas[l_pid] = (elo_deltas.get(l_pid, 0.0) + l_delta) - - log.debug("Winner {0}'s elo_delta vs Loser {1}: {2}".format(w_pid, - l_pid, w_delta)) - - log.debug("Loser {0}'s elo_delta vs Winner {1}: {2}".format(l_pid, - w_pid, l_delta)) - - log.debug("w_elo: {0}, w_k: {1}, w_q: {2}, l_elo: {3}, l_k: {4}, l_q: {5}".\ - format(w_elo.elo, w_elo.k, l_q, l_elo.elo, l_elo.k, l_q)) - - for pid in pids: - # average the elo gain for team games - if pid in winners: - elo_deltas[pid] = elo_deltas.get(pid, 0.0) / len(losers) - else: - elo_deltas[pid] = elo_deltas.get(pid, 0.0) / len(winners) - - old_elo = float(elos[pid].elo) - new_elo = max(float(elos[pid].elo) + elo_deltas[pid], ep.floor) - - # in case we've set a different delta from the above - elo_deltas[pid] = new_elo - old_elo - - elos[pid].elo = new_elo - elos[pid].games += 1 - log.debug("Setting Player {0}'s Elo delta to {1}. Elo is now {2} (was {3}).".\ - format(pid, elo_deltas[pid], new_elo, old_elo)) - - self.save_elo_deltas(session, elo_deltas) - - return elos - - - def save_elo_deltas(self, session, elo_deltas): - """ - Saves the amount by which each player's Elo goes up or down - in a given game in the PlayerGameStat row, allowing for scoreboard display. - - elo_deltas is a dictionary such that elo_deltas[player_id] is the elo_delta - for that player_id. - """ - pgstats = {} - for pgstat in session.query(PlayerGameStat).\ - filter(PlayerGameStat.game_id == self.game_id).\ - all(): - pgstats[pgstat.player_id] = pgstat - - for pid in elo_deltas.keys(): - try: - pgstats[pid].elo_delta = elo_deltas[pid] - session.add(pgstats[pid]) - except: - log.debug("Unable to save Elo delta value for player_id {0}".format(pid)) - - + def epoch(self): + return timegm(self.start_dt.timetuple()) class PlayerGameStat(object): @@ -251,7 +132,9 @@ class PlayerGameStat(object): 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')} + return {'player_id':self.player_id, 'game_id':self.game_id, + 'create_dt':self.create_dt.strftime('%Y-%m-%dT%H:%M:%SZ'), + 'alivetime':self.alivetime, 'rank':self.rank, 'score':self.score, 'team':self.team} def nick_stripped(self): if self.nick is None: @@ -266,10 +149,8 @@ class PlayerGameStat(object): return html_colors(self.nick) def team_html_color(self): - # blue if self.team == 5: return "red" - # red if self.team == 14: return "blue" if self.team == 13: @@ -295,6 +176,13 @@ class PlayerAchievement(object): class PlayerWeaponStat(object): + def __init__(self): + self.fired = 0 + self.max = 0 + self.hit = 0 + self.actual = 0 + self.frags = 0 + def __repr__(self): return "" % (self.player_weapon_stats_id, self.player_id, self.game_id) @@ -323,19 +211,19 @@ class PlayerNick(object): 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, self.games) def to_dict(self): - return {'player_id':self.player_id, 'game_type_cd':self.game_type_cd, 'elo':self.elo} + return {'player_id':self.player_id, 'game_type_cd':self.game_type_cd, 'elo':self.elo, 'games':self.games} class PlayerRank(object): @@ -353,6 +241,23 @@ class PlayerRank(object): return {'player_id':self.player_id, 'game_type_cd':self.game_type_cd, 'rank':self.rank} +class PlayerCaptime(object): + def __init__(self, player_id=None, game_id=None, map_id=None, + fastest_cap=None): + self.player_id = player_id + self.game_id = game_id + self.map_id = map_id + self.fastest_cap = fastest_cap + + def __repr__(self): + return "" % (self.player_id, self.map_id) + + +class SummaryStat(object): + def __repr__(self): + return "" % (self.total_players, self.total_games, self.total_servers) + + def initialize_db(engine=None): DBSession.configure(bind=engine) Base.metadata.bind = engine @@ -375,6 +280,8 @@ def initialize_db(engine=None): player_nicks_table = MetaData.tables['player_nicks'] player_elos_table = MetaData.tables['player_elos'] player_ranks_table = MetaData.tables['player_ranks'] + player_captimes_table = MetaData.tables['player_map_captimes'] + summary_stats_table = MetaData.tables['summary_stats'] # now map the tables and the objects together mapper(PlayerAchievement, achievements_table) @@ -391,3 +298,5 @@ def initialize_db(engine=None): mapper(PlayerNick, player_nicks_table) mapper(PlayerElo, player_elos_table) mapper(PlayerRank, player_ranks_table) + mapper(PlayerCaptime, player_captimes_table) + mapper(SummaryStat, summary_stats_table)