From 89bb8e3d69a6af7b57772e34fb57c037f1f63f30 Mon Sep 17 00:00:00 2001 From: Matt Turnbull Date: Wed, 11 Mar 2009 18:40:17 +0000 Subject: [PATCH] stars stud sometimes says 'brings-in', 'brings in', 'brings in low' fewer negative rakes appearing. --- pyfpdb/EverleafToFpdb.py | 2 +- pyfpdb/Hand.py | 18 ++++++++++++------ pyfpdb/PokerStarsToFpdb.py | 16 ++++++++-------- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py index feff7175..18466edc 100755 --- a/pyfpdb/EverleafToFpdb.py +++ b/pyfpdb/EverleafToFpdb.py @@ -264,7 +264,7 @@ or None if we fail to get the info """ elif action.group('ATYPE') == ' checks': hand.addCheck( street, action.group('PNAME')) elif action.group('ATYPE') == ' complete to': - hand.addCallandRaise( street, action.group('PNAME'), action.group('BET')) + hand.addComplete( street, action.group('PNAME'), action.group('BET')) else: logging.debug("Unimplemented readAction: %s %s" %(action.group('PNAME'),action.group('ATYPE'),)) diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index 6f06572d..f77b9425 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -124,6 +124,7 @@ If a player has None chips he won't be added.""" return c def addAnte(self, player, ante): + logging.debug("%s %s antes %s" % ('ANTES', player, ante)) if player is not None: self.bets['ANTES'][player].append(Decimal(ante)) self.stacks[player] -= Decimal(ante) @@ -160,6 +161,7 @@ If a player has None chips he won't be added.""" def addCall(self, street, player=None, amount=None): + logging.debug("%s %s calls %s" %(street, player, amount)) # Potentially calculate the amount of the call if not supplied # corner cases include if player would be all in if amount is not None: @@ -193,10 +195,11 @@ Add a raise by amountBy on [street] by [player] C = Bp - Bc Rt = Bp + Rb - self.bets[street][player].append(C + Rb) - self.stacks[player] -= (C + Rb) - self.actions[street] += [(player, 'raises', Rb, Rt, C, self.stacks[player]==0)] - self.lastBet[street] = Rt + self._addRaise(street, player, C, Rb, Rt) + #~ self.bets[street][player].append(C + Rb) + #~ self.stacks[player] -= (C + Rb) + #~ self.actions[street] += [(player, 'raises', Rb, Rt, C, self.stacks[player]==0)] + #~ self.lastBet[street] = Rt def addCallandRaise(self, street, player, amount): """\ @@ -225,6 +228,7 @@ Add a raise on [street] by [player] to [amountTo] self._addRaise(street, player, C, Rb, Rt) def _addRaise(self, street, player, C, Rb, Rt): + logging.debug("%s %s raise %s" %(street, player, Rt)) self.bets[street][player].append(C + Rb) self.stacks[player] -= (C + Rb) act = (player, 'raises', Rb, Rt, C, self.stacks[player]==0) @@ -235,6 +239,7 @@ Add a raise on [street] by [player] to [amountTo] def addBet(self, street, player, amount): + logging.debug("%s %s bets %s" %(street, player, amount)) self.checkPlayerExists(player) self.bets[street][player].append(Decimal(amount)) self.stacks[player] -= Decimal(amount) @@ -246,7 +251,7 @@ Add a raise on [street] by [player] to [amountTo] def addFold(self, street, player): - #print "DEBUG: %s %s folded" % (street, player) + logging.debug("%s %s folds" % (street, player)) self.checkPlayerExists(player) self.folded.add(player) self.pot.addFold(player) @@ -260,7 +265,7 @@ Add a raise on [street] by [player] to [amountTo] def addCollectPot(self,player, pot): - #print "DEBUG: %s collected %s" % (player, pot) + logging.debug("%s collected %s" % (player, pot)) self.checkPlayerExists(player) self.collected = self.collected + [[player, pot]] if player not in self.collectees: @@ -607,6 +612,7 @@ closed likewise, but known only to player """\ Add a complete on [street] by [player] to [amountTo] """ + logging.debug("%s %s completes %s" % (street, player, amountTo)) self.checkPlayerExists(player) Bp = self.lastBet['THIRD'] Bc = reduce(operator.add, self.bets[street][player], 0) diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py index b437e4ce..05027121 100755 --- a/pyfpdb/PokerStarsToFpdb.py +++ b/pyfpdb/PokerStarsToFpdb.py @@ -100,12 +100,12 @@ follow : whether to tail -f the input""" self.re_PostSB = re.compile(r"^%s: posts small blind \$?(?P[.0-9]+)" % player_re, re.MULTILINE) self.re_PostBB = re.compile(r"^%s: posts big blind \$?(?P[.0-9]+)" % player_re, re.MULTILINE) self.re_Antes = re.compile(r"^%s: posts the ante \$?(?P[.0-9]+)" % player_re, re.MULTILINE) - self.re_BringIn = re.compile(r"^%s: brings-in low for \$?(?P[.0-9]+)" % player_re, re.MULTILINE) + self.re_BringIn = re.compile(r"^%s: brings[- ]in( low|) for \$?(?P[.0-9]+)" % player_re, re.MULTILINE) self.re_PostBoth = re.compile(r"^%s: posts small \& big blinds \[\$? (?P[.0-9]+)" % player_re, re.MULTILINE) self.re_HeroCards = re.compile(r"^Dealt to %s(?: \[(?P.+?)\])?( \[(?P.+?)\])" % player_re, re.MULTILINE) - self.re_Action = re.compile(r"^%s:(?P bets| checks| raises| calls| folds)( \$(?P[.\d]+))?" % player_re, re.MULTILINE) + self.re_Action = re.compile(r"^%s:(?P bets| checks| raises| calls| folds)( \$(?P[.\d]+))?( to \$(?P[.\d]+))?" % player_re, re.MULTILINE) self.re_ShowdownAction = re.compile(r"^%s: shows \[(?P.*)\]" % player_re, re.MULTILINE) - self.re_CollectPot = re.compile(r"Seat (?P[0-9]+): %s (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P[.\d]+)\)(, mucked| with.*)" % player_re, re.MULTILINE) + self.re_CollectPot = re.compile(r"Seat (?P[0-9]+): %s (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P[.\d]+)\)(, mucked| with.*|)" % player_re, re.MULTILINE) self.re_sitsOut = re.compile("^%s sits out" % player_re, re.MULTILINE) self.re_ShownCards = re.compile("^Seat (?P[0-9]+): %s \(.*\) showed \[(?P.*)\].*" % player_re, re.MULTILINE) @@ -197,8 +197,8 @@ follow : whether to tail -f the input""" r"(\*\*\* 3rd STREET \*\*\*(?P.+(?=\*\*\* 4th STREET \*\*\*)|.+))?" r"(\*\*\* 4th STREET \*\*\*(?P.+(?=\*\*\* 5th STREET \*\*\*)|.+))?" r"(\*\*\* 5th STREET \*\*\*(?P.+(?=\*\*\* 6th STREET \*\*\*)|.+))?" - r"(\*\*\* 6th STREET \*\*\*(?P.+(?=\*\*\* 7th STREET \*\*\*)|.+))?" - r"(\*\*\* 7th STREET \*\*\*(?P.+))?", hand.handText,re.DOTALL) + r"(\*\*\* 6th STREET \*\*\*(?P.+(?=\*\*\* RIVER \*\*\*)|.+))?" + r"(\*\*\* RIVER \*\*\*(?P.+))?", hand.handText,re.DOTALL) hand.addStreets(m) def readCommunityCards(self, hand, street): # street has been matched by markStreets, so exists in this hand @@ -211,13 +211,13 @@ follow : whether to tail -f the input""" logging.debug("reading antes") m = self.re_Antes.finditer(hand.handText) for player in m: - logging.debug("hand.addAnte(%s,%s)" %(player.group('PNAME'), player.group('ANTE'))) + #~ logging.debug("hand.addAnte(%s,%s)" %(player.group('PNAME'), player.group('ANTE'))) hand.addAnte(player.group('PNAME'), player.group('ANTE')) def readBringIn(self, hand): m = self.re_BringIn.search(hand.handText,re.DOTALL) if m: - logging.debug("readBringIn: %s for %s" %(m.group('PNAME'), m.group('BRINGIN'))) + #~ logging.debug("readBringIn: %s for %s" %(m.group('PNAME'), m.group('BRINGIN'))) hand.addBringIn(m.group('PNAME'), m.group('BRINGIN')) def readBlinds(self, hand): @@ -249,7 +249,7 @@ follow : whether to tail -f the input""" logging.debug("readStudPlayerCards") m = self.re_HeroCards.finditer(hand.streets[street]) for player in m: - logging.debug(player.groupdict()) + #~ logging.debug(player.groupdict()) (pname, oldcards, newcards) = (player.group('PNAME'), player.group('OLDCARDS'), player.group('NEWCARDS')) if oldcards: oldcards = [c.strip() for c in oldcards.split(' ')]