import math
import sqlalchemy
import sqlalchemy.sql.functions as sfunc
+from calendar import timegm
+from datetime import datetime as dt
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 KREDUCTION, ELOPARMS
-from xonstat.util import strip_colors, html_colors, pretty_date
+from xonstat.util import qfont_decode, strip_colors, html_colors, pretty_date
log = logging.getLogger(__name__)
return "<Player(%s, %s)>" % (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':qfont_decode(self.stripped_nick)}
+
+ def epoch(self):
+ return timegm(self.create_dt.timetuple())
class GameType(object):
self.name = name
self.hashkey = hashkey
self.ip_addr = ip_addr
+ self.create_dt = dt.utcnow()
def __repr__(self):
return "<Server(%s, %s)>" % (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):
return "<Map(%s, %s, %s)>" % (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):
return "<Game(%s, %s, %s, %s)>" % (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 = []
- 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)
-
- 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(session, elos, scores, winners, ELOPARMS)
-
- # add the elos to the session for committing
- for e in elos:
- session.add(elos[e])
-
- # no longer calculate DM elo for a duel game
- # if game_type_cd == 'duel':
- # self.process_elos(session, "dm")
-
-
- def update_elos(self, session, elos, scores, winners, 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
-
- elo_deltas = {}
- for pid in pids:
- new_elo = max(float(elos[pid].elo) + eloadjust[pid] * elos[pid].k * ep.global_K / float(len(elos) - 1), ep.floor)
-
- log.debug("Player {0}'s Elo would be going from {1} to {2}.".format(pid,
- elos[pid].elo, new_elo))
-
- # winners are not penalized with negative elo
- if pid in winners and new_elo < elos[pid].elo:
- elo_deltas[pid] = 0.0
- else:
- elos[pid].elo = new_elo
- elo_deltas[pid] = new_elo - float(elos[pid].elo)
-
- elos[pid].games += 1
-
- 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):
return "<PlayerGameStat(%s, %s, %s)>" % (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:
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:
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 "<PlayerWeaponStat(%s, %s, %s)>" % (self.player_weapon_stats_id, self.player_id, self.game_id)
class PlayerNick(object):
def __repr__(self):
- return "<PlayerNick(%s, %s)>" % (self.player_id, self.stripped_nick)
+ return "<PlayerNick(%s, %s)>" % (self.player_id, qfont_decode(self.stripped_nick))
def to_dict(self):
- return {'player_id':self.player_id, 'name':self.stripped_nick}
+ return {'player_id':self.player_id, 'name':qfont_decode(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 "<PlayerElo(pid=%s, gametype=%s, elo=%s)>" % (self.player_id, self.game_type_cd, self.elo)
+ return "<PlayerElo(pid=%s, gametype=%s, elo=%s, games=%s)>" % (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):
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 "<PlayerCaptime(pid=%s, map_id=%s)>" % (self.player_id, self.map_id)
+
+
+class SummaryStat(object):
+ def __repr__(self):
+ return "<SummaryStat(total_players=%s, total_games=%s, total_servers=%s)>" % (self.total_players, self.total_games, self.total_servers)
+
+
def initialize_db(engine=None):
DBSession.configure(bind=engine)
Base.metadata.bind = engine
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)
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)
projects / xonotic / xonstat.git / blobdiff