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

Everest: More updates.

Browse Source 
Now have a graph with bumps in it
This commit is contained in:
Worros 2011-02-09 16:47:35 +08:00
parent e29a12a0c4
commit a553f0c220
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pyfpdb/EverestToFpdb.py
View File

@ -63,9 +63,9 @@ class Everest(HandHistoryConverter):
#re_Antes = ??? #re_Antes = ???
#re_BringIn = ??? #re_BringIn = ???
re_HeroCards = re.compile(r'<cards type="HOLE" cards="(?P<CARDS>.+)" player="(?P<PSEAT>[0-9])"', re.MULTILINE) re_HeroCards = re.compile(r'<cards type="HOLE" cards="(?P<CARDS>.+)" player="(?P<PSEAT>[0-9])"', re.MULTILINE)
re_Action = re.compile(r'<event sequence="[0-9]+" type="(?P<ATYPE>FOLD|CHECK|CALL|BET|RAISE|ALL_IN|SIT_OUT)" (?P<TIMESTAMP>timestamp="[0-9]+" )?player="(?P<PSEAT>[0-9])"( amount="(?P<BET>[.0-9]+)")?/>', re.MULTILINE) re_Action = re.compile(r'<(?P<ATYPE>FOLD|BET) position="(?P<PSEAT>[0-9])"( amount="(?P<BET>[.0-9]+)")?\/>', re.MULTILINE)
re_ShowdownAction = re.compile(r'<cards type="SHOWN" cards="(?P<CARDS>..,..)" player="(?P<PSEAT>[0-9])"/>', re.MULTILINE) re_ShowdownAction = re.compile(r'<cards type="SHOWN" cards="(?P<CARDS>..,..)" player="(?P<PSEAT>[0-9])"/>', re.MULTILINE)
re_CollectPot = re.compile(r'<winner amount="(?P<POT>[.0-9]+)" uncalled="(true|false)" potnumber="[0-9]+" player="(?P<PSEAT>[0-9])"', re.MULTILINE) re_CollectPot = re.compile(r'<WIN position="(?P<PSEAT>[0-9])" amount="(?P<POT>[.0-9]+)" pot="[0-9]+"', re.MULTILINE)
re_SitsOut = re.compile(r'<event sequence="[0-9]+" type="SIT_OUT" player="(?P<PSEAT>[0-9])"/>', re.MULTILINE) re_SitsOut = re.compile(r'<event sequence="[0-9]+" type="SIT_OUT" player="(?P<PSEAT>[0-9])"/>', re.MULTILINE)
re_ShownCards = re.compile(r'<cards type="(SHOWN|MUCKED)" cards="(?P<CARDS>..,..)" player="(?P<PSEAT>[0-9])"/>', re.MULTILINE) re_ShownCards = re.compile(r'<cards type="(SHOWN|MUCKED)" cards="(?P<CARDS>..,..)" player="(?P<PSEAT>[0-9])"/>', re.MULTILINE)
@ -200,25 +200,34 @@ class Everest(HandHistoryConverter):
mucked=False, dealt=True) mucked=False, dealt=True)
def readAction(self, hand, street): def readAction(self, hand, street):
logging.debug("readAction (%s)" % street) print "DEBUG: readAction (%s)" % street
m = self.re_Action.finditer(hand.streets[street]) m = self.re_Action.finditer(hand.streets[street])
curr_pot = Decimal('0')
for action in m: for action in m:
logging.debug("%s %s" % (action.group('ATYPE'), print " DEBUG: %s %s" % (action.group('ATYPE'), action.groupdict())
action.groupdict()))
player = self.playerNameFromSeatNo(action.group('PSEAT'), hand) player = self.playerNameFromSeatNo(action.group('PSEAT'), hand)
if action.group('ATYPE') == 'RAISE': if action.group('ATYPE') == 'BET':
hand.addCallandRaise(street, player, action.group('BET')) #Gah! BET can mean check, bet, call or raise...
elif action.group('ATYPE') == 'CALL': if Decimal(action.group('BET')) > 0 and curr_pot == 0:
hand.addCall(street, player, action.group('BET')) # Open
elif action.group('ATYPE') == 'BET': curr_pot = Decimal(action.group('BET'))
hand.addBet(street, player, action.group('BET'))
elif Decimal(action.group('BET')) > 0 and curr_pot > 0:
# Raise or call
if Decimal(action.group('BET')) > curr_pot:
# Raise
curr_pot = Decimal(action.group('BET'))
hand.addCallandRaise(street, player, action.group('BET'))
elif Decimal(action.group('BET')) <= curr_pot:
# Call
hand.addCall(street, player, action.group('BET'))
if action.group('BET') == '0':
hand.addCheck(street, player)
hand.addBet(street, player, action.group('BET')) hand.addBet(street, player, action.group('BET'))
elif action.group('ATYPE') in ('FOLD', 'SIT_OUT'): elif action.group('ATYPE') in ('FOLD', 'SIT_OUT'):
hand.addFold(street, player) hand.addFold(street, player)
elif action.group('ATYPE') == 'CHECK':
hand.addCheck(street, player)
elif action.group('ATYPE') == 'ALL_IN':
hand.addAllIn(street, player, action.group('BET'))
else: else:
print "Unimplemented readAction: %s %s" % (action.group('PSEAT'),action.group('ATYPE'),)
logging.debug(_("Unimplemented readAction: %s %s" logging.debug(_("Unimplemented readAction: %s %s"
% (action.group('PSEAT'),action.group('ATYPE'),))) % (action.group('PSEAT'),action.group('ATYPE'),)))
@ -231,7 +240,9 @@ class Everest(HandHistoryConverter):
def readCollectPot(self, hand): def readCollectPot(self, hand):
for m in self.re_CollectPot.finditer(hand.handText): for m in self.re_CollectPot.finditer(hand.handText):
pots[int(m.group('PSEAT'))] += Decimal(m.group('POT')) player = self.playerNameFromSeatNo(m.group('PSEAT'), hand)
print "DEBUG: %s collects %s" % (player, m.group('POT'))
hand.addCollectPot(player, m.group('POT'))
def readShownCards(self, hand): def readShownCards(self, hand):
for m in self.re_ShownCards.finditer(hand.handText): for m in self.re_ShownCards.finditer(hand.handText):