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

[NEWIMPORT] Added street0VPI to HandsPlayers

Browse Source 
Also fixed last patch for streetXSeen
This commit is contained in:
Worros 2009-11-06 19:30:50 +08:00
parent 006d7164ea
commit 5c7cce090e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pyfpdb/Database.py
View File

@ -1394,6 +1394,7 @@ class Database:
pdata[p]['startCash'], pdata[p]['startCash'],
pdata[p]['seatNo'], pdata[p]['seatNo'],
pdata[p]['winnings'], pdata[p]['winnings'],
pdata[p]['street0VPI'],
pdata[p]['street1Seen'], pdata[p]['street1Seen'],
pdata[p]['street2Seen'], pdata[p]['street2Seen'],
pdata[p]['street3Seen'], pdata[p]['street3Seen'],
@ -1411,6 +1412,7 @@ class Database:
startCash, startCash,
seatNo, seatNo,
winnings, winnings,
street0VPI,
street1Seen, street1Seen,
street2Seen, street2Seen,
street3Seen, street3Seen,
@ -1422,7 +1424,7 @@ class Database:
street4Aggr street4Aggr
) )
VALUES ( VALUES (
%s, %s, %s, %s, %s, %s, %s, %s, %s,
%s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
%s, %s, %s, %s, %s %s, %s, %s, %s, %s
)""" )"""
@ -1436,7 +1438,6 @@ class Database:
# startCards, # startCards,
# rake, # rake,
# totalProfit, # totalProfit,
# street0VPI,
# street0_3BChance, # street0_3BChance,
# street0_3BDone, # street0_3BDone,
# sawShowdown, # sawShowdown,

9
pyfpdb/DerivedStats.py
View File

@ -98,6 +98,7 @@ class DerivedStats():
# commentTs DATETIME # commentTs DATETIME
def assembleHandsPlayers(self, hand): def assembleHandsPlayers(self, hand):
#street0VPI/vpip already called in Hand
#hand.players = [[seat, name, chips],[seat, name, chips]] #hand.players = [[seat, name, chips],[seat, name, chips]]
for player in hand.players: for player in hand.players:
self.handsplayers[player[1]]['seatNo'] = player[0] self.handsplayers[player[1]]['seatNo'] = player[0]
@ -109,7 +110,7 @@ class DerivedStats():
self.handsplayers[player]['winnings'] = int(100 * hand.collectees[player]) self.handsplayers[player]['winnings'] = int(100 * hand.collectees[player])
for i, street in enumerate(hand.actionStreets[2:]): for i, street in enumerate(hand.actionStreets[2:]):
self.seen(self.hand, i+2) self.seen(self.hand, i+1)
for i, street in enumerate(hand.actionStreets[1:]): for i, street in enumerate(hand.actionStreets[1:]):
self.aggr(self.hand, i) self.aggr(self.hand, i)
@ -815,9 +816,9 @@ class DerivedStats():
for player in hand.players: for player in hand.players:
if player[1] in vpipers: if player[1] in vpipers:
self.handsplayers[player[1]]['vpip'] = True self.handsplayers[player[1]]['street0VPI'] = True
else: else:
self.handsplayers[player[1]]['vpip'] = False self.handsplayers[player[1]]['street0VPI'] = False
def playersAtStreetX(self, hand): def playersAtStreetX(self, hand):
""" playersAtStreet1 SMALLINT NOT NULL, /* num of players seeing flop/street4/draw1 */""" """ playersAtStreet1 SMALLINT NOT NULL, /* num of players seeing flop/street4/draw1 */"""
@ -856,7 +857,7 @@ class DerivedStats():
def seen(self, hand, i): def seen(self, hand, i):
pas = set() pas = set()
for act in hand.actions[hand.actionStreets[i]]: for act in hand.actions[hand.actionStreets[i+1]]:
pas.add(act[0]) pas.add(act[0])
for player in hand.players: for player in hand.players: