Merge branch 'exp' of git://git.assembla.com/mctfpdb

pyfpdb/EverleafToFpdb.py

@@ -60,7 +60,6 @@ from HandHistoryConverter import *
 # ** Dealing River ** [ 6c ]
 # smaragdar wins $ 102 USD from main pot with a pair of aces [ ad, ah, qs, 8h, 6c ]
 
-
 class Everleaf(HandHistoryConverter):
 	def __init__(self, config, file):
 		print "Initialising Everleaf converter class"
@@ -71,8 +70,9 @@ class Everleaf(HandHistoryConverter):
 		self.rexx.setSplitHandRegex('\n\n\n\n')
 		self.rexx.setHandInfoRegex('.*#(?P<HID>[0-9]+)\n.*\nBlinds \$?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+) (?P<GAMETYPE>.*) - (?P<YEAR>[0-9]+)/(?P<MON>[0-9]+)/(?P<DAY>[0-9]+) - (?P<HR>[0-9]+):(?P<MIN>[0-9]+):(?P<SEC>[0-9]+)\nTable (?P<TABLE>[ a-zA-Z]+)\nSeat (?P<BUTTON>[0-9]+)')
 		self.rexx.setPlayerInfoRegex('Seat (?P<SEAT>[0-9]+): (?P<PNAME>.*) \(  \$ (?P<CASH>[.0-9]+) USD \)')
-		self.rexx.setPostSbRegex('.*\n(?P<PNAME>.*): posts small blind \[')
+		self.rexx.setPostSbRegex('.*\n(?P<PNAME>.*): posts small blind \[\$? (?P<SB>[.0-9]+)')
-		self.rexx.setPostBbRegex('.*\n(?P<PNAME>.*): posts big blind \[')
+		self.rexx.setPostBbRegex('.*\n(?P<PNAME>.*): posts big blind \[\$? (?P<BB>[.0-9]+)')
+		# mct : what about posting small & big blinds simultaneously?
 		self.rexx.setHeroCardsRegex('.*\nDealt\sto\s(?P<PNAME>.*)\s\[ (?P<HOLE1>\S\S), (?P<HOLE2>\S\S) \]')
 		self.rexx.setActionStepRegex('.*\n(?P<PNAME>.*) (?P<ATYPE>bets|checks|raises|calls|folds)(\s\[\$ (?P<BET>[.\d]+) USD\])?')
 		self.rexx.compileRegexes()
@@ -115,9 +115,10 @@ class Everleaf(HandHistoryConverter):
 		players = []
 
 		for a in m:
-			players = players + [[a.group('SEAT'), a.group('PNAME'), a.group('CASH')]]
+			hand.addPlayer(a.group('SEAT'), a.group('PNAME'), a.group('CASH'))
+			#players = players + [[a.group('SEAT'), a.group('PNAME'), a.group('CASH')]]
 
-		hand.players = players
+		#hand.players = players
 
 	def markStreets(self, hand):
 		# PREFLOP = ** Dealing down cards **
@@ -129,12 +130,15 @@ class Everleaf(HandHistoryConverter):
 	def readBlinds(self, hand):
 		try:
 			m = self.rexx.small_blind_re.search(hand.string)
-			hand.posted = [m.group('PNAME')]
+			hand.addBlind(m.group('PNAME'), m.group('SB'))
+			#hand.posted = [m.group('PNAME')]
 		except:
-			hand.posted = ["FpdbNBP"]
+			hand.addBlind(None, 0)
+			#hand.posted = ["FpdbNBP"]
 		m = self.rexx.big_blind_re.finditer(hand.string)
 		for a in m:
-			hand.posted = hand.posted + [a.group('PNAME')]
+			hand.addBlind(a.group('PNAME'), a.group('BB'))
+			#hand.posted = hand.posted + [a.group('PNAME')]
 
 	def readHeroCards(self, hand):
 		m = self.rexx.hero_cards_re.search(hand.string)
@@ -149,11 +153,18 @@ class Everleaf(HandHistoryConverter):
 		m = self.rexx.action_re.finditer(hand.streets.group(street))
 		hand.actions[street] = []
 		for action in m:
-			if action.group('ATYPE') == 'raises' or action.group('ATYPE') == 'calls':
+			if action.group('ATYPE') == 'raises':
-				hand.actions[street] += [[action.group('PNAME'), action.group('ATYPE'), action.group('BET')]]
+				hand.addRaiseTo( street, action.group('PNAME'), action.group('BET') )
+			elif action.group('ATYPE') == 'calls':
+				hand.addCall( street, action.group('PNAME'), action.group('BET') )
+			elif action.group('ATYPE') == 'bets':
+				hand.addBet( street, action.group('PNAME'), action.group('BET') )
+			# mct: do we need to keep bet distinct from raise?
+			#	hand.actions[street] += [[action.group('PNAME'), action.group('ATYPE'), action.group('BET')]]
 			else:
+				print "DEBUG: unimplemented readAction: %s %s" %(action.group('PNAME'),action.group('ATYPE'),)
 				hand.actions[street] += [[action.group('PNAME'), action.group('ATYPE')]]
-		print "DEBUG: readAction: %s " %(hand.actions)
+		#print "DEBUG: readAction: %s " %(hand.actions)
 
 
 if __name__ == "__main__":

pyfpdb/HandHistoryConverter.py

@@ -23,6 +23,8 @@ import traceback
 import os
 import os.path
 import xml.dom.minidom
+from decimal import Decimal
+import operator
 from xml.dom.minidom import Node
 
 class HandHistoryConverter:
@@ -73,7 +75,8 @@ class HandHistoryConverter:
 				self.readAction(hand, street)
 
 			if(hand.involved == True):
-				self.writeHand("output file", hand)
+				#self.writeHand("output file", hand)
+				hand.printHand()
 			else:
 				pass #Don't write out observed hands
 
@@ -183,6 +186,10 @@ class HandHistoryConverter:
 		for act in hand.actions['PREFLOP']:
 			self.printActionLine(act, 0)
 
+		if 'PREFLOP' in hand.actions:
+			for act in hand.actions['PREFLOP']:
+				print "PF action"
+
 		if 'FLOP' in hand.actions:
 			print "*** FLOP *** [%s %s %s]" %(hand.streets.group("FLOP1"), hand.streets.group("FLOP2"), hand.streets.group("FLOP3"))
 			for act in hand.actions['FLOP']:
@@ -208,12 +215,13 @@ class HandHistoryConverter:
 
 	def printActionLine(self, act, pot):
 		if act[1] == 'folds' or act[1] == 'checks':
-			print "%s: %s" %(act[0], act[1])
+			print "%s: %s " %(act[0], act[1])
 		if act[1] == 'calls':
 			print "%s: %s $%s" %(act[0], act[1], act[2])
 		if act[1] == 'raises':
 			print "%s: %s $%s to XXXpottotalXXX" %(act[0], act[1], act[2])
 			
+
 #takes a poker float (including , for thousand seperator and converts it to an int
 	def float2int (self, string):
 		pos=string.find(",")
@@ -233,8 +241,8 @@ class HandHistoryConverter:
 class Hand:
 #    def __init__(self, sitename, gametype, sb, bb, string):
 
-	ups = {'a':'A', 't':'T', 'j':'J', 'q':'Q', 'k':'K'}
+	UPS = {'a':'A', 't':'T', 'j':'J', 'q':'Q', 'k':'K'}
-
+	STREETS = ['BLINDS','PREFLOP','FLOP','TURN','RIVER']
 	def __init__(self, sitename, gametype, string):
 		self.sitename = sitename
 		self.gametype = gametype
@@ -257,9 +265,29 @@ class Hand:
 		self.hero = "Hiro"
 		self.holecards = "Xx Xx"
 		self.action = []
-		self.totalpot = 0
+		
 		self.rake = 0
 		
+		self.bets = {}
+		self.lastBet = {}
+		self.orderedBets = {}
+		for street in self.STREETS:
+			self.bets[street] = {}
+			self.lastBet[street] = 0
+			
+	def addPlayer(self, seat, name, chips):
+		"""seat, an int indicating the seat
+		name, the player name
+		chips, the chips the player has at the start of the hand"""
+		#self.players.append(name)
+		self.players.append([seat, name, chips])
+		#self.startChips[name] = chips
+		#self.endChips[name] = chips
+		#self.winners[name] = 0
+		for street in self.STREETS:
+			self.bets[street][name] = [0]
+
+
 	def addHoleCards(self,h1,h2,seat=None): # generalise to add hole cards for a specific seat or player
 		self.holecards = [self.card(h1), self.card(h2)]
 
@@ -267,24 +295,111 @@ class Hand:
 	def card(self,c):
 		"""upper case the ranks but not suits, 'atjqk' => 'ATJQK'"""
 	# don't know how to make this 'static'
-		for k,v in self.ups.items():
+		for k,v in self.UPS.items():
 			c = c.replace(k,v)
 		return c
 
+	def addBlind(self, player, amount):
+		#self.bets['BLINDS'][player].append(Decimal(amount))
+		self.lastBet['PREFLOP'] = Decimal(amount)
+		self.posted += [player]
+		
+
+	def addCall(self, street, player=None, amount=0):
+		self.bets[street][player].append(Decimal(amount))
+		#self.lastBet[street] = Decimal(amount)
+		self.actions[street] += [[player, 'calls', amount]]
+		
+	def addRaiseTo(self, street, player, amountTo):
+		# amount is the amount raised to, not the amount raised.by
+		committedThisStreet = reduce(operator.add, self.bets[street][player], 0)
+		amountToCall = self.lastBet[street] - committedThisStreet
+		self.lastBet[street] = Decimal(amountTo)
+		amountBy = Decimal(amountTo) - amountToCall
+		self.bets[street][player].append(amountBy)
+		self.actions[street] += [[player, 'raises', amountBy, amountTo]]
+	
+	#def addRaiseTo(self, street, player=None, amountTo=None):
+		#self.amounts[street] += Decimal(amountTo)
+		
+		
+	def addBet(self, street, player=None, amount=0):
+		self.bets[street][name].append(Decimal(amount))
+		self.orderedBets[street].append(Decimal(amount))
+		self.actions[street] += [[player, 'bets', amount]]
+		
+	
+	
 	def printHand(self):
-		print self.sitename
+		# PokerStars format.
-		print self.gametype
+		print "### DEBUG ###"
-		print self.string
+		print "%s Game #%s: %s ($%s/$%s) - %s" %(self.sitename, self.handid, "XXXXhand.gametype", self.sb, self.bb, self.starttime)
-		print self.handid
+		print "Table '%s' %d-max Seat #%s is the button" %(self.tablename, self.maxseats, self.buttonpos)
-		print self.sb
+		for player in self.players:
-		print self.bb
+			print "Seat %s: %s ($%s)" %(player[0], player[1], player[2])
-		print self.tablename
+
-		print self.maxseats
+		if(self.posted[0] is None):
-		print self.counted_seats
+			print "No small blind posted"
-		print self.buttonpos
+		else:
-		print self.seating
+			print "%s: posts small blind $%s" %(self.posted[0], self.sb)
-		print self.players
+
-		print self.posted
+		#May be more than 1 bb posting
-		print self.action
+		for a in self.posted[1:]:
-		print self.involved
+			print "%s: posts big blind $%s" %(self.posted[1], self.bb)
-		print self.hero
+			
+		# What about big & small blinds?
+
+		print "*** HOLE CARDS ***"
+		print "Dealt to %s [%s %s]" %(self.hero , self.holecards[0], self.holecards[1])
+
+		if 'PREFLOP' in self.actions:
+			for act in self.actions['PREFLOP']:
+				self.printActionLine(act)
+
+		if 'FLOP' in self.actions:
+			print "*** FLOP *** [%s %s %s]" %(self.streets.group("FLOP1"), self.streets.group("FLOP2"), self.streets.group("FLOP3"))
+			for act in self.actions['FLOP']:
+				self.printActionLine(act)
+
+		if 'TURN' in self.actions:
+			print "*** TURN *** [%s %s %s] [%s]" %(self.streets.group("FLOP1"), self.streets.group("FLOP2"), self.streets.group("FLOP3"), self.streets.group("TURN1"))
+			for act in self.actions['TURN']:
+				self.printActionLine(act)
+
+		if 'RIVER' in self.actions:
+			print "*** RIVER *** [%s %s %s %s] [%s]" %(self.streets.group("FLOP1"), self.streets.group("FLOP2"), self.streets.group("FLOP3"), self.streets.group("TURN1"), self.streets.group("RIVER1"))
+			for act in self.actions['RIVER']:
+				self.printActionLine(act)
+
+		print "*** SUMMARY ***"
+		print "XXXXXXXXXXXX Need sumary info XXXXXXXXXXX"
+#		print "Total pot $%s | Rake $%s)" %(hand.totalpot  $" + hand.rake)
+#		print "Board [" + boardcards + "]"
+#
+#		SUMMARY STUFF
+
+		
+		#print self.sitename
+		#print self.gametype
+		#print self.string
+		#print self.handid
+		#print self.sb
+		#print self.bb
+		#print self.tablename
+		#print self.maxseats
+		#print self.counted_seats
+		#print self.buttonpos
+		#print self.seating
+		#print self.players
+		#print self.posted
+		#print self.action
+		#print self.involved
+		#print self.hero
+
+	def printActionLine(self, act):
+		if act[1] == 'folds' or act[1] == 'checks':
+			print "%s: %s " %(act[0], act[1])
+		if act[1] == 'calls':
+			print "%s: %s $%s" %(act[0], act[1], act[2])
+		if act[1] == 'raises':
+			print "%s: %s $%s to $%s" %(act[0], act[1], act[2], act[3])