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.elo import ELOPARMS, KREDUCTION
from xonstat.util import strip_colors, html_colors, pretty_date
log = logging.getLogger(__name__)
def __repr__(self):
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')}
+
class GameType(object):
def __repr__(self):
return "<GameType(%s, %s, %s)>" % (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 "<Weapon(%s, %s, %s)>" % (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):
def __init__(self, name=None, hashkey=None, ip_addr=None):
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')}
+
class Map(object):
def __init__(self, name=None):
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}
+ return {'map_id':self.map_id, 'name':self.name, 'version':self.version}
class Game(object):
def __repr__(self):
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}
+
def fuzzy_date(self):
return pretty_date(self.start_dt)
scores = {}
alivetimes = {}
- for (p,s,a) in session.query(PlayerGameStat.player_id,
- PlayerGameStat.score, PlayerGameStat.alivetime).\
+ 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).\
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 = {}
del(scores[pid])
del(alivetimes[pid])
- elos = self.update_elos(elos, scores, ELOPARMS)
+ 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])
- 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:
+ 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()
- 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 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:
- elos[pid].elo = max(float(elos[pid].elo) + eloadjust[pid] * elos[pid].k * ep.global_K / float(len(elos) - 1), ep.floor)
+ # 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))
+
+
+
+
class PlayerGameStat(object):
def __init__(self, player_game_stat_id=None, create_dt=None):
self.player_game_stat_id = player_game_stat_id
def __repr__(self):
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')}
+
def nick_stripped(self):
if self.nick is None:
return "Anonymous Player"
def __repr__(self):
return "<Achievement(%s, %s, %s)>" % (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 "<PlayerAchievement(%s, %s)>" % (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 "<PlayerWeaponStat(%s, %s, %s)>" % (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):
def __init__(self, player_id=None, hashkey=None):
def __repr__(self):
return "<Hashkey(%s, %s)>" % (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 "<PlayerNick(%s, %s)>" % (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 __repr__(self):
return "<PlayerElo(pid=%s, gametype=%s, elo=%s)>" % (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):
else:
return html_colors(self.nick)
-
def __repr__(self):
return "<PlayerRank(pid=%s, gametype=%s, rank=%s)>" % (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):
DBSession.configure(bind=engine)
projects / xonotic / xonstat.git / blobdiff