Merge branch 'master' into siteneutral
This commit is contained in:
Worros
commit
c0d7724921
|
|
@ -146,6 +146,14 @@ class Database:
|
||||||
ranks = ('', '', '2', '3', '4', '5', '6', '7', '8', '9', 'T', 'J', 'Q', 'K', 'A')
|
ranks = ('', '', '2', '3', '4', '5', '6', '7', '8', '9', 'T', 'J', 'Q', 'K', 'A')
|
||||||
cards = ""
|
cards = ""
|
||||||
for i in xrange(1, 8):
|
for i in xrange(1, 8):
|
||||||
|
# key = 'card' + str(i) + 'Value'
|
||||||
|
# if not d.has_key(key): continue
|
||||||
|
# if d[key] == None:
|
||||||
|
# break
|
||||||
|
# elif d[key] == 0:
|
||||||
|
# cards += "xx"
|
||||||
|
# else:
|
||||||
|
# cards += ranks[d['card' + str(i) + 'Value']] + d['card' +str(i) + 'Suit']
|
||||||
cv = "card%dValue" % i
|
cv = "card%dValue" % i
|
||||||
if cv not in d or d[cv] == None:
|
if cv not in d or d[cv] == None:
|
||||||
break
|
break
|
||||||
|
|
|
||||||
91
pyfpdb/DerivedStats.py
Normal file
91
pyfpdb/DerivedStats.py
Normal file
|
|
@ -0,0 +1,91 @@
|
||||||
|
#!/usr/bin/python
|
||||||
|
|
||||||
|
#Copyright 2008 Carl Gherardi
|
||||||
|
#This program is free software: you can redistribute it and/or modify
|
||||||
|
#it under the terms of the GNU Affero General Public License as published by
|
||||||
|
#the Free Software Foundation, version 3 of the License.
|
||||||
|
#
|
||||||
|
#This program is distributed in the hope that it will be useful,
|
||||||
|
#but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
#GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
#You should have received a copy of the GNU Affero General Public License
|
||||||
|
#along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#In the "official" distribution you can find the license in
|
||||||
|
#agpl-3.0.txt in the docs folder of the package.
|
||||||
|
|
||||||
|
class DerivedStats():
|
||||||
|
def __init__(self, hand):
|
||||||
|
self.hand = hand
|
||||||
|
|
||||||
|
self.activeSeats = 0
|
||||||
|
self.position = 0
|
||||||
|
self.tourneyTypeId = 0
|
||||||
|
|
||||||
|
self.HDs = 0
|
||||||
|
self.street0VPI = 0
|
||||||
|
self.street0Aggr = 0
|
||||||
|
self.street0_3B4BChance = 0
|
||||||
|
self.street0_3B4BDone = 0
|
||||||
|
|
||||||
|
self.street1Seen = 0
|
||||||
|
self.street2Seen = 0
|
||||||
|
self.street3Seen = 0
|
||||||
|
self.street4Seen = 0
|
||||||
|
self.sawShowdown = 0
|
||||||
|
|
||||||
|
self.street1Aggr = 0
|
||||||
|
self.street2Aggr = 0
|
||||||
|
self.street3Aggr = 0
|
||||||
|
self.street4Aggr = 0
|
||||||
|
|
||||||
|
self.otherRaisedStreet1 = 0
|
||||||
|
self.otherRaisedStreet2 = 0
|
||||||
|
self.otherRaisedStreet3 = 0
|
||||||
|
self.otherRaisedStreet4 = 0
|
||||||
|
self.foldToOtherRaisedStreet1 = 0
|
||||||
|
self.foldToOtherRaisedStreet2 = 0
|
||||||
|
self.foldToOtherRaisedStreet3 = 0
|
||||||
|
self.foldToOtherRaisedStreet4 = 0
|
||||||
|
self.wonWhenSeenStreet1 = 0
|
||||||
|
self.wonAtSD = 0
|
||||||
|
|
||||||
|
self.stealAttemptChance = 0
|
||||||
|
self.stealAttempted = 0
|
||||||
|
self.foldBbToStealChance = 0
|
||||||
|
self.foldedBbToSteal = 0
|
||||||
|
self.foldSbToStealChance = 0
|
||||||
|
self.foldedSbToSteal = 0
|
||||||
|
|
||||||
|
self.street1CBChance = 0
|
||||||
|
self.street1CBDone = 0
|
||||||
|
self.street2CBChance = 0
|
||||||
|
self.street2CBDone = 0
|
||||||
|
self.street3CBChance = 0
|
||||||
|
self.street3CBDone = 0
|
||||||
|
self.street4CBChance = 0
|
||||||
|
self.street4CBDone = 0
|
||||||
|
|
||||||
|
self.foldToStreet1CBChance = 0
|
||||||
|
self.foldToStreet1CBDone = 0
|
||||||
|
self.foldToStreet2CBChance = 0
|
||||||
|
self.foldToStreet2CBDone = 0
|
||||||
|
self.foldToStreet3CBChance = 0
|
||||||
|
self.foldToStreet3CBDone = 0
|
||||||
|
self.foldToStreet4CBChance = 0
|
||||||
|
self.foldToStreet4CBDone = 0
|
||||||
|
|
||||||
|
self.totalProfit = 0
|
||||||
|
|
||||||
|
self.street1CheckCallRaiseChance = 0
|
||||||
|
self.street1CheckCallRaiseDone = 0
|
||||||
|
self.street2CheckCallRaiseChance = 0
|
||||||
|
self.street2CheckCallRaiseDone = 0
|
||||||
|
self.street3CheckCallRaiseChance = 0
|
||||||
|
self.street3CheckCallRaiseDone = 0
|
||||||
|
self.street4CheckCallRaiseChance = 0
|
||||||
|
self.street4CheckCallRaiseDone = 0
|
||||||
|
|
||||||
|
def getStats():
|
||||||
|
pass
|
||||||
|
|
@ -2,18 +2,7 @@
|
||||||
|
|
||||||
<FreePokerToolsConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FreePokerToolsConfig.xsd">
|
<FreePokerToolsConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FreePokerToolsConfig.xsd">
|
||||||
<supported_sites>
|
<supported_sites>
|
||||||
<site enabled="True"
|
<site enabled="True" site_name="PokerStars" table_finder="PokerStars.exe" screen_name="DO NOT NEED THIS YET" site_path="~/.wine/drive_c/Program Files/PokerStars/" HH_path="~/.wine/drive_c/Program Files/PokerStars/HandHistory/abc/" decoder="pokerstars_decode_table" converter="passthrough" supported_games="holdem,razz,omahahi,omahahilo,studhi,studhilo">
|
||||||
site_name="PokerStars"
|
|
||||||
table_finder="PokerStars.exe"
|
|
||||||
screen_name="ENTER HERO NAME"
|
|
||||||
site_path=""
|
|
||||||
HH_path=""
|
|
||||||
decoder="pokerstars_decode_table"
|
|
||||||
converter="passthrough"
|
|
||||||
bgcolor="#000000"
|
|
||||||
fgcolor="#FFFFFF"
|
|
||||||
hudopacity="1.0"
|
|
||||||
supported_games="holdem,razz,omahahi,omahahilo,studhi,studhilo">
|
|
||||||
<layout max="8" width="792" height="546" fav_seat="0">
|
<layout max="8" width="792" height="546" fav_seat="0">
|
||||||
<location seat="1" x="684" y="61"> </location>
|
<location seat="1" x="684" y="61"> </location>
|
||||||
<location seat="2" x="689" y="239"> </location>
|
<location seat="2" x="689" y="239"> </location>
|
||||||
|
|
@ -60,18 +49,7 @@
|
||||||
<location seat="2" x="10" y="288"> </location>
|
<location seat="2" x="10" y="288"> </location>
|
||||||
</layout>
|
</layout>
|
||||||
</site>
|
</site>
|
||||||
<site enabled="True"
|
<site enabled="True" site_name="Full Tilt" table_finder="FullTiltPoker.exe" screen_name="DO NOT NEED THIS YET" site_path="~/.wine/drive_c/Program Files/Full Tilt Poker/" HH_path="~/.wine/drive_c/Program Files/Full Tilt Poker/HandHistory/abc/" decoder="fulltilt_decode_table" converter="passthrough" supported_games="holdem,razz,omahahi,omahahilo,studhi,studhilo">
|
||||||
site_name="Full Tilt Poker"
|
|
||||||
table_finder="FullTiltPoker.exe"
|
|
||||||
screen_name="ENTER HERO NAME"
|
|
||||||
site_path=""
|
|
||||||
HH_path=""
|
|
||||||
decoder="fulltilt_decode_table"
|
|
||||||
converter="passthrough"
|
|
||||||
bgcolor="#000000"
|
|
||||||
fgcolor="#FFFFFF"
|
|
||||||
hudopacity="1.0"
|
|
||||||
supported_games="holdem,razz,omahahi,omahahilo,studhi,studhilo">
|
|
||||||
<layout fav_seat="0" height="547" max="8" width="794">
|
<layout fav_seat="0" height="547" max="8" width="794">
|
||||||
<location seat="1" x="640" y="64"> </location>
|
<location seat="1" x="640" y="64"> </location>
|
||||||
<location seat="2" x="650" y="230"> </location>
|
<location seat="2" x="650" y="230"> </location>
|
||||||
|
|
@ -106,41 +84,39 @@
|
||||||
<location seat="9" x="70" y="53"> </location>
|
<location seat="9" x="70" y="53"> </location>
|
||||||
</layout>
|
</layout>
|
||||||
</site>
|
</site>
|
||||||
<site enabled="False"
|
<site enabled="False" site_name="Everleaf" table_finder="Everleaf.exe" screen_name="DO NOT NEED THIS YET" site_path="" HH_path="" decoder="everleaf_decode_table" converter="EverleafToFpdb" supported_games="holdem">
|
||||||
site_name="Everleaf"
|
<layout fav_seat="0" height="547" max="8" width="794">
|
||||||
table_finder="Poker.exe"
|
<location seat="1" x="640" y="64"> </location>
|
||||||
screen_name="ENTER HERO NAME"
|
<location seat="2" x="650" y="230"> </location>
|
||||||
site_path=""
|
<location seat="3" x="650" y="385"> </location>
|
||||||
HH_path=""
|
<location seat="4" x="588" y="425"> </location>
|
||||||
decoder="Unknown"
|
<location seat="5" x="92" y="425"> </location>
|
||||||
converter="EverleafToFpdb"
|
<location seat="6" x="0" y="373"> </location>
|
||||||
supported_games="holdem,razz,omahahi,omahahilo,studhi"
|
<location seat="7" x="0" y="223"> </location>
|
||||||
fgcolor="#48D1CC"
|
<location seat="8" x="25" y="50"> </location>
|
||||||
bgcolor="#000000"
|
|
||||||
opacity="0.75">
|
|
||||||
<layout fav_seat="0" height="546" max="6" width="792">
|
|
||||||
<location seat="1" x="581" y="109"> </location>
|
|
||||||
<location seat="2" x="605" y="287"> </location>
|
|
||||||
<location seat="3" x="544" y="423"> </location>
|
|
||||||
<location seat="4" x="80" y="393"> </location>
|
|
||||||
<location seat="5" x="5" y="284"> </location>
|
|
||||||
<location seat="6" x="38" y="108"> </location>
|
|
||||||
</layout>
|
</layout>
|
||||||
<layout fav_seat="0" height="546" max="10" width="792">
|
<layout fav_seat="0" height="547" max="6" width="794">
|
||||||
<location seat="1" x="473" y="78"> </location>
|
<location seat="1" x="640" y="58"> </location>
|
||||||
<location seat="2" x="650" y="93"> </location>
|
<location seat="2" x="654" y="288"> </location>
|
||||||
<location seat="3" x="670" y="219"> </location>
|
<location seat="3" x="615" y="424"> </location>
|
||||||
<location seat="4" x="633" y="358"> </location>
|
<location seat="4" x="70" y="421"> </location>
|
||||||
<location seat="5" x="437" y="393"> </location>
|
<location seat="5" x="0" y="280"> </location>
|
||||||
<location seat="6" x="249" y="396"> </location>
|
<location seat="6" x="70" y="58"> </location>
|
||||||
<location seat="7" x="42" y="357"> </location>
|
|
||||||
<location seat="8" x="8" y="218"> </location>
|
|
||||||
<location seat="9" x="35" y="89"> </location>
|
|
||||||
<location seat="10" x="217" y="78"> </location>
|
|
||||||
</layout>
|
</layout>
|
||||||
<layout fav_seat="0" height="546" max="2" width="792">
|
<layout fav_seat="0" height="547" max="2" width="794">
|
||||||
<location seat="1" x="651" y="288"> </location>
|
<location seat="1" x="651" y="288"> </location>
|
||||||
<location seat="2" x="10" y="288"> </location>
|
<location seat="2" x="10" y="288"> </location>
|
||||||
|
</layout>
|
||||||
|
<layout fav_seat="0" height="547" max="9" width="794">
|
||||||
|
<location seat="1" x="634" y="38"> </location>
|
||||||
|
<location seat="2" x="667" y="184"> </location>
|
||||||
|
<location seat="3" x="667" y="321"> </location>
|
||||||
|
<location seat="4" x="667" y="445"> </location>
|
||||||
|
<location seat="5" x="337" y="459"> </location>
|
||||||
|
<location seat="6" x="0" y="400"> </location>
|
||||||
|
<location seat="7" x="0" y="322"> </location>
|
||||||
|
<location seat="8" x="0" y="181"> </location>
|
||||||
|
<location seat="9" x="70" y="53"> </location>
|
||||||
</layout>
|
</layout>
|
||||||
</site>
|
</site>
|
||||||
</supported_sites>
|
</supported_sites>
|
||||||
|
|
@ -153,7 +129,7 @@
|
||||||
<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
|
<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
|
||||||
<stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
|
<stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
|
||||||
</game>
|
</game>
|
||||||
<game cols="3" db="fpdb" game_name="razz" rows="2" aux="stud_mucked">
|
<game cols="3" db="fpdb" game_name="razz" rows="2">
|
||||||
<stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
|
<stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
|
||||||
<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
|
<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
|
||||||
<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq_1" tip="tip1"> </stat>
|
<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq_1" tip="tip1"> </stat>
|
||||||
|
|
@ -177,7 +153,7 @@
|
||||||
<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
|
<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
|
||||||
<stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
|
<stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
|
||||||
</game>
|
</game>
|
||||||
<game cols="3" db="fpdb" game_name="studhi" rows="2" aux="stud_mucked">
|
<game cols="3" db="fpdb" game_name="studhi" rows="2">
|
||||||
<stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
|
<stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
|
||||||
<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
|
<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
|
||||||
<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq_1" tip="tip1"> </stat>
|
<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq_1" tip="tip1"> </stat>
|
||||||
|
|
@ -185,7 +161,7 @@
|
||||||
<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
|
<stat click="tog_decorate" col="1" popup="default" row="1" stat_name="wtsd" tip="tip1"> </stat>
|
||||||
<stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
|
<stat click="tog_decorate" col="2" popup="default" row="1" stat_name="wmsd" tip="tip1"> </stat>
|
||||||
</game>
|
</game>
|
||||||
<game cols="3" db="fpdb" game_name="studhilo" rows="2" aux="stud_mucked">
|
<game cols="3" db="fpdb" game_name="studhilo" rows="2">
|
||||||
<stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
|
<stat click="tog_decorate" col="0" popup="default" row="0" stat_name="vpip" tip="tip1"> </stat>
|
||||||
<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
|
<stat click="tog_decorate" col="1" popup="default" row="0" stat_name="pfr" tip="tip1"> </stat>
|
||||||
<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq_1" tip="tip1"> </stat>
|
<stat click="tog_decorate" col="2" popup="default" row="0" stat_name="ffreq_1" tip="tip1"> </stat>
|
||||||
|
|
@ -220,15 +196,15 @@
|
||||||
<pu_stat pu_stat_name="ffreq_4"> </pu_stat>
|
<pu_stat pu_stat_name="ffreq_4"> </pu_stat>
|
||||||
</pu>
|
</pu>
|
||||||
</popup_windows>
|
</popup_windows>
|
||||||
<import callFpdbHud = "True" interval = "10" hhArchiveBase="~/.fpdb/HandHistories/"></import>
|
<import callFpdbHud = "True" interval = "10" ></import>
|
||||||
<tv combinedStealFold = "True" combined2B3B = "True" combinedPostflop = "True"></tv>
|
<tv combinedStealFold = "True" combined2B3B = "True" combinedPostflop = "True"></tv>
|
||||||
|
|
||||||
<supported_databases>
|
<supported_databases>
|
||||||
<database db_name="fpdb" db_server="mysql" db_ip="localhost" db_user="fpdb" db_pass="YOUR MYSQL PASSWORD" db_type="fpdb"> </database>
|
<database db_name="fpdb" db_server="mysql" db_ip="localhost" db_user="fpdb" db_pass="YOUR MYSQL PASSWORD" db_type="fpdb"> </database>
|
||||||
</supported_databases>
|
</supported_databases>
|
||||||
<aux_windows>
|
<mucked_windows>
|
||||||
<aw card_ht="42" card_wd="30" class="Stud_mucked" cols="11" deck="Cards01.png" module="Mucked" name="stud_mucked" rows="8"> </aw>
|
<mw mw_name="stud1" format="stud" rows="8" cols="11" deck="Cards01.png" card_wd="30" card_ht="42"> </mw>
|
||||||
</aux_windows>
|
</mucked_windows>
|
||||||
</FreePokerToolsConfig>
|
</FreePokerToolsConfig>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
354
pyfpdb/Hand.py
354
pyfpdb/Hand.py
|
|
@ -27,11 +27,14 @@ import time
|
||||||
from copy import deepcopy
|
from copy import deepcopy
|
||||||
from Exceptions import *
|
from Exceptions import *
|
||||||
|
|
||||||
|
import DerivedStats
|
||||||
|
|
||||||
class Hand:
|
class Hand:
|
||||||
UPS = {'a':'A', 't':'T', 'j':'J', 'q':'Q', 'k':'K', 'S':'s', 'C':'c', 'H':'h', 'D':'d'}
|
UPS = {'a':'A', 't':'T', 'j':'J', 'q':'Q', 'k':'K', 'S':'s', 'C':'c', 'H':'h', 'D':'d'}
|
||||||
LCS = {'H':'h', 'D':'d', 'C':'c', 'S':'s'}
|
LCS = {'H':'h', 'D':'d', 'C':'c', 'S':'s'}
|
||||||
def __init__(self, sitename, gametype, handText):
|
def __init__(self, sitename, gametype, handText, builtFrom = "HHC"):
|
||||||
self.sitename = sitename
|
self.sitename = sitename
|
||||||
|
self.stats = DerivedStats.DerivedStats(self)
|
||||||
self.gametype = gametype
|
self.gametype = gametype
|
||||||
self.handText = handText
|
self.handText = handText
|
||||||
self.handid = 0
|
self.handid = 0
|
||||||
|
|
@ -58,9 +61,9 @@ class Hand:
|
||||||
self.actions[street] = []
|
self.actions[street] = []
|
||||||
self.board[street] = []
|
self.board[street] = []
|
||||||
|
|
||||||
|
|
||||||
# Collections indexed by player names
|
# Collections indexed by player names
|
||||||
self.holecards = {} # dict from player names to dicts by street ... of tuples ... of holecards
|
self.holecards = {} # dict from player names to dicts by street ... of tuples ... of holecards
|
||||||
|
self.discards = {} # dict from player names to dicts by street ... of tuples ... of discarded holecards
|
||||||
self.stacks = {}
|
self.stacks = {}
|
||||||
self.collected = [] #list of ?
|
self.collected = [] #list of ?
|
||||||
self.collectees = {} # dict from player names to amounts collected (?)
|
self.collectees = {} # dict from player names to amounts collected (?)
|
||||||
|
|
@ -77,6 +80,27 @@ class Hand:
|
||||||
self.rake = None
|
self.rake = None
|
||||||
|
|
||||||
|
|
||||||
|
def insert(self, db):
|
||||||
|
""" Function to insert Hand into database
|
||||||
|
Should not commit, and do minimal selects. Callers may want to cache commits
|
||||||
|
db: a connected fpdb_db object"""
|
||||||
|
# TODO:
|
||||||
|
# Players - base playerid and siteid tuple
|
||||||
|
# HudCache data to come from DerivedStats class
|
||||||
|
# HandsActions - all actions for all players for all streets - self.actions
|
||||||
|
# BoardCards - ?
|
||||||
|
# Hands - Summary information of hand indexed by handId - gameinfo
|
||||||
|
# HandsPlayers - ? ... Do we fix winnings?
|
||||||
|
# Tourneys ?
|
||||||
|
# TourneysPlayers
|
||||||
|
|
||||||
|
pass
|
||||||
|
|
||||||
|
def select(self, handId):
|
||||||
|
""" Function to create Hand object from database """
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
def addPlayer(self, seat, name, chips):
|
def addPlayer(self, seat, name, chips):
|
||||||
"""\
|
"""\
|
||||||
Adds a player to the hand, and initialises data structures indexed by player.
|
Adds a player to the hand, and initialises data structures indexed by player.
|
||||||
|
|
@ -89,10 +113,12 @@ If a player has None chips he won't be added."""
|
||||||
self.players.append([seat, name, chips])
|
self.players.append([seat, name, chips])
|
||||||
self.stacks[name] = Decimal(chips)
|
self.stacks[name] = Decimal(chips)
|
||||||
self.holecards[name] = []
|
self.holecards[name] = []
|
||||||
|
self.discards[name] = []
|
||||||
self.pot.addPlayer(name)
|
self.pot.addPlayer(name)
|
||||||
for street in self.streetList:
|
for street in self.streetList:
|
||||||
self.bets[street][name] = []
|
self.bets[street][name] = []
|
||||||
self.holecards[name] = {} # dict from street names.
|
self.holecards[name] = {} # dict from street names.
|
||||||
|
self.discards[name] = {} # dict from street names.
|
||||||
|
|
||||||
|
|
||||||
def addStreets(self, match):
|
def addStreets(self, match):
|
||||||
|
|
@ -137,8 +163,8 @@ If a player has None chips he won't be added."""
|
||||||
# - this is a bet of 1 sb, as yet uncalled.
|
# - this is a bet of 1 sb, as yet uncalled.
|
||||||
# Player in the big blind posts
|
# Player in the big blind posts
|
||||||
# - this is a call of 1 sb and a raise to 1 bb
|
# - this is a call of 1 sb and a raise to 1 bb
|
||||||
#
|
#
|
||||||
|
|
||||||
logging.debug("addBlind: %s posts %s, %s" % (player, blindtype, amount))
|
logging.debug("addBlind: %s posts %s, %s" % (player, blindtype, amount))
|
||||||
if player is not None:
|
if player is not None:
|
||||||
self.bets['PREFLOP'][player].append(Decimal(amount))
|
self.bets['PREFLOP'][player].append(Decimal(amount))
|
||||||
|
|
@ -148,11 +174,11 @@ If a player has None chips he won't be added."""
|
||||||
self.actions['BLINDSANTES'].append(act)
|
self.actions['BLINDSANTES'].append(act)
|
||||||
self.pot.addMoney(player, Decimal(amount))
|
self.pot.addMoney(player, Decimal(amount))
|
||||||
if blindtype == 'big blind':
|
if blindtype == 'big blind':
|
||||||
self.lastBet['PREFLOP'] = Decimal(amount)
|
self.lastBet['PREFLOP'] = Decimal(amount)
|
||||||
elif blindtype == 'both':
|
elif blindtype == 'both':
|
||||||
# extra small blind is 'dead'
|
# extra small blind is 'dead'
|
||||||
self.lastBet['PREFLOP'] = Decimal(self.bb)
|
self.lastBet['PREFLOP'] = Decimal(self.bb)
|
||||||
self.posted = self.posted + [[player,blindtype]]
|
self.posted = self.posted + [[player,blindtype]]
|
||||||
#print "DEBUG: self.posted: %s" %(self.posted)
|
#print "DEBUG: self.posted: %s" %(self.posted)
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -245,6 +271,12 @@ Add a raise on [street] by [player] to [amountTo]
|
||||||
self.actions[street].append(act)
|
self.actions[street].append(act)
|
||||||
self.lastBet[street] = Decimal(amount)
|
self.lastBet[street] = Decimal(amount)
|
||||||
self.pot.addMoney(player, Decimal(amount))
|
self.pot.addMoney(player, Decimal(amount))
|
||||||
|
|
||||||
|
|
||||||
|
def addStandsPat(self, street, player):
|
||||||
|
self.checkPlayerExists(player)
|
||||||
|
act = (player, 'stands pat')
|
||||||
|
self.actions[street].append(act)
|
||||||
|
|
||||||
|
|
||||||
def addFold(self, street, player):
|
def addFold(self, street, player):
|
||||||
|
|
@ -296,14 +328,14 @@ Map the tuple self.gametype onto the pokerstars string describing it
|
||||||
# currently it appears to be something like ["ring", "hold", "nl", sb, bb]:
|
# currently it appears to be something like ["ring", "hold", "nl", sb, bb]:
|
||||||
gs = {"holdem" : "Hold'em",
|
gs = {"holdem" : "Hold'em",
|
||||||
"omahahi" : "Omaha",
|
"omahahi" : "Omaha",
|
||||||
"omahahilo" : "FIXME",
|
"omahahilo" : "Omaha Hi/Lo",
|
||||||
"razz" : "Razz",
|
"razz" : "Razz",
|
||||||
"studhi" : "7 Card Stud",
|
"studhi" : "7 Card Stud",
|
||||||
"studhilo" : "FIXME",
|
"studhilo" : "FIXME",
|
||||||
"fivedraw" : "5 Card Draw",
|
"fivedraw" : "5 Card Draw",
|
||||||
"27_1draw" : "FIXME",
|
"27_1draw" : "FIXME",
|
||||||
"27_3draw" : "Triple Draw 2-7 Lowball",
|
"27_3draw" : "Triple Draw 2-7 Lowball",
|
||||||
"badugi" : "FIXME"
|
"badugi" : "Badugi"
|
||||||
}
|
}
|
||||||
ls = {"nl" : "No Limit",
|
ls = {"nl" : "No Limit",
|
||||||
"pl" : "Pot Limit",
|
"pl" : "Pot Limit",
|
||||||
|
|
@ -339,49 +371,58 @@ Map the tuple self.gametype onto the pokerstars string describing it
|
||||||
print >>fh, _("%s: completes to $%s%s" %(act[0], act[2], ' and is all-in' if act[3] else ''))
|
print >>fh, _("%s: completes to $%s%s" %(act[0], act[2], ' and is all-in' if act[3] else ''))
|
||||||
elif act[1] == 'posts':
|
elif act[1] == 'posts':
|
||||||
if(act[2] == "small blind"):
|
if(act[2] == "small blind"):
|
||||||
print >>fh, _("%s: posts small blind $%s" %(act[0], act[3]))
|
print >>fh, _("%s: posts small blind $%s%s" %(act[0], act[3], ' and is all-in' if act[4] else ''))
|
||||||
elif(act[2] == "big blind"):
|
elif(act[2] == "big blind"):
|
||||||
print >>fh, _("%s: posts big blind $%s" %(act[0], act[3]))
|
print >>fh, _("%s: posts big blind $%s%s" %(act[0], act[3], ' and is all-in' if act[4] else ''))
|
||||||
elif(act[2] == "both"):
|
elif(act[2] == "both"):
|
||||||
print >>fh, _("%s: posts small & big blinds $%s" %(act[0], act[3]))
|
print >>fh, _("%s: posts small & big blinds $%s%s" %(act[0], act[3], ' and is all-in' if act[4] else ''))
|
||||||
elif act[1] == 'bringin':
|
elif act[1] == 'bringin':
|
||||||
print >>fh, _("%s: brings in for $%s%s" %(act[0], act[2], ' and is all-in' if act[3] else ''))
|
print >>fh, _("%s: brings in for $%s%s" %(act[0], act[2], ' and is all-in' if act[3] else ''))
|
||||||
|
elif act[1] == 'discards':
|
||||||
|
print >>fh, _("%s: discards %s %s%s" %(act[0], act[2], 'card' if act[2] == 1 else 'cards' , " [" + " ".join(self.discards[act[0]]['DRAWONE']) + "]" if self.hero == act[0] else ''))
|
||||||
|
elif act[1] == 'stands pat':
|
||||||
|
print >>fh, _("%s: stands pat" %(act[0]))
|
||||||
|
|
||||||
|
|
||||||
class HoldemOmahaHand(Hand):
|
class HoldemOmahaHand(Hand):
|
||||||
def __init__(self, hhc, sitename, gametype, handText):
|
def __init__(self, hhc, sitename, gametype, handText, builtFrom = "HHC"):
|
||||||
if gametype['base'] != 'hold':
|
if gametype['base'] != 'hold':
|
||||||
pass # or indeed don't pass and complain instead
|
pass # or indeed don't pass and complain instead
|
||||||
logging.debug("HoldemOmahaHand")
|
logging.debug("HoldemOmahaHand")
|
||||||
self.streetList = ['BLINDSANTES', 'PREFLOP','FLOP','TURN','RIVER'] # a list of the observed street names in order
|
self.streetList = ['BLINDSANTES', 'DEAL', 'PREFLOP','FLOP','TURN','RIVER'] # a list of the observed street names in order
|
||||||
self.communityStreets = ['FLOP', 'TURN', 'RIVER']
|
self.communityStreets = ['FLOP', 'TURN', 'RIVER']
|
||||||
self.actionStreets = ['PREFLOP','FLOP','TURN','RIVER']
|
self.actionStreets = ['PREFLOP','FLOP','TURN','RIVER']
|
||||||
Hand.__init__(self, sitename, gametype, handText)
|
Hand.__init__(self, sitename, gametype, handText, builtFrom = "HHC")
|
||||||
self.sb = gametype['sb']
|
self.sb = gametype['sb']
|
||||||
self.bb = gametype['bb']
|
self.bb = gametype['bb']
|
||||||
|
|
||||||
#Populate a HoldemOmahaHand
|
#Populate a HoldemOmahaHand
|
||||||
#Generally, we call 'read' methods here, which get the info according to the particular filter (hhc)
|
#Generally, we call 'read' methods here, which get the info according to the particular filter (hhc)
|
||||||
# which then invokes a 'addXXX' callback
|
# which then invokes a 'addXXX' callback
|
||||||
hhc.readHandInfo(self)
|
if builtFrom == "HHC":
|
||||||
hhc.readPlayerStacks(self)
|
hhc.readHandInfo(self)
|
||||||
hhc.compilePlayerRegexs(self)
|
hhc.readPlayerStacks(self)
|
||||||
hhc.markStreets(self)
|
hhc.compilePlayerRegexs(self)
|
||||||
hhc.readBlinds(self)
|
hhc.markStreets(self)
|
||||||
hhc.readButton(self)
|
hhc.readBlinds(self)
|
||||||
hhc.readHeroCards(self)
|
hhc.readButton(self)
|
||||||
hhc.readShowdownActions(self)
|
hhc.readHeroCards(self)
|
||||||
# Read actions in street order
|
hhc.readShowdownActions(self)
|
||||||
for street in self.communityStreets:
|
# Read actions in street order
|
||||||
if self.streets[street]:
|
for street in self.communityStreets:
|
||||||
hhc.readCommunityCards(self, street)
|
if self.streets[street]:
|
||||||
for street in self.actionStreets:
|
hhc.readCommunityCards(self, street)
|
||||||
if self.streets[street]:
|
for street in self.actionStreets:
|
||||||
hhc.readAction(self, street)
|
if self.streets[street]:
|
||||||
hhc.readCollectPot(self)
|
hhc.readAction(self, street)
|
||||||
hhc.readShownCards(self)
|
hhc.readCollectPot(self)
|
||||||
self.totalPot() # finalise it (total the pot)
|
hhc.readShownCards(self)
|
||||||
hhc.getRake(self)
|
self.totalPot() # finalise it (total the pot)
|
||||||
|
hhc.getRake(self)
|
||||||
|
elif builtFrom == "DB":
|
||||||
|
self.select("dummy") # Will need a handId
|
||||||
|
|
||||||
def addHoleCards(self, cards, player):
|
def addHoleCards(self, cards, player, shown=False):
|
||||||
"""\
|
"""\
|
||||||
Assigns observed holecards to a player.
|
Assigns observed holecards to a player.
|
||||||
cards list of card bigrams e.g. ['2h','Jc']
|
cards list of card bigrams e.g. ['2h','Jc']
|
||||||
|
|
@ -391,6 +432,8 @@ player (string) name of player
|
||||||
try:
|
try:
|
||||||
self.checkPlayerExists(player)
|
self.checkPlayerExists(player)
|
||||||
cardset = set(self.card(c) for c in cards)
|
cardset = set(self.card(c) for c in cards)
|
||||||
|
if shown and len(cardset) > 0:
|
||||||
|
self.shown.add(player)
|
||||||
if 'PREFLOP' in self.holecards[player]:
|
if 'PREFLOP' in self.holecards[player]:
|
||||||
self.holecards[player]['PREFLOP'].update(cardset)
|
self.holecards[player]['PREFLOP'].update(cardset)
|
||||||
else:
|
else:
|
||||||
|
|
@ -410,12 +453,12 @@ Card ranks will be uppercased
|
||||||
elif holeandboard is not None:
|
elif holeandboard is not None:
|
||||||
holeandboard = set([self.card(c) for c in holeandboard])
|
holeandboard = set([self.card(c) for c in holeandboard])
|
||||||
board = set([c for s in self.board.values() for c in s])
|
board = set([c for s in self.board.values() for c in s])
|
||||||
self.addHoleCards(holeandboard.difference(board),player)
|
self.addHoleCards(holeandboard.difference(board),player,shown=True)
|
||||||
|
|
||||||
|
|
||||||
def writeHand(self, fh=sys.__stdout__):
|
def writeHand(self, fh=sys.__stdout__):
|
||||||
# PokerStars format.
|
# PokerStars format.
|
||||||
print >>fh, _("%s Game #%s: %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, time.strftime('%Y/%m/%d - %H:%M:%S (ET)', self.starttime)))
|
print >>fh, _("%s Game #%s: %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, time.strftime('%Y/%m/%d - %H:%M:%S ET', self.starttime)))
|
||||||
print >>fh, _("Table '%s' %d-max Seat #%s is the button" %(self.tablename, self.maxseats, self.buttonpos))
|
print >>fh, _("Table '%s' %d-max Seat #%s is the button" %(self.tablename, self.maxseats, self.buttonpos))
|
||||||
|
|
||||||
players_who_act_preflop = set(([x[0] for x in self.actions['PREFLOP']]+[x[0] for x in self.actions['BLINDSANTES']]))
|
players_who_act_preflop = set(([x[0] for x in self.actions['PREFLOP']]+[x[0] for x in self.actions['BLINDSANTES']]))
|
||||||
|
|
@ -458,10 +501,11 @@ Card ranks will be uppercased
|
||||||
#Some sites don't have a showdown section so we have to figure out if there should be one
|
#Some sites don't have a showdown section so we have to figure out if there should be one
|
||||||
# The logic for a showdown is: at the end of river action there are at least two players in the hand
|
# The logic for a showdown is: at the end of river action there are at least two players in the hand
|
||||||
# we probably don't need a showdown section in pseudo stars format for our filtering purposes
|
# we probably don't need a showdown section in pseudo stars format for our filtering purposes
|
||||||
if 'SHOWDOWN' in self.actions:
|
if self.shown:
|
||||||
print >>fh, _("*** SHOW DOWN ***")
|
print >>fh, _("*** SHOW DOWN ***")
|
||||||
#TODO: Complete SHOWDOWN
|
for name in self.shown:
|
||||||
|
print >>fh, _("%s shows [%s] (a hand...)" % (name, " ".join(self.holecards[name]['PREFLOP'])))
|
||||||
|
|
||||||
# Current PS format has the lines:
|
# Current PS format has the lines:
|
||||||
# Uncalled bet ($111.25) returned to s0rrow
|
# Uncalled bet ($111.25) returned to s0rrow
|
||||||
# s0rrow collected $5.15 from side pot
|
# s0rrow collected $5.15 from side pot
|
||||||
|
|
@ -490,32 +534,201 @@ Card ranks will be uppercased
|
||||||
print >>fh, _("Seat %d: %s showed [%s] and won ($%s)" % (seatnum, name, " ".join(self.holecards[name]['PREFLOP']), self.collectees[name]))
|
print >>fh, _("Seat %d: %s showed [%s] and won ($%s)" % (seatnum, name, " ".join(self.holecards[name]['PREFLOP']), self.collectees[name]))
|
||||||
elif name in self.collectees:
|
elif name in self.collectees:
|
||||||
print >>fh, _("Seat %d: %s collected ($%s)" % (seatnum, name, self.collectees[name]))
|
print >>fh, _("Seat %d: %s collected ($%s)" % (seatnum, name, self.collectees[name]))
|
||||||
elif name in self.shown:
|
#~ elif name in self.shown:
|
||||||
print >>fh, _("Seat %d: %s showed [%s]" % (seatnum, name, " ".join(self.holecards[name]['PREFLOP'])))
|
#~ print >>fh, _("Seat %d: %s showed [%s]" % (seatnum, name, " ".join(self.holecards[name]['PREFLOP'])))
|
||||||
elif name in self.folded:
|
elif name in self.folded:
|
||||||
print >>fh, _("Seat %d: %s folded" % (seatnum, name))
|
print >>fh, _("Seat %d: %s folded" % (seatnum, name))
|
||||||
else:
|
else:
|
||||||
print >>fh, _("Seat %d: %s mucked" % (seatnum, name))
|
if name in self.shown:
|
||||||
|
print >>fh, _("Seat %d: %s showed [%s] and lost with..." % (seatnum, name, " ".join(self.holecards[name]['PREFLOP'])))
|
||||||
|
else:
|
||||||
|
print >>fh, _("Seat %d: %s mucked" % (seatnum, name))
|
||||||
|
|
||||||
print >>fh, "\n\n"
|
print >>fh, "\n\n"
|
||||||
|
|
||||||
class DrawHand(Hand):
|
class DrawHand(Hand):
|
||||||
def __init__(self, hhc, sitename, gametype, handText):
|
def __init__(self, hhc, sitename, gametype, handText, builtFrom = "HHC"):
|
||||||
if gametype['base'] != 'draw':
|
if gametype['base'] != 'draw':
|
||||||
pass # or indeed don't pass and complain instead
|
pass # or indeed don't pass and complain instead
|
||||||
|
self.streetList = ['BLINDSANTES', 'DEAL', 'DRAWONE', 'DRAWTWO', 'DRAWTHREE']
|
||||||
def discardHoleCards(self, cards, player):
|
self.holeStreets = ['DEAL', 'DRAWONE', 'DRAWTWO', 'DRAWTHREE']
|
||||||
|
self.actionStreets = ['PREDEAL', 'DEAL', 'DRAWONE', 'DRAWTWO', 'DRAWTHREE']
|
||||||
|
Hand.__init__(self, sitename, gametype, handText)
|
||||||
|
self.sb = gametype['sb']
|
||||||
|
self.bb = gametype['bb']
|
||||||
|
# Populate the draw hand.
|
||||||
|
if builtFrom == "HHC":
|
||||||
|
hhc.readHandInfo(self)
|
||||||
|
hhc.readPlayerStacks(self)
|
||||||
|
hhc.compilePlayerRegexs(self)
|
||||||
|
hhc.markStreets(self)
|
||||||
|
hhc.readBlinds(self)
|
||||||
|
hhc.readButton(self)
|
||||||
|
hhc.readShowdownActions(self)
|
||||||
|
# Read actions in street order
|
||||||
|
for street in self.streetList:
|
||||||
|
if self.streets[street]:
|
||||||
|
# hhc.readCommunityCards(self, street)
|
||||||
|
hhc.readDrawCards(self, street)
|
||||||
|
hhc.readAction(self, street)
|
||||||
|
hhc.readCollectPot(self)
|
||||||
|
hhc.readShownCards(self)
|
||||||
|
self.totalPot() # finalise it (total the pot)
|
||||||
|
hhc.getRake(self)
|
||||||
|
elif builtFrom == "DB":
|
||||||
|
self.select("dummy") # Will need a handId
|
||||||
|
|
||||||
|
# Draw games (at least Badugi has blinds - override default Holdem addBlind
|
||||||
|
def addBlind(self, player, blindtype, amount):
|
||||||
|
# if player is None, it's a missing small blind.
|
||||||
|
# The situation we need to cover are:
|
||||||
|
# Player in small blind posts
|
||||||
|
# - this is a bet of 1 sb, as yet uncalled.
|
||||||
|
# Player in the big blind posts
|
||||||
|
# - this is a call of 1 sb and a raise to 1 bb
|
||||||
|
#
|
||||||
|
|
||||||
|
logging.debug("addBlind: %s posts %s, %s" % (player, blindtype, amount))
|
||||||
|
if player is not None:
|
||||||
|
self.bets['DEAL'][player].append(Decimal(amount))
|
||||||
|
self.stacks[player] -= Decimal(amount)
|
||||||
|
#print "DEBUG %s posts, stack %s" % (player, self.stacks[player])
|
||||||
|
act = (player, 'posts', blindtype, amount, self.stacks[player]==0)
|
||||||
|
self.actions['BLINDSANTES'].append(act)
|
||||||
|
self.pot.addMoney(player, Decimal(amount))
|
||||||
|
if blindtype == 'big blind':
|
||||||
|
self.lastBet['DEAL'] = Decimal(amount)
|
||||||
|
elif blindtype == 'both':
|
||||||
|
# extra small blind is 'dead'
|
||||||
|
self.lastBet['DEAL'] = Decimal(self.bb)
|
||||||
|
self.posted = self.posted + [[player,blindtype]]
|
||||||
|
#print "DEBUG: self.posted: %s" %(self.posted)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
def addDrawHoleCards(self, newcards, oldcards, player, street, shown=False):
|
||||||
|
"""\
|
||||||
|
Assigns observed holecards to a player.
|
||||||
|
cards list of card bigrams e.g. ['2h','Jc']
|
||||||
|
player (string) name of player
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
self.checkPlayerExists(player)
|
self.checkPlayerExists(player)
|
||||||
for card in cards:
|
# if shown and len(cardset) > 0:
|
||||||
self.holecards[player].remove(card)
|
# self.shown.add(player)
|
||||||
|
self.holecards[player][street] = (newcards,oldcards)
|
||||||
except FpdbParseError, e:
|
except FpdbParseError, e:
|
||||||
pass
|
print "[ERROR] Tried to add holecards for unknown player: %s" % (player,)
|
||||||
except ValueError:
|
|
||||||
print "[ERROR] discardHoleCard tried to discard a card %s didn't have" % (player,)
|
|
||||||
|
def discardDrawHoleCards(self, cards, player, street):
|
||||||
|
logging.debug("discardDrawHoleCards '%s' '%s' '%s'" % (cards, player, street))
|
||||||
|
self.discards[player][street] = set([cards])
|
||||||
|
|
||||||
|
|
||||||
|
def addDiscard(self, street, player, num, cards):
|
||||||
|
self.checkPlayerExists(player)
|
||||||
|
if cards:
|
||||||
|
act = (player, 'discards', num, cards)
|
||||||
|
self.discardDrawHoleCards(cards, player, street)
|
||||||
|
else:
|
||||||
|
act = (player, 'discards', num)
|
||||||
|
self.actions[street].append(act)
|
||||||
|
|
||||||
|
|
||||||
|
def addShownCards(self, cards, player, holeandboard=None):
|
||||||
|
"""\
|
||||||
|
For when a player shows cards for any reason (for showdown or out of choice).
|
||||||
|
Card ranks will be uppercased
|
||||||
|
"""
|
||||||
|
logging.debug("addShownCards %s hole=%s all=%s" % (player, cards, holeandboard))
|
||||||
|
# if cards is not None:
|
||||||
|
# self.shown.add(player)
|
||||||
|
# self.addHoleCards(cards,player)
|
||||||
|
# elif holeandboard is not None:
|
||||||
|
# holeandboard = set([self.card(c) for c in holeandboard])
|
||||||
|
# board = set([c for s in self.board.values() for c in s])
|
||||||
|
# self.addHoleCards(holeandboard.difference(board),player,shown=True)
|
||||||
|
|
||||||
|
|
||||||
|
def writeHand(self, fh=sys.__stdout__):
|
||||||
|
# PokerStars format.
|
||||||
|
print >>fh, _("%s Game #%s: %s ($%s/$%s) - %s" %("PokerStars", self.handid, self.getGameTypeAsString(), self.sb, self.bb, time.strftime('%Y/%m/%d %H:%M:%S ET', self.starttime)))
|
||||||
|
print >>fh, _("Table '%s' %d-max Seat #%s is the button" %(self.tablename, self.maxseats, self.buttonpos))
|
||||||
|
|
||||||
|
players_who_act_ondeal = set(([x[0] for x in self.actions['DEAL']]+[x[0] for x in self.actions['BLINDSANTES']]))
|
||||||
|
|
||||||
|
for player in [x for x in self.players if x[1] in players_who_act_ondeal]:
|
||||||
|
#Only print stacks of players who do something on deal
|
||||||
|
print >>fh, _("Seat %s: %s ($%s in chips) " %(player[0], player[1], player[2]))
|
||||||
|
|
||||||
|
if 'BLINDSANTES' in self.actions:
|
||||||
|
for act in self.actions['BLINDSANTES']:
|
||||||
|
print >>fh, _("%s: %s %s $%s" %(act[0], act[1], act[2], act[3]))
|
||||||
|
|
||||||
|
if 'DEAL' in self.actions:
|
||||||
|
print >>fh, _("*** DEALING HANDS ***")
|
||||||
|
for player in [x[1] for x in self.players if x[1] in players_who_act_ondeal]:
|
||||||
|
if 'DEAL' in self.holecards[player]:
|
||||||
|
(nc,oc) = self.holecards[player]['DEAL']
|
||||||
|
print >>fh, _("Dealt to %s: [%s]") % (player, " ".join(nc))
|
||||||
|
for act in self.actions['DEAL']:
|
||||||
|
self.printActionLine(act, fh)
|
||||||
|
|
||||||
|
if 'DRAWONE' in self.actions:
|
||||||
|
print >>fh, _("*** FIRST DRAW ***")
|
||||||
|
for act in self.actions['DRAWONE']:
|
||||||
|
self.printActionLine(act, fh)
|
||||||
|
if act[0] == self.hero and act[1] == 'discards':
|
||||||
|
(nc,oc) = self.holecards[act[0]]['DRAWONE']
|
||||||
|
dc = self.discards[act[0]]['DRAWONE']
|
||||||
|
kc = oc - dc
|
||||||
|
print >>fh, _("Dealt to %s [%s] [%s]" % (act[0], " ".join(kc), " ".join(nc)))
|
||||||
|
|
||||||
|
if 'DRAWTWO' in self.actions:
|
||||||
|
print >>fh, _("*** SECOND DRAW ***")
|
||||||
|
for act in self.actions['DRAWTWO']:
|
||||||
|
self.printActionLine(act, fh)
|
||||||
|
if act[0] == self.hero and act[1] == 'discards':
|
||||||
|
(nc,oc) = self.holecards[act[0]]['DRAWTWO']
|
||||||
|
dc = self.discards[act[0]]['DRAWTWO']
|
||||||
|
kc = oc - dc
|
||||||
|
print >>fh, _("Dealt to %s [%s] [%s]" % (act[0], " ".join(kc), " ".join(nc)))
|
||||||
|
|
||||||
|
if 'DRAWTHREE' in self.actions:
|
||||||
|
print >>fh, _("*** THIRD DRAW ***")
|
||||||
|
for act in self.actions['DRAWTHREE']:
|
||||||
|
self.printActionLine(act, fh)
|
||||||
|
if act[0] == self.hero and act[1] == 'discards':
|
||||||
|
(nc,oc) = self.holecards[act[0]]['DRAWTHREE']
|
||||||
|
dc = self.discards[act[0]]['DRAWTHREE']
|
||||||
|
kc = oc - dc
|
||||||
|
print >>fh, _("Dealt to %s [%s] [%s]" % (act[0], " ".join(kc), " ".join(nc)))
|
||||||
|
|
||||||
|
if 'SHOWDOWN' in self.actions:
|
||||||
|
print >>fh, _("*** SHOW DOWN ***")
|
||||||
|
#TODO: Complete SHOWDOWN
|
||||||
|
|
||||||
|
# Current PS format has the lines:
|
||||||
|
# Uncalled bet ($111.25) returned to s0rrow
|
||||||
|
# s0rrow collected $5.15 from side pot
|
||||||
|
# stervels: shows [Ks Qs] (two pair, Kings and Queens)
|
||||||
|
# stervels collected $45.35 from main pot
|
||||||
|
# Immediately before the summary.
|
||||||
|
# The current importer uses those lines for importing winning rather than the summary
|
||||||
|
for name in self.pot.returned:
|
||||||
|
print >>fh, _("Uncalled bet ($%s) returned to %s" %(self.pot.returned[name],name))
|
||||||
|
for entry in self.collected:
|
||||||
|
print >>fh, _("%s collected $%s from x pot" %(entry[0], entry[1]))
|
||||||
|
|
||||||
|
print >>fh, _("*** SUMMARY ***")
|
||||||
|
print >>fh, "%s | Rake $%.2f" % (self.pot, self.rake)
|
||||||
|
print >>fh, "\n\n"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class StudHand(Hand):
|
class StudHand(Hand):
|
||||||
def __init__(self, hhc, sitename, gametype, handText):
|
def __init__(self, hhc, sitename, gametype, handText, builtFrom = "HHC"):
|
||||||
if gametype['base'] != 'stud':
|
if gametype['base'] != 'stud':
|
||||||
pass # or indeed don't pass and complain instead
|
pass # or indeed don't pass and complain instead
|
||||||
self.streetList = ['ANTES','THIRD','FOURTH','FIFTH','SIXTH','SEVENTH'] # a list of the observed street names in order
|
self.streetList = ['ANTES','THIRD','FOURTH','FIFTH','SIXTH','SEVENTH'] # a list of the observed street names in order
|
||||||
|
|
@ -526,24 +739,27 @@ class StudHand(Hand):
|
||||||
#Populate the StudHand
|
#Populate the StudHand
|
||||||
#Generally, we call a 'read' method here, which gets the info according to the particular filter (hhc)
|
#Generally, we call a 'read' method here, which gets the info according to the particular filter (hhc)
|
||||||
# which then invokes a 'addXXX' callback
|
# which then invokes a 'addXXX' callback
|
||||||
hhc.readHandInfo(self)
|
if builtFrom == "HHC":
|
||||||
hhc.readPlayerStacks(self)
|
hhc.readHandInfo(self)
|
||||||
hhc.compilePlayerRegexs(self)
|
hhc.readPlayerStacks(self)
|
||||||
hhc.markStreets(self)
|
hhc.compilePlayerRegexs(self)
|
||||||
hhc.readAntes(self)
|
hhc.markStreets(self)
|
||||||
hhc.readBringIn(self)
|
hhc.readAntes(self)
|
||||||
# hhc.readShowdownActions(self) # not done yet
|
hhc.readBringIn(self)
|
||||||
# Read actions in street order
|
#hhc.readShowdownActions(self) # not done yet
|
||||||
for street in self.streetList:
|
# Read actions in street order
|
||||||
if self.streets[street]:
|
for street in self.streetList:
|
||||||
logging.debug(street)
|
if self.streets[street]:
|
||||||
logging.debug(self.streets[street])
|
logging.debug(street)
|
||||||
hhc.readStudPlayerCards(self, street)
|
logging.debug(self.streets[street])
|
||||||
hhc.readAction(self, street)
|
hhc.readStudPlayerCards(self, street)
|
||||||
hhc.readCollectPot(self)
|
hhc.readAction(self, street)
|
||||||
# hhc.readShownCards(self) # not done yet
|
hhc.readCollectPot(self)
|
||||||
self.totalPot() # finalise it (total the pot)
|
#hhc.readShownCards(self) # not done yet
|
||||||
hhc.getRake(self)
|
self.totalPot() # finalise it (total the pot)
|
||||||
|
hhc.getRake(self)
|
||||||
|
elif builtFrom == "DB":
|
||||||
|
self.select("dummy") # Will need a handId
|
||||||
|
|
||||||
def addPlayerCards(self, player, street, open=[], closed=[]):
|
def addPlayerCards(self, player, street, open=[], closed=[]):
|
||||||
"""\
|
"""\
|
||||||
|
|
|
||||||
|
|
@ -204,12 +204,17 @@ Tail the in_path file and yield handTexts separated by re_SplitHands"""
|
||||||
def processHand(self, handText):
|
def processHand(self, handText):
|
||||||
gametype = self.determineGameType(handText)
|
gametype = self.determineGameType(handText)
|
||||||
logging.debug("gametype %s" % gametype)
|
logging.debug("gametype %s" % gametype)
|
||||||
|
if gametype is None:
|
||||||
# See if gametype is supported.
|
l = None
|
||||||
type = gametype['type']
|
gametype = "unmatched"
|
||||||
base = gametype['base']
|
# TODO: not ideal, just trying to not error.
|
||||||
limit = gametype['limitType']
|
# TODO: Need to count failed hands.
|
||||||
l = [type] + [base] + [limit]
|
else:
|
||||||
|
# See if gametype is supported.
|
||||||
|
type = gametype['type']
|
||||||
|
base = gametype['base']
|
||||||
|
limit = gametype['limitType']
|
||||||
|
l = [type] + [base] + [limit]
|
||||||
hand = None
|
hand = None
|
||||||
if l in self.readSupportedGames():
|
if l in self.readSupportedGames():
|
||||||
hand = None
|
hand = None
|
||||||
|
|
|
||||||
|
|
@ -44,12 +44,11 @@ import Stats
|
||||||
import Mucked
|
import Mucked
|
||||||
import Database
|
import Database
|
||||||
import HUD_main
|
import HUD_main
|
||||||
import Utils
|
|
||||||
|
|
||||||
def importName(module_name, name, params):
|
def importName(module_name, name):
|
||||||
"""Import a named object 'name' from module 'module_name'."""
|
"""Import a named object 'name' from module 'module_name'."""
|
||||||
# Recipe 16.3 in the Python Cookbook, 2nd ed. Thanks!!!!
|
# Recipe 16.3 in the Python Cookbook, 2nd ed. Thanks!!!!
|
||||||
# Modded by Carl G to support additional params
|
|
||||||
try:
|
try:
|
||||||
module = __import__(module_name, globals(), locals(), [name])
|
module = __import__(module_name, globals(), locals(), [name])
|
||||||
except:
|
except:
|
||||||
|
|
@ -220,8 +219,9 @@ class Hud:
|
||||||
self.config.save()
|
self.config.save()
|
||||||
|
|
||||||
def adj_seats(self, hand, config):
|
def adj_seats(self, hand, config):
|
||||||
|
|
||||||
adj = xrange(0, self.max + 1) # default seat adjustments = no adjustment
|
# Need range here, not xrange -> need the actual list
|
||||||
|
adj = range(0, self.max + 1) # default seat adjustments = no adjustment
|
||||||
# does the user have a fav_seat?
|
# does the user have a fav_seat?
|
||||||
try:
|
try:
|
||||||
sys.stderr.write("site = %s, max = %d, fav seat = %d\n" % (self.table.site, self.max, config.supported_sites[self.table.site].layout[self.max].fav_seat))
|
sys.stderr.write("site = %s, max = %d, fav seat = %d\n" % (self.table.site, self.max, config.supported_sites[self.table.site].layout[self.max].fav_seat))
|
||||||
|
|
|
||||||
|
|
@ -215,7 +215,7 @@ class Stud_cards:
|
||||||
self.config = config
|
self.config = config
|
||||||
# self.db_name = db_name
|
# self.db_name = db_name
|
||||||
|
|
||||||
self.card_images = self.get_card_images()
|
self.card_images = self.parent.get_card_images()
|
||||||
self.seen_cards = {}
|
self.seen_cards = {}
|
||||||
self.grid_contents = {}
|
self.grid_contents = {}
|
||||||
self.eb = {}
|
self.eb = {}
|
||||||
|
|
@ -280,7 +280,7 @@ class Stud_cards:
|
||||||
(4, cards[8:10]), (5, cards[10:12]), (6, cards[12:14])):
|
(4, cards[8:10]), (5, cards[10:12]), (6, cards[12:14])):
|
||||||
if not i[1] == "xx":
|
if not i[1] == "xx":
|
||||||
self.seen_cards[(i[0], c - 1)]. \
|
self.seen_cards[(i[0], c - 1)]. \
|
||||||
set_from_pixbuf(self.card_images[self.split_cards(i[1])])
|
set_from_pixbuf(self.card_images[self.parent.split_cards(i[1])])
|
||||||
## action in tool tips for 3rd street cards
|
## action in tool tips for 3rd street cards
|
||||||
for c in (0, 1, 2):
|
for c in (0, 1, 2):
|
||||||
for r in range(0, self.rows):
|
for r in range(0, self.rows):
|
||||||
|
|
|
||||||
|
|
@ -23,53 +23,10 @@ from HandHistoryConverter import *
|
||||||
|
|
||||||
# PokerStars HH Format
|
# PokerStars HH Format
|
||||||
|
|
||||||
#PokerStars Game #20461877044: Hold'em No Limit ($1/$2) - 2008/09/16 18:58:01 ET
|
|
||||||
#Table 'Gianfar IV' 6-max Seat #1 is the button
|
|
||||||
#Seat 1: ZeKGB ($224 in chips)
|
|
||||||
#Seat 2: quimboavida ($107.75 in chips)
|
|
||||||
#Seat 3: tropical100 ($190 in chips)
|
|
||||||
#Seat 4: jackhama33 ($54.95 in chips)
|
|
||||||
#Seat 5: Olubanu ($196 in chips)
|
|
||||||
#Seat 6: LSgambler ($205.35 in chips)
|
|
||||||
#quimboavida: posts small blind $1
|
|
||||||
#tropical100: posts big blind $2
|
|
||||||
#*** HOLE CARDS ***
|
|
||||||
#jackhama33: folds
|
|
||||||
#Olubanu: folds
|
|
||||||
#LSgambler: folds
|
|
||||||
#ZeKGB: folds
|
|
||||||
#quimboavida: calls $1
|
|
||||||
#tropical100: raises $5 to $7
|
|
||||||
#quimboavida: calls $5
|
|
||||||
#*** FLOP *** [3d Qs Kd]
|
|
||||||
#quimboavida: bets $10
|
|
||||||
#tropical100: calls $10
|
|
||||||
#*** TURN *** [3d Qs Kd] [Ah]
|
|
||||||
#quimboavida: checks
|
|
||||||
#tropical100: checks
|
|
||||||
#*** RIVER *** [3d Qs Kd Ah] [7c]
|
|
||||||
#quimboavida: bets $30
|
|
||||||
#tropical100: folds
|
|
||||||
#quimboavida collected $32.35 from pot
|
|
||||||
#*** SUMMARY ***
|
|
||||||
#Total pot $34 | Rake $1.65
|
|
||||||
#Board [3d Qs Kd Ah 7c]
|
|
||||||
#Seat 1: ZeKGB (button) folded before Flop (didn't bet)
|
|
||||||
#Seat 2: quimboavida (small blind) collected ($32.35)
|
|
||||||
#Seat 3: tropical100 (big blind) folded on the River
|
|
||||||
#Seat 4: jackhama33 folded before Flop (didn't bet)
|
|
||||||
#Seat 5: Olubanu folded before Flop (didn't bet)
|
|
||||||
#Seat 6: LSgambler folded before Flop (didn't bet)
|
|
||||||
|
|
||||||
|
|
||||||
#PokerStars Game #25381215423: HORSE (Razz Limit, $0.10/$0.20) - 2009/02/26 15:20:19 ET
|
|
||||||
#Table 'Natalie V' 8-max
|
|
||||||
|
|
||||||
|
|
||||||
class PokerStars(HandHistoryConverter):
|
class PokerStars(HandHistoryConverter):
|
||||||
|
|
||||||
# Static regexes
|
# Static regexes
|
||||||
re_GameInfo = re.compile('PokerStars Game #(?P<HID>[0-9]+):\s+(HORSE)? \(?(?P<GAME>Hold\'em|Razz|7 Card Stud|Omaha Hi/Lo) (?P<LIMIT>No Limit|Limit|Pot Limit),? \(?(?P<CURRENCY>\$|)?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)\) - (?P<DATETIME>.*$)', re.MULTILINE)
|
re_GameInfo = re.compile("PokerStars Game #(?P<HID>[0-9]+):\s+(HORSE)? \(?(?P<GAME>Hold\'em|Razz|7 Card Stud|Omaha Hi/Lo|Badugi) (?P<LIMIT>No Limit|Limit|Pot Limit),? \(?(?P<CURRENCY>\$|)?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)\) - (?P<DATETIME>.*$)", re.MULTILINE)
|
||||||
re_SplitHands = re.compile('\n\n+')
|
re_SplitHands = re.compile('\n\n+')
|
||||||
re_HandInfo = re.compile("^Table \'(?P<TABLE>[- a-zA-Z]+)\'(?P<TABLEATTRIBUTES>.+?$)?", re.MULTILINE)
|
re_HandInfo = re.compile("^Table \'(?P<TABLE>[- a-zA-Z]+)\'(?P<TABLEATTRIBUTES>.+?$)?", re.MULTILINE)
|
||||||
re_Button = re.compile('Seat #(?P<BUTTON>\d+) is the button', re.MULTILINE)
|
re_Button = re.compile('Seat #(?P<BUTTON>\d+) is the button', re.MULTILINE)
|
||||||
|
|
@ -89,7 +46,7 @@ follow : whether to tail -f the input"""
|
||||||
if autostart:
|
if autostart:
|
||||||
self.start()
|
self.start()
|
||||||
|
|
||||||
|
|
||||||
def compilePlayerRegexs(self, hand):
|
def compilePlayerRegexs(self, hand):
|
||||||
players = set([player[1] for player in hand.players])
|
players = set([player[1] for player in hand.players])
|
||||||
if not players <= self.compiledPlayers: # x <= y means 'x is subset of y'
|
if not players <= self.compiledPlayers: # x <= y means 'x is subset of y'
|
||||||
|
|
@ -103,7 +60,7 @@ follow : whether to tail -f the input"""
|
||||||
self.re_BringIn = re.compile(r"^%s: brings[- ]in( low|) for \$?(?P<BRINGIN>[.0-9]+)" % player_re, re.MULTILINE)
|
self.re_BringIn = re.compile(r"^%s: brings[- ]in( low|) for \$?(?P<BRINGIN>[.0-9]+)" % player_re, re.MULTILINE)
|
||||||
self.re_PostBoth = re.compile(r"^%s: posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)" % player_re, re.MULTILINE)
|
self.re_PostBoth = re.compile(r"^%s: posts small \& big blinds \[\$? (?P<SBBB>[.0-9]+)" % player_re, re.MULTILINE)
|
||||||
self.re_HeroCards = re.compile(r"^Dealt to %s(?: \[(?P<OLDCARDS>.+?)\])?( \[(?P<NEWCARDS>.+?)\])" % player_re, re.MULTILINE)
|
self.re_HeroCards = re.compile(r"^Dealt to %s(?: \[(?P<OLDCARDS>.+?)\])?( \[(?P<NEWCARDS>.+?)\])" % player_re, re.MULTILINE)
|
||||||
self.re_Action = re.compile(r"^%s:(?P<ATYPE> bets| checks| raises| calls| folds)( \$(?P<BET>[.\d]+))?( to \$(?P<BETTO>[.\d]+))?" % player_re, re.MULTILINE)
|
self.re_Action = re.compile(r"^%s:(?P<ATYPE> bets| checks| raises| calls| folds| discards| stands pat)( \$(?P<BET>[.\d]+))?( to \$(?P<BETTO>[.\d]+))?( (?P<NODISCARDED>\d) cards?( \[(?P<DISCARDED>.+?)\])?)?" % player_re, re.MULTILINE)
|
||||||
self.re_ShowdownAction = re.compile(r"^%s: shows \[(?P<CARDS>.*)\]" % player_re, re.MULTILINE)
|
self.re_ShowdownAction = re.compile(r"^%s: shows \[(?P<CARDS>.*)\]" % player_re, re.MULTILINE)
|
||||||
self.re_CollectPot = re.compile(r"Seat (?P<SEAT>[0-9]+): %s (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P<POT>[.\d]+)\)(, mucked| with.*|)" % player_re, re.MULTILINE)
|
self.re_CollectPot = re.compile(r"Seat (?P<SEAT>[0-9]+): %s (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P<POT>[.\d]+)\)(, mucked| with.*|)" % player_re, re.MULTILINE)
|
||||||
self.re_sitsOut = re.compile("^%s sits out" % player_re, re.MULTILINE)
|
self.re_sitsOut = re.compile("^%s sits out" % player_re, re.MULTILINE)
|
||||||
|
|
@ -111,7 +68,13 @@ follow : whether to tail -f the input"""
|
||||||
|
|
||||||
|
|
||||||
def readSupportedGames(self):
|
def readSupportedGames(self):
|
||||||
return []
|
return [["ring", "hold", "nl"],
|
||||||
|
["ring", "hold", "pl"],
|
||||||
|
["ring", "hold", "fl"],
|
||||||
|
["ring", "stud", "fl"],
|
||||||
|
["ring", "draw", "fl"],
|
||||||
|
["ring", "omaha", "pl"]
|
||||||
|
]
|
||||||
|
|
||||||
def determineGameType(self, handText):
|
def determineGameType(self, handText):
|
||||||
info = {'type':'ring'}
|
info = {'type':'ring'}
|
||||||
|
|
@ -129,7 +92,8 @@ follow : whether to tail -f the input"""
|
||||||
'Omaha Hi' : ('hold','omahahi'),
|
'Omaha Hi' : ('hold','omahahi'),
|
||||||
'Omaha Hi/Lo' : ('hold','omahahilo'),
|
'Omaha Hi/Lo' : ('hold','omahahilo'),
|
||||||
'Razz' : ('stud','razz'),
|
'Razz' : ('stud','razz'),
|
||||||
'7 Card Stud' : ('stud','studhi')
|
'7 Card Stud' : ('stud','studhi'),
|
||||||
|
'Badugi' : ('draw','badugi')
|
||||||
}
|
}
|
||||||
currencies = { u'€':'EUR', '$':'USD', '':'T$' }
|
currencies = { u'€':'EUR', '$':'USD', '':'T$' }
|
||||||
if 'LIMIT' in mg:
|
if 'LIMIT' in mg:
|
||||||
|
|
@ -150,7 +114,12 @@ follow : whether to tail -f the input"""
|
||||||
def readHandInfo(self, hand):
|
def readHandInfo(self, hand):
|
||||||
info = {}
|
info = {}
|
||||||
m = self.re_HandInfo.search(hand.handText,re.DOTALL)
|
m = self.re_HandInfo.search(hand.handText,re.DOTALL)
|
||||||
if m: info.update(m.groupdict())
|
if m:
|
||||||
|
info.update(m.groupdict())
|
||||||
|
# TODO: Be less lazy and parse maxseats from the HandInfo regex
|
||||||
|
if m.group('TABLEATTRIBUTES'):
|
||||||
|
m2 = re.search("\s*(\d+)-max", m.group('TABLEATTRIBUTES'))
|
||||||
|
hand.maxseats = int(m2.group(1))
|
||||||
m = self.re_GameInfo.search(hand.handText)
|
m = self.re_GameInfo.search(hand.handText)
|
||||||
if m: info.update(m.groupdict())
|
if m: info.update(m.groupdict())
|
||||||
m = self.re_Button.search(hand.handText)
|
m = self.re_Button.search(hand.handText)
|
||||||
|
|
@ -199,6 +168,12 @@ follow : whether to tail -f the input"""
|
||||||
r"(\*\*\* 5th STREET \*\*\*(?P<FIFTH>.+(?=\*\*\* 6th STREET \*\*\*)|.+))?"
|
r"(\*\*\* 5th STREET \*\*\*(?P<FIFTH>.+(?=\*\*\* 6th STREET \*\*\*)|.+))?"
|
||||||
r"(\*\*\* 6th STREET \*\*\*(?P<SIXTH>.+(?=\*\*\* RIVER \*\*\*)|.+))?"
|
r"(\*\*\* 6th STREET \*\*\*(?P<SIXTH>.+(?=\*\*\* RIVER \*\*\*)|.+))?"
|
||||||
r"(\*\*\* RIVER \*\*\*(?P<SEVENTH>.+))?", hand.handText,re.DOTALL)
|
r"(\*\*\* RIVER \*\*\*(?P<SEVENTH>.+))?", hand.handText,re.DOTALL)
|
||||||
|
elif hand.gametype['base'] in ("draw"):
|
||||||
|
m = re.search(r"(?P<PREDEAL>.+(?=\*\*\* DEALING HANDS \*\*\*)|.+)"
|
||||||
|
r"(\*\*\* DEALING HANDS \*\*\*(?P<DEAL>.+(?=\*\*\* FIRST DRAW \*\*\*)|.+))?"
|
||||||
|
r"(\*\*\* FIRST DRAW \*\*\*(?P<DRAWONE>.+(?=\*\*\* SECOND DRAW \*\*\*)|.+))?"
|
||||||
|
r"(\*\*\* SECOND DRAW \*\*\*(?P<DRAWTWO>.+(?=\*\*\* THIRD DRAW \*\*\*)|.+))?"
|
||||||
|
r"(\*\*\* THIRD DRAW \*\*\*(?P<DRAWTHREE>.+))?", hand.handText,re.DOTALL)
|
||||||
hand.addStreets(m)
|
hand.addStreets(m)
|
||||||
|
|
||||||
def readCommunityCards(self, hand, street): # street has been matched by markStreets, so exists in this hand
|
def readCommunityCards(self, hand, street): # street has been matched by markStreets, so exists in this hand
|
||||||
|
|
@ -244,6 +219,27 @@ follow : whether to tail -f the input"""
|
||||||
cards = set(cards.split(' '))
|
cards = set(cards.split(' '))
|
||||||
hand.addHoleCards(cards, m.group('PNAME'))
|
hand.addHoleCards(cards, m.group('PNAME'))
|
||||||
|
|
||||||
|
def readDrawCards(self, hand, street):
|
||||||
|
logging.debug("readDrawCards")
|
||||||
|
m = self.re_HeroCards.finditer(hand.streets[street])
|
||||||
|
if m == None:
|
||||||
|
hand.involved = False
|
||||||
|
else:
|
||||||
|
for player in m:
|
||||||
|
hand.hero = player.group('PNAME') # Only really need to do this once
|
||||||
|
newcards = player.group('NEWCARDS')
|
||||||
|
oldcards = player.group('OLDCARDS')
|
||||||
|
if newcards == None:
|
||||||
|
newcards = set()
|
||||||
|
else:
|
||||||
|
newcards = set(newcards.split(' '))
|
||||||
|
if oldcards == None:
|
||||||
|
oldcards = set()
|
||||||
|
else:
|
||||||
|
oldcards = set(oldcards.split(' '))
|
||||||
|
hand.addDrawHoleCards(newcards, oldcards, player.group('PNAME'), street)
|
||||||
|
|
||||||
|
|
||||||
def readStudPlayerCards(self, hand, street):
|
def readStudPlayerCards(self, hand, street):
|
||||||
# See comments of reference implementation in FullTiltToFpdb.py
|
# See comments of reference implementation in FullTiltToFpdb.py
|
||||||
logging.debug("readStudPlayerCards")
|
logging.debug("readStudPlayerCards")
|
||||||
|
|
@ -292,8 +288,12 @@ follow : whether to tail -f the input"""
|
||||||
hand.addFold( street, action.group('PNAME'))
|
hand.addFold( street, action.group('PNAME'))
|
||||||
elif action.group('ATYPE') == ' checks':
|
elif action.group('ATYPE') == ' checks':
|
||||||
hand.addCheck( street, action.group('PNAME'))
|
hand.addCheck( street, action.group('PNAME'))
|
||||||
|
elif action.group('ATYPE') == ' discards':
|
||||||
|
hand.addDiscard(street, action.group('PNAME'), action.group('NODISCARDED'), action.group('DISCARDED'))
|
||||||
|
elif action.group('ATYPE') == ' stands pat':
|
||||||
|
hand.addStandsPat( street, action.group('PNAME'))
|
||||||
else:
|
else:
|
||||||
print "DEBUG: unimplemented readAction: %s %s" %(action.group('PNAME'),action.group('ATYPE'),)
|
print "DEBUG: unimplemented readAction: '%s' '%s'" %(action.group('PNAME'),action.group('ATYPE'),)
|
||||||
|
|
||||||
|
|
||||||
def readShowdownActions(self, hand):
|
def readShowdownActions(self, hand):
|
||||||
|
|
|
||||||
|
|
@ -2,12 +2,14 @@
|
||||||
import FulltiltToFpdb
|
import FulltiltToFpdb
|
||||||
import py
|
import py
|
||||||
|
|
||||||
|
# regression-test-files/fulltilt/nlhe/NLHE-6max-1.txt
|
||||||
|
# Sorrowful: start: $8.85 end: $14.70 total: $5.85
|
||||||
|
|
||||||
def checkGameInfo(hhc, header, info):
|
def checkGameInfo(hhc, header, info):
|
||||||
assert hhc.determineGameType(header) == info
|
assert hhc.determineGameType(header) == info
|
||||||
|
|
||||||
def testGameInfo():
|
def testGameInfo():
|
||||||
hhc = FulltiltToFpdb.FullTilt(autostart=False)
|
hhc = FulltiltToFpdb.Fulltilt(autostart=False)
|
||||||
pairs = (
|
pairs = (
|
||||||
("Full Tilt Poker Game #10777181585: Table Deerfly (deep 6) - $0.01/$0.02 - Pot Limit Omaha Hi - 2:24:44 ET - 2009/02/22",
|
("Full Tilt Poker Game #10777181585: Table Deerfly (deep 6) - $0.01/$0.02 - Pot Limit Omaha Hi - 2:24:44 ET - 2009/02/22",
|
||||||
{'type':'ring', 'base':'hold', 'category':'omahahi', 'limitType':'pl', 'sb':'0.01', 'bb':'0.02', 'currency':'USD'}),
|
{'type':'ring', 'base':'hold', 'category':'omahahi', 'limitType':'pl', 'sb':'0.01', 'bb':'0.02', 'currency':'USD'}),
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,21 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
import PokerStarsToFpdb
|
import PokerStarsToFpdb
|
||||||
|
from Hand import *
|
||||||
import py
|
import py
|
||||||
|
|
||||||
|
#regression-test-files/stars/badugi/ring-fl-badugi.txt
|
||||||
|
# s0rrow: start $30.00 end: $22.65 total: ($7.35)
|
||||||
|
|
||||||
|
gametype = {'type':'ring', 'base':'draw', 'category':'badugi', 'limitType':'fl', 'sb':'0.25', 'bb':'0.50','currency':'USD'}
|
||||||
|
text = ""
|
||||||
|
|
||||||
|
hhc = PokerStarsToFpdb.PokerStars(autostart=False)
|
||||||
|
|
||||||
|
h = HoldemOmahaHand(None, "ASite", gametype, text, builtFrom = "Test")
|
||||||
|
h.addPlayer("1", "s0rrow", "100000")
|
||||||
|
|
||||||
|
hhc.compilePlayerRegexs(h)
|
||||||
|
|
||||||
|
|
||||||
def checkGameInfo(hhc, header, info):
|
def checkGameInfo(hhc, header, info):
|
||||||
assert hhc.determineGameType(header) == info
|
assert hhc.determineGameType(header) == info
|
||||||
|
|
@ -13,7 +27,10 @@ def testGameInfo():
|
||||||
{'type':'ring', 'base':"hold", 'category':'holdem', 'limitType':'nl', 'sb':'1', 'bb':'2', 'currency':'USD'}),
|
{'type':'ring', 'base':"hold", 'category':'holdem', 'limitType':'nl', 'sb':'1', 'bb':'2', 'currency':'USD'}),
|
||||||
|
|
||||||
(u"PokerStars Game #5999635897: HORSE (Omaha Hi/Lo Limit, $2/$4) - 2006/08/21 - 13:59:19 (ET)",
|
(u"PokerStars Game #5999635897: HORSE (Omaha Hi/Lo Limit, $2/$4) - 2006/08/21 - 13:59:19 (ET)",
|
||||||
{'type':'ring', 'base':'hold', 'category':'omahahilo', 'limitType':'fl', 'sb':'2', 'bb':'4','currency':'USD'})
|
{'type':'ring', 'base':'hold', 'category':'omahahilo', 'limitType':'fl', 'sb':'2', 'bb':'4','currency':'USD'}),
|
||||||
|
|
||||||
|
(u"PokerStars Game #25923772706: Badugi Limit ($0.25/$0.50) - 2009/03/13 16:40:58 ET",
|
||||||
|
{'type':'ring', 'base':'draw', 'category':'badugi', 'limitType':'fl', 'sb':'0.25', 'bb':'0.50','currency':'USD'})
|
||||||
)
|
)
|
||||||
for (header, info) in pairs:
|
for (header, info) in pairs:
|
||||||
yield checkGameInfo, hhc, header, info
|
yield checkGameInfo, hhc, header, info
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user