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

git36 - implement tv-combinedStealFold and tv-combined2B3B

Browse Source
This commit is contained in:
steffen123
2008-08-15 02:45:19 +01:00
parent 341b24a2e0
commit ff2e75cb6b
5 changed files with 61 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pyfpdb/fpdb.py
+18 -2
View File
@@ -245,6 +245,8 @@ class fpdb:
self.settings['os']="linuxmac"
else:
self.settings['os']="windows"
self.settings['tv-combinedStealFold']=True
self.settings['tv-combined2B3B']=True
if self.settings['os']=="windows":
self.settings['bulkImport-defaultPath']="C:\\Program Files\\PokerStars\\HandHistory\\filename.txt"
@@ -269,12 +271,26 @@ class fpdb:
self.settings['tv-combinedPostflop']=True
else:
self.settings['tv-combinedPostflop']=False
elif lines[i].startswith("tv-combinedStealFold="):
if lines[i].find("True")!=-1:
self.settings['tv-combinedStealFold']=True
else:
self.settings['tv-combinedStealFold']=False
elif lines[i].startswith("tv-combined2B3B="):
if lines[i].find("True")!=-1:
self.settings['tv-combined2B3B']=True
else:
self.settings['tv-combined2B3B']=False
elif lines[i].startswith("bulkImport-defaultPath="):
if lines[i][23:-1]!="default":
self.settings['bulkImport-defaultPath']=lines[i][23:-1]
elif lines[i].startswith("tv-defaultPath="):
if lines[i][15:-1]!="default":
self.settings['tv-defaultPath']=lines[i][15:-1]
elif lines[i].startswith("#"):
pass #comment - dont parse
else:
raise fpdb_simple.FpdbError("invalid line in profile file: "+lines[i])
if self.db!=None:
self.db.disconnect()
@@ -347,9 +363,9 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
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: alpha1+, git35")
self.window.set_title("Free Poker DB - version: alpha1+, git36")
self.window.set_border_width(1)
self.window.set_size_request(950,400)
self.window.set_size_request(1020,400)
self.window.set_resizable(True)
self.menu_items = (
pyfpdb/fpdb_db.py
+12 -12
View File
@@ -87,18 +87,18 @@ class fpdb_db:
def drop_tables(self):
"""Drops the fpdb tables from the current db"""
#todo: run the below if current db is git34 or lower
#self.cursor.execute("DROP TABLE IF EXISTS settings;")
#self.cursor.execute("DROP TABLE IF EXISTS HudDataHoldemOmaha;")
#self.cursor.execute("DROP TABLE IF EXISTS autorates;")
#self.cursor.execute("DROP TABLE IF EXISTS board_cards;")
#self.cursor.execute("DROP TABLE IF EXISTS hands_actions;")
#self.cursor.execute("DROP TABLE IF EXISTS hands_players;")
#self.cursor.execute("DROP TABLE IF EXISTS hands;")
#self.cursor.execute("DROP TABLE IF EXISTS tourneys_players;")
#self.cursor.execute("DROP TABLE IF EXISTS tourneys;")
#self.cursor.execute("DROP TABLE IF EXISTS players;")
#self.cursor.execute("DROP TABLE IF EXISTS gametypes;")
#self.cursor.execute("DROP TABLE IF EXISTS sites;")
self.cursor.execute("DROP TABLE IF EXISTS settings;")
self.cursor.execute("DROP TABLE IF EXISTS HudDataHoldemOmaha;")
self.cursor.execute("DROP TABLE IF EXISTS autorates;")
self.cursor.execute("DROP TABLE IF EXISTS board_cards;")
self.cursor.execute("DROP TABLE IF EXISTS hands_actions;")
self.cursor.execute("DROP TABLE IF EXISTS hands_players;")
self.cursor.execute("DROP TABLE IF EXISTS hands;")
self.cursor.execute("DROP TABLE IF EXISTS tourneys_players;")
self.cursor.execute("DROP TABLE IF EXISTS tourneys;")
self.cursor.execute("DROP TABLE IF EXISTS players;")
self.cursor.execute("DROP TABLE IF EXISTS gametypes;")
self.cursor.execute("DROP TABLE IF EXISTS sites;")
self.cursor.execute("DROP TABLE IF EXISTS Settings;")
self.cursor.execute("DROP TABLE IF EXISTS HudDataHoldemOmaha;")
pyfpdb/table_viewer.py
+27 -5
View File
@@ -59,11 +59,25 @@ 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", "ST", "FS", "FB", "CB", "2B", "3B")
tmp=("Name", "Hands", "VPIP", "PFR", "PF3B4B", "ST")
if self.settings['tv-combinedStealFold']:
tmp+=("FSB", )
else:
tmp+=("FS", "FB")
tmp+=("CB", )
if self.settings['tv-combined2B3B']:
tmp+=("23B", )
else:
tmp+=("2B", "3B")
if self.settings['tv-combinedPostflop']:
tmp+=("Postf A", "Postf F")
else:
tmp+=("AF", "FF", "AT", "FT", "AR", "FR")
tmp+=("WtSD", "W$wsF", "W$SD")
else:
raise fpdb_simple.FpdbError("reimplement stud")
@@ -111,12 +125,20 @@ class table_viewer (threading.Thread):
tmp.append(self.hudDivide(row[8],row[7])+" ("+str(row[7])+")") #PF3B4B
tmp.append(self.hudDivide(row[25],row[24])+" ("+str(row[24])+")") #ST
tmp.append(self.hudDivide(row[29],row[28])+" ("+str(row[28])+")") #FS
tmp.append(self.hudDivide(row[27],row[26])+" ("+str(row[26])+")") #FB
if self.settings['tv-combinedStealFold']:
tmp.append(self.hudDivide(row[29]+row[27],row[28]+row[26])+" ("+str(row[28]+row[26])+")") #FSB
else:
tmp.append(self.hudDivide(row[29],row[28])+" ("+str(row[28])+")") #FS
tmp.append(self.hudDivide(row[27],row[26])+" ("+str(row[26])+")") #FB
tmp.append(self.hudDivide(row[31],row[30])+" ("+str(row[30])+")") #CB
tmp.append(self.hudDivide(row[33],row[32])+" ("+str(row[32])+")") #2B
tmp.append(self.hudDivide(row[35],row[34])+" ("+str(row[34])+")") #3B
if self.settings['tv-combined2B3B']:
tmp.append(self.hudDivide(row[33]+row[35],row[32]+row[34])+" ("+str(row[32]+row[34])+")") #23B
else:
tmp.append(self.hudDivide(row[33],row[32])+" ("+str(row[32])+")") #2B
tmp.append(self.hudDivide(row[35],row[34])+" ("+str(row[34])+")") #3B
if self.settings['tv-combinedPostflop']:
aggCount=row[13]+row[14]+row[15]