+import json
import logging
+import math
import sqlalchemy
+import sqlalchemy.sql.functions as sfunc
from datetime import timedelta
from sqlalchemy.orm import mapper
from sqlalchemy.orm import scoped_session
return pretty_date(self.create_dt)
def __repr__(self):
- return "<Player(%s, %s)>" % (self.player_id,
- self.nick.encode('utf-8'))
+ 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)
+ 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)
+ 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 __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):
def __repr__(self):
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}
+
class Game(object):
def __init__(self, game_id=None, start_dt=None, game_type_cd=None,
self.winner = winner
def __repr__(self):
- return "<Game(%s, %s, %s, %s)>" % (self.game_id, self.start_dt,
- self.game_type_cd, self.server_id)
+ 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)
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,
filter(PlayerGameStat.alivetime > timedelta(seconds=0)).\
filter(PlayerGameStat.player_id > 2).\
all():
- scores[p] = s
+ # scores are per second
+ scores[p] = s/float(a.seconds)
alivetimes[p] = a.seconds
player_ids = scores.keys()
elos[pid] = PlayerElo(pid, game_type_cd)
for pid in player_ids:
- elos[pid].k = KREDUCTION.eval(elos[pid].games, alivetimes[pid], 0)
+ 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)
for e in elos:
session.add(elos[e])
- # TODO: duels are also logged as DM for elo purposes
+ 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
- # need to turn this into a list to iterate based
- # on numerical index
- elos = list(elos)
-
if len(elos) < 2:
return elos
- for i in xrange(0, len(elos)):
- ei = elos[i]
- for j in xrange(i+1, len(elos)):
- ej = elos[j]
+
+ 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]
scorefactor_real = si / float(si + sj)
# estimated score factor by elo
- elodiff = min(ep.maxlogdistance, max(-ep.maxlogdistance, (ei.elo - ej.elo) * ep.logdistancefactor))
+ 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?
adjustment = scorefactor_real - scorefactor_elo
eloadjust[ei.player_id] += adjustment
- eloadjust[ei.player_id] -= adjustment
- for e in elos:
- e.elo = max(e.elo + eloadjust[e.player_id] * e.k * ep.global_K / float(len(elos) - 1), ep.floor)
- e.games += 1
+ 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
self.create_dt = create_dt
def __repr__(self):
- return "<PlayerGameStat(%s, %s, %s)>" \
- % (self.player_id, self.game_id, self.create_dt)
+ 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:
class Achievement(object):
def __repr__(self):
- return "<Achievement(%s, %s, %s)>" % (self.achievement_cd, self.descr,
- self.limit)
+ 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)
+ 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 __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):
+
self.player_id = player_id
self.game_type_cd = game_type_cd
- self.elo = 0
- self.k = 0.0
self.score = 0
+ self.games = 0
+ self.elo = ELOPARMS.initial
def __repr__(self):
- return "<PlayerElo(%s, %s, %s)>" % (self.player_id, self.game_type_cd,
- self.elo)
+ 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):
+
+ def nick_html_colors(self):
+ if self.nick is None:
+ return "Anonymous Player"
+ 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):
servers_table = MetaData.tables['servers']
player_nicks_table = MetaData.tables['player_nicks']
player_elos_table = MetaData.tables['player_elos']
+ player_ranks_table = MetaData.tables['player_ranks']
# now map the tables and the objects together
mapper(PlayerAchievement, achievements_table)
mapper(Server, servers_table)
mapper(PlayerNick, player_nicks_table)
mapper(PlayerElo, player_elos_table)
+ mapper(PlayerRank, player_ranks_table)
projects / xonotic / xonstat.git / blobdiff