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

git15 - fixed bug that it read sawShowdown wrong. fixed postflop fold importing. fairly certain importer is running correctly now :)

Browse Source 
also added SD/F, the percentage of the time the user saw the showdown when they saw the flop. I believe this is normally called WtSD, but this is clearer.
widened main GUI a bit more
the todolist is still growing hehe
This commit is contained in:
steffen123
2008-08-07 11:08:50 +01:00
parent 39f5b9095c
commit 490af1acaf
5 changed files with 82 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pyfpdb/fpdb.py
+2 -2
View File
@@ -343,9 +343,9 @@ blabla""")
self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
self.window.connect("delete_event", self.delete_event)
self.window.connect("destroy", self.destroy)
self.window.set_title("Free Poker DB - version: pre-alpha, git14")
self.window.set_title("Free Poker DB - version: pre-alpha, git15")
self.window.set_border_width(1)
self.window.set_size_request(700,400)
self.window.set_size_request(750,400)
self.window.set_resizable(True)
self.menu_items = (
pyfpdb/fpdb_simple.py
+53 -27
View File
@@ -1230,21 +1230,21 @@ def calculateHudImport(player_ids, category, action_types):
#set default values
myVPIP=False
myPFR=False
myPF3B4BChance=False #todo
myPF3B4BChance=False
myPF3B4B=False
mySawFlop=False #todo
mySawTurn=False #todo
mySawRiver=False #todo
mySawShowdown=False #todo
myRaisedFlop=False #todo
myRaisedTurn=False #todo
myRaisedRiver=False #todo
myOtherRaisedFlop=False #todo
myOtherRaisedFlopFold=False #todo
myOtherRaisedTurn=False #todo
myOtherRaisedTurnFold=False #todo
myOtherRaisedRiver=False #todo
myOtherRaisedRiverFold=False #todo
mySawFlop=False
mySawTurn=False
mySawRiver=False
mySawShowdown=False
myRaisedFlop=False
myRaisedTurn=False
myRaisedRiver=False
myOtherRaisedFlop=False
myOtherRaisedFlopFold=False
myOtherRaisedTurn=False
myOtherRaisedTurnFold=False
myOtherRaisedRiver=False
myOtherRaisedRiverFold=False
#calculate preflop values
street=0
@@ -1257,7 +1257,7 @@ def calculateHudImport(player_ids, category, action_types):
myVPIP=True
if heroPfRaiseCount>=1:
myPFR=True
if heroPfRaiseCount>=2:#todo: this doesnt catch all 3B4B
if heroPfRaiseCount>=2:
myPF3B4B=True
#calculate saw* values
@@ -1267,9 +1267,10 @@ def calculateHudImport(player_ids, category, action_types):
mySawTurn=True
if (len(action_types[3][player])>0):
mySawRiver=True
mySawShowdown=True
for count in range (len(action_types[3][player])):
if action_types[3][player][count]=="fold":
mySawShowdown=True
mySawShowdown=False
#flop stuff
street=1
@@ -1285,21 +1286,46 @@ def calculateHudImport(player_ids, category, action_types):
for countOther in range (len(action_types[street][otherPlayer])):
if action_types[street][otherPlayer][countOther]=="bet":
myOtherRaisedFlop=True
for countOtherFold in range (len(action_types[street][otherPlayer])):
if action_types[street][otherPlayer][countOtherFold]=="fold":
for countOtherFold in range (len(action_types[street][player])):
if action_types[street][player][countOtherFold]=="fold":
myOtherRaisedFlopFold=True
#turn stuff: todo
for count in range(len(action_types[2][player])):
if action_types[2][player][count]=="bet":
myRaisedTurn=True
#turn stuff - copy of flop with different vars
street=2
if mySawTurn:
for count in range(len(action_types[street][player])):
if action_types[street][player][count]=="bet":
myRaisedTurn=True
for otherPlayer in range (len(player_ids)):
if player==otherPlayer or myOtherRaisedTurn:
pass
else:
for countOther in range (len(action_types[street][otherPlayer])):
if action_types[street][otherPlayer][countOther]=="bet":
myOtherRaisedTurn=True
for countOtherFold in range (len(action_types[street][player])):
if action_types[street][player][countOtherFold]=="fold":
myOtherRaisedTurnFold=True
#river stuff: todo
for count in range(len(action_types[3][player])):
if action_types[3][player][count]=="bet":
myRaisedRiver=True
#turn stuff - copy of flop with different vars
street=3
if mySawRiver:
for count in range(len(action_types[street][player])):
if action_types[street][player][count]=="bet":
myRaisedRiver=True
for otherPlayer in range (len(player_ids)):
if player==otherPlayer or myOtherRaisedRiver:
pass
else:
for countOther in range (len(action_types[street][otherPlayer])):
if action_types[street][otherPlayer][countOther]=="bet":
myOtherRaisedRiver=True
for countOtherFold in range (len(action_types[street][player])):
if action_types[street][player][countOtherFold]=="fold":
myOtherRaisedRiverFold=True
#add each value to the appropriate array
VPIP.append(myVPIP)
PFR.append(myPFR)
pyfpdb/table_viewer.py
+4 -4
View File
@@ -30,7 +30,6 @@ class table_viewer (threading.Thread):
return "n/a"
else:
return str(int((a/float(b))*100))+"%"
return "todo"
#end def hudDivide
def browse_clicked(self, widget, data):
@@ -60,10 +59,10 @@ class table_viewer (threading.Thread):
arr=[]
#first prepare the header row
if (self.category=="holdem" or self.category=="omahahi" or self.category=="omahahilo"):
tmp=("Name", "Hands", "VPIP", "PFR", "PF3B4B", "AF", "FF", "AT", "FT", "AR", "FR")
tmp=("Name", "Hands", "VPIP", "PFR", "PF3B4B", "AF", "FF", "AT", "FT", "AR", "FR", "SD/F")
else:
raise fpdb_simple.FpdbError("todo reimplement stud")
tmp=("Name", "Hands", "VPI3", "A3", "3B4B_3" "A4", "F4", "A5", "F5", "A6", "F6", "A7", "F7")
raise fpdb_simple.FpdbError("reimplement stud")
tmp=("Name", "Hands", "VPI3", "A3", "3B4B_3" "A4", "F4", "A5", "F5", "A6", "F6", "A7", "F7", "SD/4")
arr.append(tmp)
#then the data rows
@@ -112,6 +111,7 @@ class table_viewer (threading.Thread):
tmp.append(self.hudDivide(row[19],row[18])+" ("+str(row[18])+")") #FT
tmp.append(self.hudDivide(row[15],row[11])+" ("+str(row[11])+")") #AR
tmp.append(self.hudDivide(row[21],row[20])+" ("+str(row[20])+")") #FR
tmp.append(self.hudDivide(row[12],row[9])+" ("+str(row[9])+")") #SD/F
arr.append(tmp)
return arr