evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use hudcache query for all player stats and tidy up output

Browse Source
This commit is contained in:
sqlcoder 2008-12-13 02:18:02 +00:00
parent 167c0de3b5
commit cb2e8a96ef
2 changed files with 118 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
pyfpdb/FpdbSQLQueries.py
View File

@ -637,7 +637,8 @@ class FpdbSQLQueries:
if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL'): if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL'):
self.query['getRingProfitAllHandsPlayerIdSite'] = """ self.query['getRingProfitAllHandsPlayerIdSite'] = """
SELECT hp.handId, hp.winnings, SUM(ha.amount), hp.winnings - SUM(ha.amount) SELECT hp.handId, hp.winnings, coalesce(hp.ante,0) + SUM(ha.amount)
, hp.winnings - (coalesce(hp.ante,0) + SUM(ha.amount))
FROM HandsPlayers hp FROM HandsPlayers hp
INNER JOIN Players pl ON hp.playerId = pl.id INNER JOIN Players pl ON hp.playerId = pl.id
INNER JOIN Hands h ON h.id = hp.handId INNER JOIN Hands h ON h.id = hp.handId
@ -645,7 +646,7 @@ class FpdbSQLQueries:
WHERE pl.name = %s WHERE pl.name = %s
AND pl.siteId = %s AND pl.siteId = %s
AND hp.tourneysPlayersId IS NULL AND hp.tourneysPlayersId IS NULL
GROUP BY hp.handId, hp.winnings, h.handStart GROUP BY hp.handId, hp.winnings, h.handStart, hp.ante
ORDER BY h.handStart""" ORDER BY h.handStart"""
elif(self.dbname == 'SQLite'): elif(self.dbname == 'SQLite'):
#Probably doesn't work. #Probably doesn't work.
@ -662,72 +663,114 @@ class FpdbSQLQueries:
ORDER BY h.handStart""" ORDER BY h.handStart"""
if(self.dbname == 'MySQL InnoDB'): if(self.dbname == 'MySQL InnoDB'):
self.query['playerStats'] = """ self.query['playerStats'] = """ /* format(stats.bigBlind/100,2) as BigBlind */
SELECT stats.gametypeId select /* stats from hudcache */
,stats.base concat(upper(gt.limitType), ' '
,stats.limitType ,concat(upper(substring(gt.category,1,1)),substring(gt.category,2) ), ' '
,stats.name ,s.name, ' $' /* limittype category site $Bigbl in one field? */
,format(stats.bigBlind/100,2) as BigBlind ,cast(trim(leading ' ' from
,stats.n case when gt.bigBlind < 100 then format(gt.bigBlind/100.0,2)
,stats.vpip else format(gt.bigBlind/100.0,0)
,stats.pfr end ) as char)
,stats.saw_f ) AS Game
,stats.sawsd ,sum(HDs) as n
,stats.wtsdwsf ,format(round(100.0*sum(street0VPI)/sum(HDs)),1) AS vpip
,stats.wmsd ,format(round(100.0*sum(street0Aggr)/sum(HDs)),1) AS pfr
,stats.FlAFq ,format(round(100.0*sum(street1Seen)/sum(HDs)),1) AS saw_f
,stats.TuAFq ,format(round(100.0*sum(sawShowdown)/sum(HDs)),1) AS sawsd
,stats.RvAFq ,case when sum(street1Seen) = 0 then 'oo'
,stats.PFAFq else format(round(100.0*sum(sawShowdown)/sum(street1Seen)),1)
,hprof2.sum_profit/100 as Net end AS wtsdwsf
,(hprof2.sum_profit/stats.bigBlind)/(stats.n/100) as BBlPer100 ,case when sum(sawShowdown) = 0 then 'oo'
FROM else format(round(100.0*sum(wonAtSD)/sum(sawShowdown)),1)
(select # stats from hudcache end AS wmsd
gt.base ,case when sum(street1Seen) = 0 then 'oo'
,upper(gt.limitType) limitType else format(round(100.0*sum(street1Aggr)/sum(street1Seen)),1)
end AS FlAFq
,case when sum(street2Seen) = 0 then 'oo'
else format(round(100.0*sum(street2Aggr)/sum(street2Seen)),1)
end AS TuAFq
,case when sum(street3Seen) = 0 then 'oo'
else format(round(100.0*sum(street3Aggr)/sum(street3Seen)),1)
end AS RvAFq
,case when sum(street1Seen)+sum(street2Seen)+sum(street3Seen) = 0 then 'oo'
else format(round(100.0*(sum(street1Aggr)+sum(street2Aggr)+sum(street3Aggr))
/(sum(street1Seen)+sum(street2Seen)+sum(street3Seen))),1)
end AS PoFAFq
,format(sum(totalProfit)/100.0,2) AS Net
,case when sum(HDs) = 0 then 'oo'
else format((sum(totalProfit)/(gt.bigBlind+0.0)) / (sum(HDs)/100.0),2)
end AS BBper100
from Gametypes gt
inner join Sites s on (s.Id = gt.siteId)
inner join HudCache hc on (hc.gameTypeId = gt.Id)
inner join Players p on (p.id = hc.playerId)
where hc.playerId in <player_test>
/* use <gametype_test> here ? */
-- and stats.n > 100 /* optional stat-based queries */
and gt.type = 'ring'
-- and stats.gametypeId = 5
-- and p.name = 'xyz' /* could add player_name query here */
group by gt.category
,gt.limitType
,s.name ,s.name
,gt.bigBlind ,gt.bigBlind
,hc.gametypeId ,hc.gametypeId
,sum(HDs) as n order by gt.category, gt.limittype, gt.bigBlind"""
,round(100*sum(street0VPI)/sum(HDs)) as vpip
,round(100*sum(street0Aggr)/sum(HDs)) as pfr
,round(100*sum(street1Seen)/sum(HDs)) AS saw_f
,round(100*sum(sawShowdown)/sum(HDs)) AS sawsd
,round(100*sum(sawShowdown)/sum(street1Seen)) AS wtsdwsf
,round(100*sum(wonAtSD)/sum(sawShowdown)) AS wmsd
,round(100*sum(street1Aggr)/sum(street1Seen)) AS FlAFq
,round(100*sum(street2Aggr)/sum(street2Seen)) AS TuAFq
,round(100*sum(street3Aggr)/sum(street3Seen)) AS RvAFq
,round(100*(sum(street1Aggr)+sum(street2Aggr)+sum(street3Aggr))
/(sum(street1Seen)+sum(street2Seen)+sum(street3Seen))) AS PFAFq
from Gametypes gt
inner join Sites s on s.Id = gt.siteId
inner join HudCache hc on hc.gameTypeId = gt.Id
where hc.playerId in <player_test>
# use <gametype_test> here ?
group by hc.gametypeId
) stats
inner join
( select # profit from handsplayers/handsactions
hprof.gameTypeId, sum(hprof.profit) sum_profit
from
(select hp.handId, h.gameTypeId, hp.winnings,
coalesce(hp.ante,0) + SUM(ha.amount) costs,
hp.winnings - (coalesce(hp.ante,0) + SUM(ha.amount)) profit
from HandsPlayers hp
inner join Hands h ON h.id = hp.handId
inner join HandsActions ha ON ha.handPlayerId = hp.id
where hp.playerId in <player_test>
# use <gametype_test> here ?
and hp.tourneysPlayersId IS NULL
group by hp.handId, h.gameTypeId, hp.position, hp.winnings
) hprof
group by hprof.gameTypeId
) hprof2
on hprof2.gameTypeId = stats.gameTypeId
order by stats.base, stats.limittype, stats.bigBlind"""
elif(self.dbname == 'PostgreSQL'): elif(self.dbname == 'PostgreSQL'):
self.query['playerStats'] = """ """ self.query['playerStats'] = """
select /* stats from hudcache */
upper(gt.limitType) || ' '
|| initcap(gt.category) || ' '
|| s.name || ' $' /* limittype category site $Bigbl in one field? */
|| trim(leading ' ' from
case when gt.bigBlind < 100 then to_char(gt.bigBlind/100.0,'0D00')
else to_char(gt.bigBlind/100.0,'99990')
end ) AS Game
,sum(HDs) as n
,to_char(round(100.0*sum(street0VPI)/sum(HDs)),'90D0') AS vpip
,to_char(round(100.0*sum(street0Aggr)/sum(HDs)),'90D0') AS pfr
,to_char(round(100.0*sum(street1Seen)/sum(HDs)),'90D0') AS saw_f
,to_char(round(100.0*sum(sawShowdown)/sum(HDs)),'90D0') AS sawsd
,case when sum(street1Seen) = 0 then 'oo'
else to_char(round(100.0*sum(sawShowdown)/sum(street1Seen)),'90D0')
end AS wtsdwsf
,case when sum(sawShowdown) = 0 then 'oo'
else to_char(round(100.0*sum(wonAtSD)/sum(sawShowdown)),'90D0')
end AS wmsd
,case when sum(street1Seen) = 0 then 'oo'
else to_char(round(100.0*sum(street1Aggr)/sum(street1Seen)),'90D0')
end AS FlAFq
,case when sum(street2Seen) = 0 then 'oo'
else to_char(round(100.0*sum(street2Aggr)/sum(street2Seen)),'90D0')
end AS TuAFq
,case when sum(street3Seen) = 0 then 'oo'
else to_char(round(100.0*sum(street3Aggr)/sum(street3Seen)),'90D0')
end AS RvAFq
,case when sum(street1Seen)+sum(street2Seen)+sum(street3Seen) = 0 then 'oo'
else to_char(round(100.0*(sum(street1Aggr)+sum(street2Aggr)+sum(street3Aggr))
/(sum(street1Seen)+sum(street2Seen)+sum(street3Seen))),'90D0')
end AS PoFAFq
,to_char(sum(totalProfit)/100.0,'9G999G990D00') AS Net
,case when sum(HDs) = 0 then 'oo'
else to_char((sum(totalProfit)/(gt.bigBlind+0.0)) / (sum(HDs)/100.0), '990D00')
end AS BBper100
from Gametypes gt
inner join Sites s on (s.Id = gt.siteId)
inner join HudCache hc on (hc.gameTypeId = gt.Id)
inner join Players p on (p.id = hc.playerId)
where hc.playerId in <player_test>
/* use <gametype_test> here ? */
-- and stats.n > 100 /* optional stat-based queries */
and gt.type = 'ring'
-- and stats.gametypeId = 5
-- and p.name = 'xyz' /* could add player_name query here */
group by gt.category
,gt.limitType
,s.name
,gt.bigBlind
,hc.gametypeId
order by gt.category, gt.limittype, gt.bigBlind"""
elif(self.dbname == 'SQLite'): elif(self.dbname == 'SQLite'):
self.query['playerStats'] = """ """ self.query['playerStats'] = """ """

12
pyfpdb/GuiPlayerStats.py
View File

@ -44,13 +44,13 @@ class GuiPlayerStats (threading.Thread):
# Get currently active site and grab playerid # Get currently active site and grab playerid
tmp = self.sql.query['playerStats'] tmp = self.sql.query['playerStats']
result = self.cursor.execute(self.sql.query['getPlayerId'], self.heroes[self.activesite]) result = self.cursor.execute(self.sql.query['getPlayerId'], (self.heroes[self.activesite],))
result = self.db.cursor.fetchall() result = self.db.cursor.fetchall()
pid = result[0][0] pid = result[0][0]
tmp = tmp.replace("<player_test>", "(" + str(pid) + ")") tmp = tmp.replace("<player_test>", "(" + str(pid) + ")")
self.cursor.execute(tmp) self.cursor.execute(tmp)
result = self.db.cursor.fetchall() result = self.db.cursor.fetchall()
cols = 18 cols = 14
rows = len(result)+1 # +1 for title row rows = len(result)+1 # +1 for title row
self.stats_table = gtk.Table(rows, cols, False) self.stats_table = gtk.Table(rows, cols, False)
self.stats_table.set_col_spacings(4) self.stats_table.set_col_spacings(4)
@ -58,7 +58,7 @@ class GuiPlayerStats (threading.Thread):
vbox.add(self.stats_table) vbox.add(self.stats_table)
# Create header row # Create header row
titles = ("GID", "base", "Style", "Site", "$BB", "Hands", "VPIP", "PFR", "saw_f", "sawsd", "wtsdwsf", "wmsd", "FlAFq", "TuAFq", "RvAFq", "PFAFq", "Net($)", "BB/100") titles = ("Game", "Hands", "VPIP", "PFR", "Saw_F", "SawSD", "WtSDwsF", "W$SD", "FlAFq", "TuAFq", "RvAFq", "PFAFq", "Net($)", "BBl/100")
col = 0 col = 0
row = 0 row = 0
@ -76,7 +76,11 @@ class GuiPlayerStats (threading.Thread):
bgcolor = "lightgrey" bgcolor = "lightgrey"
eb = gtk.EventBox() eb = gtk.EventBox()
eb.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(bgcolor)) eb.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(bgcolor))
l = gtk.Label(result[row-1][col]) l = gtk.Label(result[row][col])
if col == 0:
l.set_alignment(xalign=0.0, yalign=0.5)
else:
l.set_alignment(xalign=1.0, yalign=0.5)
eb.add(l) eb.add(l)
self.stats_table.attach(eb, col, col+1, row+1, row+2) self.stats_table.attach(eb, col, col+1, row+1, row+2)
l.show() l.show()