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

changes to allow hud to use stylekey and aggregate stats query

Browse Source
This commit is contained in:
sqlcoder 2009-05-21 21:27:44 +01:00
parent d986966332
commit 07247de030
2 changed files with 96 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pyfpdb/Database.py
View File

@ -191,15 +191,14 @@ class Database:
winners[row[0]] = row[1] winners[row[0]] = row[1]
return winners return winners
def get_stats_from_hand(self, hand, aggregate = False): def get_stats_from_hand(self, hand, aggregate = False, stylekey = 'A000000'):
c = self.connection.cursor() c = self.connection.cursor()
if aggregate: if aggregate:
query = 'get_stats_from_hand_aggregated' query = 'get_stats_from_hand_aggregated'
subs = (hand, hand, hand)
else: else:
query = 'get_stats_from_hand' query = 'get_stats_from_hand'
subs = (hand, hand) subs = (hand, hand, stylekey, stylekey)
# now get the stats # now get the stats
c.execute(self.sql.query[query], subs) c.execute(self.sql.query[query], subs)
@ -218,7 +217,10 @@ class Database:
c = self.connection.cursor() c = self.connection.cursor()
c.execute(self.sql.query['get_player_id'], {'player': player_name, 'site': site}) c.execute(self.sql.query['get_player_id'], {'player': player_name, 'site': site})
row = c.fetchone() row = c.fetchone()
return row[0] if row:
return row[0]
else:
return None
if __name__=="__main__": if __name__=="__main__":
c = Configuration.Config() c = Configuration.Config()
@ -234,16 +236,17 @@ if __name__=="__main__":
print "last hand = ", h print "last hand = ", h
hero = db_connection.get_player_id(c, 'PokerStars', 'nutOmatic') hero = db_connection.get_player_id(c, 'PokerStars', 'nutOmatic')
print "nutOmatic is id_player = %d" % hero if hero:
print "nutOmatic is id_player = %d" % hero
stat_dict = db_connection.get_stats_from_hand(h) stat_dict = db_connection.get_stats_from_hand(h)
for p in stat_dict.keys(): for p in stat_dict.keys():
print p, " ", stat_dict[p] print p, " ", stat_dict[p]
print "nutOmatics stats:" #print "nutOmatics stats:"
stat_dict = db_connection.get_stats_from_hand(h, hero) #stat_dict = db_connection.get_stats_from_hand(h, hero)
for p in stat_dict.keys(): #for p in stat_dict.keys():
print p, " ", stat_dict[p] # print p, " ", stat_dict[p]
print "cards =", db_connection.get_cards(73525) print "cards =", db_connection.get_cards(73525)
db_connection.close_connection db_connection.close_connection

156
pyfpdb/SQL.py
View File

@ -175,6 +175,7 @@ class Sql:
SELECT hc.playerId AS player_id, SELECT hc.playerId AS player_id,
hp.seatNo AS seat, hp.seatNo AS seat,
p.name AS screen_name, p.name AS screen_name,
hc.styleKey AS stylekey,
sum(hc.HDs) AS n, sum(hc.HDs) AS n,
sum(hc.street0VPI) AS vpip, sum(hc.street0VPI) AS vpip,
sum(hc.street0Aggr) AS pfr, sum(hc.street0Aggr) AS pfr,
@ -237,82 +238,93 @@ class Sql:
AND hc.gametypeId+0 = h.gametypeId+0) AND hc.gametypeId+0 = h.gametypeId+0)
INNER JOIN Players p ON (p.id = hp.PlayerId+0) INNER JOIN Players p ON (p.id = hp.PlayerId+0)
WHERE h.id = %s WHERE h.id = %s
GROUP BY hc.PlayerId, hp.seatNo, p.name AND (hc.styleKey = %s or %s = 'ALL') /* styleKey should be passed in twice */
/* This allows the caller to query only a particular stylekey or all,
e.g. may want to use different values for Hero and others */
GROUP BY hc.PlayerId, hp.seatNo, p.name, hc.styleKey
""" """
# same as above except stats are aggregated for all blind/limit levels # same as above except stats are aggregated for all blind/limit levels
self.query['get_stats_from_hand_aggregated'] = """ self.query['get_stats_from_hand_aggregated'] = """
SELECT HudCache.playerId AS player_id, SELECT hc.playerId AS player_id,
sum(HDs) AS n, max(case when hc.gametypeId = h.gametypeId
sum(street0VPI) AS vpip, then hp.seatNo
sum(street0Aggr) AS pfr, else -1
sum(street0_3BChance) AS TB_opp_0, end) AS seat,
sum(street0_3BDone) AS TB_0, p.name AS screen_name,
sum(street1Seen) AS saw_f, hc.styleKey AS stylekey,
sum(street1Seen) AS saw_1, sum(hc.HDs) AS n,
sum(street2Seen) AS saw_2, sum(hc.street0VPI) AS vpip,
sum(street3Seen) AS saw_3, sum(hc.street0Aggr) AS pfr,
sum(street4Seen) AS saw_4, sum(hc.street0_3BChance) AS TB_opp_0,
sum(sawShowdown) AS sd, sum(hc.street0_3BDone) AS TB_0,
sum(street1Aggr) AS aggr_1, sum(hc.street1Seen) AS saw_f,
sum(street2Aggr) AS aggr_2, sum(hc.street1Seen) AS saw_1,
sum(street3Aggr) AS aggr_3, sum(hc.street2Seen) AS saw_2,
sum(street4Aggr) AS aggr_4, sum(hc.street3Seen) AS saw_3,
sum(otherRaisedStreet1) AS was_raised_1, sum(hc.street4Seen) AS saw_4,
sum(otherRaisedStreet2) AS was_raised_2, sum(hc.sawShowdown) AS sd,
sum(otherRaisedStreet3) AS was_raised_3, sum(hc.street1Aggr) AS aggr_1,
sum(otherRaisedStreet4) AS was_raised_4, sum(hc.street2Aggr) AS aggr_2,
sum(foldToOtherRaisedStreet1) AS f_freq_1, sum(hc.street3Aggr) AS aggr_3,
sum(foldToOtherRaisedStreet2) AS f_freq_2, sum(hc.street4Aggr) AS aggr_4,
sum(foldToOtherRaisedStreet3) AS f_freq_3, sum(hc.otherRaisedStreet1) AS was_raised_1,
sum(foldToOtherRaisedStreet4) AS f_freq_4, sum(hc.otherRaisedStreet2) AS was_raised_2,
sum(wonWhenSeenStreet1) AS w_w_s_1, sum(hc.otherRaisedStreet3) AS was_raised_3,
sum(wonAtSD) AS wmsd, sum(hc.otherRaisedStreet4) AS was_raised_4,
sum(stealAttemptChance) AS steal_opp, sum(hc.foldToOtherRaisedStreet1) AS f_freq_1,
sum(stealAttempted) AS steal, sum(hc.foldToOtherRaisedStreet2) AS f_freq_2,
sum(foldSbToStealChance) AS SBstolen, sum(hc.foldToOtherRaisedStreet3) AS f_freq_3,
sum(foldedSbToSteal) AS SBnotDef, sum(hc.foldToOtherRaisedStreet4) AS f_freq_4,
sum(foldBbToStealChance) AS BBstolen, sum(hc.wonWhenSeenStreet1) AS w_w_s_1,
sum(foldedBbToSteal) AS BBnotDef, sum(hc.wonAtSD) AS wmsd,
sum(street1CBChance) AS CB_opp_1, sum(hc.stealAttemptChance) AS steal_opp,
sum(street1CBDone) AS CB_1, sum(hc.stealAttempted) AS steal,
sum(street2CBChance) AS CB_opp_2, sum(hc.foldSbToStealChance) AS SBstolen,
sum(street2CBDone) AS CB_2, sum(hc.foldedSbToSteal) AS SBnotDef,
sum(street3CBChance) AS CB_opp_3, sum(hc.foldBbToStealChance) AS BBstolen,
sum(street3CBDone) AS CB_3, sum(hc.foldedBbToSteal) AS BBnotDef,
sum(street4CBChance) AS CB_opp_4, sum(hc.street1CBChance) AS CB_opp_1,
sum(street4CBDone) AS CB_4, sum(hc.street1CBDone) AS CB_1,
sum(foldToStreet1CBChance) AS f_cb_opp_1, sum(hc.street2CBChance) AS CB_opp_2,
sum(foldToStreet1CBDone) AS f_cb_1, sum(hc.street2CBDone) AS CB_2,
sum(foldToStreet2CBChance) AS f_cb_opp_2, sum(hc.street3CBChance) AS CB_opp_3,
sum(foldToStreet2CBDone) AS f_cb_2, sum(hc.street3CBDone) AS CB_3,
sum(foldToStreet3CBChance) AS f_cb_opp_3, sum(hc.street4CBChance) AS CB_opp_4,
sum(foldToStreet3CBDone) AS f_cb_3, sum(hc.street4CBDone) AS CB_4,
sum(foldToStreet4CBChance) AS f_cb_opp_4, sum(hc.foldToStreet1CBChance) AS f_cb_opp_1,
sum(foldToStreet4CBDone) AS f_cb_4, sum(hc.foldToStreet1CBDone) AS f_cb_1,
sum(totalProfit) AS net, sum(hc.foldToStreet2CBChance) AS f_cb_opp_2,
sum(street1CheckCallRaiseChance) AS ccr_opp_1, sum(hc.foldToStreet2CBDone) AS f_cb_2,
sum(street1CheckCallRaiseDone) AS ccr_1, sum(hc.foldToStreet3CBChance) AS f_cb_opp_3,
sum(street2CheckCallRaiseChance) AS ccr_opp_2, sum(hc.foldToStreet3CBDone) AS f_cb_3,
sum(street2CheckCallRaiseDone) AS ccr_2, sum(hc.foldToStreet4CBChance) AS f_cb_opp_4,
sum(street3CheckCallRaiseChance) AS ccr_opp_3, sum(hc.foldToStreet4CBDone) AS f_cb_4,
sum(street3CheckCallRaiseDone) AS ccr_3, sum(hc.totalProfit) AS net,
sum(street4CheckCallRaiseChance) AS ccr_opp_4, sum(hc.street1CheckCallRaiseChance) AS ccr_opp_1,
sum(street4CheckCallRaiseDone) AS ccr_4 sum(hc.street1CheckCallRaiseDone) AS ccr_1,
FROM HudCache, Hands sum(hc.street2CheckCallRaiseChance) AS ccr_opp_2,
WHERE HudCache.PlayerId in sum(hc.street2CheckCallRaiseDone) AS ccr_2,
(SELECT PlayerId FROM HandsPlayers sum(hc.street3CheckCallRaiseChance) AS ccr_opp_3,
WHERE handId = %s) sum(hc.street3CheckCallRaiseDone) AS ccr_3,
AND Hands.id = %s sum(hc.street4CheckCallRaiseChance) AS ccr_opp_4,
AND HudCache.gametypeId in sum(hc.street4CheckCallRaiseDone) AS ccr_4
(SELECT gt1.id from Gametypes gt1, Gametypes gt2, Hands FROM Hands h
WHERE gt1.siteid = gt2.siteid INNER JOIN HandsPlayers hp ON (hp.handId = %s)
AND gt1.type = gt2.type INNER JOIN HudCache hc ON (hc.playerId = hp.playerId)
AND gt1.category = gt2.category INNER JOIN Players p ON (p.id = hc.playerId)
AND gt1.limittype = gt2.limittype WHERE h.id = %s
AND gt2.id = Hands.gametypeId AND (hc.styleKey = %s or %s = 'ALL') /* styleKey should be passed in twice */
AND Hands.id = %s) /* This allows the caller to query only a particular stylekey or all,
GROUP BY HudCache.PlayerId e.g. may want to use different values for Hero and others */
AND hc.gametypeId+0 in
(SELECT gt1.id from Gametypes gt1, Gametypes gt2
WHERE gt1.siteid = gt2.siteid
AND gt1.type = gt2.type
AND gt1.category = gt2.category
AND gt1.limittype = gt2.limittype
AND gt2.id = h.gametypeId)
GROUP BY hc.PlayerId, hc.styleKey
""" """
self.query['get_players_from_hand'] = """ self.query['get_players_from_hand'] = """