diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index f1a6830f..365f7c4a 100644 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -415,13 +415,12 @@ class Database: self.db_name = node.getAttribute("db_name") self.db_desc = node.getAttribute("db_desc") self.db_server = node.getAttribute("db_server").lower() - self.db_ip = node.getAttribute("db_ip") - self.db_port = node.getAttribute("db_port") + self.db_ip = node.getAttribute("db_ip") self.db_user = node.getAttribute("db_user") self.db_pass = node.getAttribute("db_pass") self.db_selected = string_to_bool(node.getAttribute("default"), default=False) - log.debug("Database db_name:'%(name)s' db_server:'%(server)s' db_ip:'%(ip)s' db_port:'%(port)s' db_user:'%(user)s' db_pass (not logged) selected:'%(sel)s'" \ - % { 'name':self.db_name, 'server':self.db_server, 'ip':self.db_ip, 'port':self.db_port, 'user':self.db_user, 'sel':self.db_selected} ) + log.debug("Database db_name:'%(name)s' db_server:'%(server)s' db_ip:'%(ip)s' db_user:'%(user)s' db_pass (not logged) selected:'%(sel)s'" \ + % { 'name':self.db_name, 'server':self.db_server, 'ip':self.db_ip, 'user':self.db_user, 'sel':self.db_selected} ) def __str__(self): temp = 'Database = ' + self.db_name + '\n' @@ -484,6 +483,7 @@ class Import: self.interval = node.getAttribute("interval") self.callFpdbHud = node.getAttribute("callFpdbHud") self.hhArchiveBase = node.getAttribute("hhArchiveBase") + self.ResultsDirectory = node.getAttribute("ResultsDirectory") self.hhBulkPath = node.getAttribute("hhBulkPath") self.saveActions = string_to_bool(node.getAttribute("saveActions"), default=False) self.cacheSessions = string_to_bool(node.getAttribute("cacheSessions"), default=False) @@ -492,8 +492,8 @@ class Import: self.saveStarsHH = string_to_bool(node.getAttribute("saveStarsHH"), default=False) def __str__(self): - return " interval = %s\n callFpdbHud = %s\n hhArchiveBase = %s\n saveActions = %s\n fastStoreHudCache = %s\n" \ - % (self.interval, self.callFpdbHud, self.hhArchiveBase, self.saveActions, self.cacheSessions, self.sessionTimeout, self.fastStoreHudCache) + return " interval = %s\n callFpdbHud = %s\n hhArchiveBase = %s\n saveActions = %s\n fastStoreHudCache = %s\nResultsDirectory = %s" \ + % (self.interval, self.callFpdbHud, self.hhArchiveBase, self.saveActions, self.cacheSessions, self.sessionTimeout, self.fastStoreHudCache, self.ResultsDirectory) class HudUI: def __init__(self, node): @@ -1066,9 +1066,6 @@ class Config: try: db['db-host'] = self.supported_databases[name].db_ip except: pass - try: db['db-port'] = self.supported_databases[name].db_port - except KeyError: pass - try: db['db-user'] = self.supported_databases[name].db_user except: pass @@ -1082,16 +1079,15 @@ class Config: return db - def set_db_parameters(self, db_name = 'fpdb', db_ip = None, db_port = None, - db_user = None, db_pass = None, db_desc = None, - db_server = None, default = "False"): + def set_db_parameters(self, db_name = 'fpdb', db_ip = None, db_user = None, + db_pass = None, db_desc = None, db_server = None, + default = "False"): db_node = self.get_db_node(db_name) default = default.lower() defaultb = string_to_bool(default, False) if db_node != None: if db_desc is not None: db_node.setAttribute("db_desc", db_desc) if db_ip is not None: db_node.setAttribute("db_ip", db_ip) - if db_port is not None: db_node.setAttribute("db_port", db_port) if db_user is not None: db_node.setAttribute("db_user", db_user) if db_pass is not None: db_node.setAttribute("db_pass", db_pass) if db_server is not None: db_node.setAttribute("db_server", db_server) @@ -1105,7 +1101,6 @@ class Config: if self.supported_databases.has_key(db_name): if db_desc is not None: self.supported_databases[db_name].dp_desc = db_desc if db_ip is not None: self.supported_databases[db_name].dp_ip = db_ip - if db_port is not None: self.supported_databases[db_name].dp_port = db_port if db_user is not None: self.supported_databases[db_name].dp_user = db_user if db_pass is not None: self.supported_databases[db_name].dp_pass = db_pass if db_server is not None: self.supported_databases[db_name].dp_server = db_server @@ -1160,7 +1155,6 @@ class Config: if self.supported_databases.has_key(db_name): if db_desc is not None: self.supported_databases[db_name].dp_desc = db_desc if db_ip is not None: self.supported_databases[db_name].dp_ip = db_ip - if db_port is not None: self.supported_databases[db_name].dp_port = db_port if db_user is not None: self.supported_databases[db_name].dp_user = db_user if db_pass is not None: self.supported_databases[db_name].dp_pass = db_pass if db_server is not None: self.supported_databases[db_name].dp_server = db_server @@ -1268,6 +1262,14 @@ class Config: try: imp['hhArchiveBase'] = self.imp.hhArchiveBase except: imp['hhArchiveBase'] = "~/.fpdb/HandHistories/" + # ResultsDirectory is the local cache for downloaded results + # NOTE: try: except: doesn'tseem to be triggering + # using if instead + if self.imp.ResultsDirectory != '': + imp['ResultsDirectory'] = self.imp.ResultsDirectory + else: + imp['ResultsDirectory'] = "~/.fpdb/Results/" + # hhBulkPath is the default location for bulk imports (if set) try: imp['hhBulkPath'] = self.imp.hhBulkPath except: imp['hhBulkPath'] = "" diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index ccad9b67..be5cd955 100644 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -73,7 +73,7 @@ except ImportError: use_numpy = False -DB_VERSION = 148 +DB_VERSION = 149 # Variance created as sqlite has a bunch of undefined aggregate functions. @@ -254,7 +254,6 @@ class Database: self.db_server = db_params['db-server'] self.database = db_params['db-databaseName'] self.host = db_params['db-host'] - self.db_port = db_params['db-port'] self.db_path = '' gen = c.get_general_params() self.day_start = 0 @@ -350,7 +349,6 @@ class Database: try: self.connect(backend=db['db-backend'], host=db['db-host'], - port=db['db-port'], database=db['db-databaseName'], user=db['db-user'], password=db['db-password']) @@ -365,17 +363,14 @@ class Database: self.db_server = db_params['db-server'] self.database = db_params['db-databaseName'] self.host = db_params['db-host'] - self.db_port = db_params['db-port'] - def connect(self, backend=None, host=None, port=None, - database=None, user=None, password=None, - create=False): + def connect(self, backend=None, host=None, database=None, + user=None, password=None, create=False): """Connects a database with the given parameters""" if backend is None: raise FpdbError('Database backend not defined') self.backend = backend self.host = host - self.port = port self.user = user self.password = password self.database = database @@ -387,8 +382,7 @@ class Database: if use_pool: MySQLdb = pool.manage(MySQLdb, pool_size=5) try: - self.connection = MySQLdb.connect(host=host, port=port, user=user, - passwd=password, db=database, use_unicode=True) + self.connection = MySQLdb.connect(host=host, user=user, passwd=password, db=database, use_unicode=True) self.__connected = True #TODO: Add port option except MySQLdb.Error, ex: @@ -422,7 +416,6 @@ class Database: if not self.is_connected(): try: self.connection = psycopg2.connect(host = host, - port = port, user = user, password = password, database = database) @@ -641,6 +634,18 @@ class Database: return c.fetchone()[0] #end def getTourneyCount + def getSiteTourneyNos(self, site): + c = self.connection.cursor() + # FIXME: Take site and actually fetch siteId from that + # Fixed to Winamax atm + q = self.sql.query['getSiteTourneyNos'] + q = q.replace('%s', self.sql.query['placeholder']) + c.execute(q, (14,)) + alist = [] + for row in c.fetchall(): + alist.append(row) + return alist + def get_actual_seat(self, hand_id, name): c = self.connection.cursor() c.execute(self.sql.query['get_actual_seat'], (hand_id, name)) @@ -1821,12 +1826,15 @@ class Database: pdata[p]['street0_3BDone'], pdata[p]['street0_4BChance'], pdata[p]['street0_4BDone'], + pdata[p]['street0_C4BChance'], + pdata[p]['street0_C4BDone'], pdata[p]['street0_FoldTo3BChance'], pdata[p]['street0_FoldTo3BDone'], pdata[p]['street0_FoldTo4BChance'], pdata[p]['street0_FoldTo4BDone'], - pdata[p]['other3BStreet0'], - pdata[p]['other4BStreet0'], + pdata[p]['street0_SqueezeChance'], + pdata[p]['street0_SqueezeDone'], + pdata[p]['success_Steal'], pdata[p]['otherRaisedStreet0'], pdata[p]['otherRaisedStreet1'], pdata[p]['otherRaisedStreet2'], @@ -1948,12 +1956,15 @@ class Database: line.append(pdata[p]['street0_3BDone']) line.append(pdata[p]['street0_4BChance']) line.append(pdata[p]['street0_4BDone']) + line.append(pdata[p]['street0_C4BChance']) + line.append(pdata[p]['street0_C4BDone']) line.append(pdata[p]['street0_FoldTo3BChance']) line.append(pdata[p]['street0_FoldTo3BDone']) line.append(pdata[p]['street0_FoldTo4BChance']) line.append(pdata[p]['street0_FoldTo4BDone']) - line.append(pdata[p]['other3BStreet0']) - line.append(pdata[p]['other4BStreet0']) + line.append(pdata[p]['street0_SqueezeChance']) + line.append(pdata[p]['street0_SqueezeDone']) + line.append(pdata[p]['success_Steal']) line.append(pdata[p]['street1Seen']) line.append(pdata[p]['street2Seen']) line.append(pdata[p]['street3Seen']) diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py index 2bb3542f..a21bc209 100644 --- a/pyfpdb/DerivedStats.py +++ b/pyfpdb/DerivedStats.py @@ -50,10 +50,15 @@ class DerivedStats(): self.handsplayers[player[1]]['street0_3BDone'] = False self.handsplayers[player[1]]['street0_4BChance'] = False self.handsplayers[player[1]]['street0_4BDone'] = False + self.handsplayers[player[1]]['street0_C4BChance'] = False + self.handsplayers[player[1]]['street0_C4BDone'] = False self.handsplayers[player[1]]['street0_FoldTo3BChance']= False self.handsplayers[player[1]]['street0_FoldTo3BDone']= False self.handsplayers[player[1]]['street0_FoldTo4BChance']= False self.handsplayers[player[1]]['street0_FoldTo4BDone']= False + self.handsplayers[player[1]]['street0_SqueezeChance']= False + self.handsplayers[player[1]]['street0_SqueezeDone'] = False + self.handsplayers[player[1]]['success_Steal'] = False self.handsplayers[player[1]]['raiseFirstInChance'] = False self.handsplayers[player[1]]['raisedFirstIn'] = False self.handsplayers[player[1]]['foldBbToStealChance'] = False @@ -417,8 +422,10 @@ class DerivedStats(): #print "\naction:", action[0], posn, type(posn), steal_attempt, act if posn == 'B': #NOTE: Stud games will never hit this section - self.handsplayers[pname]['foldBbToStealChance'] = steal_attempt - self.handsplayers[pname]['foldedBbToSteal'] = steal_attempt and act == 'folds' + if steal_attempt: + self.handsplayers[pname]['foldBbToStealChance'] = True + self.handsplayers[pname]['foldedBbToSteal'] = act == 'folds' + self.handsplayers[stealer]['success_Steal'] = act == 'folds' break elif posn == 'S': self.handsplayers[pname]['foldSbToStealChance'] = steal_attempt @@ -434,6 +441,7 @@ class DerivedStats(): raised = True if posn in steal_positions: steal_attempt = True + stealer = pname if act == 'calls': break @@ -443,8 +451,8 @@ class DerivedStats(): def calc34BetStreet0(self, hand): """Fills street0_(3|4)B(Chance|Done), other(3|4)BStreet0""" bet_level = 1 # bet_level after 3-bet is equal to 3 + squeeze_chance = 0 for action in hand.actions[hand.actionStreets[1]]: - # FIXME: fill other(3|4)BStreet0 - i have no idea what does it mean pname, act, aggr = action[0], action[1], action[1] in ('raises', 'bets') if bet_level == 1: if aggr: @@ -453,8 +461,13 @@ class DerivedStats(): continue elif bet_level == 2: self.handsplayers[pname]['street0_3BChance'] = True + self.handsplayers[pname]['street0_SqueezeChance'] = squeeze_chance + if not squeeze_chance and act == 'calls': + squeeze_chance = 1 + continue if aggr: self.handsplayers[pname]['street0_3BDone'] = True + self.handsplayers[pname]['street0_SqueezeDone'] = squeeze_chance second_agressor = pname bet_level += 1 continue @@ -468,6 +481,11 @@ class DerivedStats(): elif act == 'folds': self.handsplayers[pname]['street0_FoldTo3BDone'] = True break + else: + self.handsplayers[pname]['street0_C4BChance'] = True + if aggr: + self.handsplayers[pname]['street0_C4BDone'] = True + bet_level += 1 continue elif bet_level == 4: if pname == second_agressor: diff --git a/pyfpdb/EverestToFpdb.py b/pyfpdb/EverestToFpdb.py new file mode 100644 index 00000000..f910ba2f --- /dev/null +++ b/pyfpdb/EverestToFpdb.py @@ -0,0 +1,254 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# Copyright 2011, Carl Gherardi +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# 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 General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +######################################################################## + +import L10n +_ = L10n.get_translation() + +import sys +import logging +from HandHistoryConverter import * +from decimal import Decimal + + +class Everest(HandHistoryConverter): + sitename = "Everest" + filetype = "text" + codepage = "utf8" + siteID = 15 + + substitutions = { + 'LS' : u"\$|\xe2\x82\xac|\u20ac|", + 'TAB' : u"-\u2013'\s\da-zA-Z", # legal characters for tablename + } + + # Static regexes + re_SplitHands = re.compile(r'\n+(?=)') + re_GameInfo = re.compile(u""" + """ % substitutions, re.VERBOSE|re.MULTILINE) + re_HandInfo = re.compile(r'[0-9]+)"\/>') + re_PlayerInfo = re.compile(r'', re.MULTILINE) + re_Board = re.compile(r'(?P.+)<\/COMMUNITY>', re.MULTILINE) + + # The following are also static regexes: there is no need to call + # compilePlayerRegexes (which does nothing), since players are identified + # not by name but by seat number + re_PostXB = re.compile(r'', re.MULTILINE) + #re_Antes = ??? + #re_BringIn = ??? + re_HeroCards = re.compile(r'FOLD|BET) position="(?P[0-9])"( amount="(?P[.0-9]+)")?\/>', re.MULTILINE) + re_ShowdownAction = re.compile(r'', re.MULTILINE) + re_CollectPot = re.compile(r'', re.MULTILINE) + re_ShownCards = re.compile(r'', re.MULTILINE) + + def compilePlayerRegexs(self, hand): + pass + + def playerNameFromSeatNo(self, seatNo, hand): + # Actions recorded by seat number, not by the player's name + for p in hand.players: + if p[0] == seatNo: + return p[1] + + def readSupportedGames(self): + return [ + ["ring", "hold", "nl"], + ["ring", "hold", "pl"], + #["tour", "hold", "nl"] + ] + + def determineGameType(self, handText): + m = self.re_GameInfo.search(handText) + m2 = self.re_HandInfo.search(handText) + if not m: + # Information about the game type appears only at the beginning of + # a hand history file; hence it is not supplied with the second + # and subsequent hands. In these cases we use the value previously + # stored. + try: + self.info + return self.info + except AttributeError: + tmp = handText[0:100] + log.error(_("determineGameType: Unable to recognise gametype from: '%s'") % tmp) + log.error(_("determineGameType: Raising FpdbParseError")) + raise FpdbParseError(_("Unable to recognise gametype from: '%s'") % tmp) + + if not m2: + tmp = handText[0:100] + raise FpdbParseError(_("Unable to recognise handinfo from: '%s'") % tmp) + + self.info = {} + mg = m.groupdict() + mg.update(m2.groupdict()) + print "DEBUG: mg: %s" % mg + + limits = { 'No Limit':'nl', 'No Limit ':'nl', 'Limit':'fl', 'pot-limit':'pl' } + games = { # base, category + 'Holdem' : ('hold','holdem'), + 'Holdem Tournament' : ('hold','holdem'), + 'omaha-hi' : ('hold','omahahi'), + } + + if 'LIMIT' in mg: + self.info['limitType'] = limits[mg['LIMIT']] + if 'GAME' in mg: + (self.info['base'], self.info['category']) = games[mg['GAME']] + if 'SB' in mg: + self.info['sb'] = mg['SB'] + if 'BB' in mg: + self.info['bb'] = mg['BB'] + + self.info['type'] = 'ring' + if mg['CURRENCY'] == u'\u20ac': + self.info['currency'] = 'EUR' + + # HACK - tablename not in every hand. + self.info['TABLENAME'] = mg['TABLE'] + + print "DEBUG: self.info: %s" % self.info + + return self.info + + def readHandInfo(self, hand): + m = self.re_HandInfo.search(hand.handText) + if m is None: + logging.info(_("Didn't match re_HandInfo")) + logging.info(hand.handText) + raise FpdbParseError(_("No match in readHandInfo.")) + hand.handid = m.group('HID') + hand.tablename = self.info['TABLENAME'] + hand.maxseats = None + #FIXME: u'DATETIME': u'1291155932' + hand.startTime = datetime.datetime.strptime('201102091158', '%Y%m%d%H%M') + #hand.startTime = datetime.datetime.strptime(m.group('DATETIME')[:12], '%Y%m%d%H%M') + + def readPlayerStacks(self, hand): + m = self.re_PlayerInfo.finditer(hand.handText) + for a in m: + hand.addPlayer(a.group('SEAT'), a.group('PNAME'), a.group('CASH')) + + def markStreets(self, hand): + #if hand.gametype['base'] == 'hold': + + m = re.search(r".+?(?=)|.+)" + r"((?P\S\S, \S\S, \S\S<\/COMMUNITY>.+?(?=)|.+))?" + r"((?P\S\S<\/COMMUNITY>.+?(?=)|.+))?" + r"((?P\S\S<\/COMMUNITY>.+))?", hand.handText,re.DOTALL) + #import pprint + #pp = pprint.PrettyPrinter(indent=4) + #pp.pprint(m.groupdict()) + hand.addStreets(m) + + def readCommunityCards(self, hand, street): + m = self.re_Board.search(hand.streets[street]) + if street == 'FLOP': + hand.setCommunityCards(street, m.group('CARDS').split(',')) + elif street in ('TURN','RIVER'): + hand.setCommunityCards(street, [m.group('CARDS').split(',')[-1]]) + + def readAntes(self, hand): + pass # ??? + + def readBringIn(self, hand): + pass # ??? + + def readBlinds(self, hand): + for a in self.re_PostXB.finditer(hand.handText): + amount = "%.2f" % float(int(a.group('XB'))/100) + print "DEBUG: readBlinds amount: %s" % amount + if Decimal(a.group('XB'))/100 == Decimal(self.info['sb']): + hand.addBlind(self.playerNameFromSeatNo(a.group('PSEAT'), hand),'small blind', amount) + elif Decimal(a.group('XB'))/100 == Decimal(self.info['bb']): + hand.addBlind(self.playerNameFromSeatNo(a.group('PSEAT'), hand),'big blind', amount) + + def readButton(self, hand): + hand.buttonpos = int(self.re_Button.search(hand.handText).group('BUTTON')) + + def readHeroCards(self, hand): + m = self.re_HeroCards.search(hand.handText) + if m: + hand.hero = self.playerNameFromSeatNo(m.group('PSEAT'), hand) + cards = m.group('CARDS').split(',') + hand.addHoleCards('PREFLOP', hand.hero, closed=cards, shown=False, + mucked=False, dealt=True) + + def readAction(self, hand, street): + print "DEBUG: readAction (%s)" % street + m = self.re_Action.finditer(hand.streets[street]) + curr_pot = Decimal('0') + for action in m: + print " DEBUG: %s %s" % (action.group('ATYPE'), action.groupdict()) + player = self.playerNameFromSeatNo(action.group('PSEAT'), hand) + if action.group('ATYPE') == 'BET': + amount = Decimal(action.group('BET')) + amountstr = "%.2f" % float(int(action.group('BET'))/100) + #Gah! BET can mean check, bet, call or raise... + if amount > 0 and curr_pot == 0: + # Open + curr_pot = amount + hand.addBet(street, player, amountstr) + elif Decimal(action.group('BET')) > 0 and curr_pot > 0: + # Raise or call + if amount > curr_pot: + # Raise + curr_pot = amount + hand.addCallandRaise(street, player, amountstr) + elif amount <= curr_pot: + # Call + hand.addCall(street, player, amountstr) + if action.group('BET') == '0': + hand.addCheck(street, player) + elif action.group('ATYPE') in ('FOLD', 'SIT_OUT'): + hand.addFold(street, player) + else: + print (_("Unimplemented readAction: %s %s" % (action.group('PSEAT'),action.group('ATYPE'),))) + logging.debug(_("Unimplemented readAction: %s %s" + % (action.group('PSEAT'),action.group('ATYPE'),))) + + def readShowdownActions(self, hand): + for shows in self.re_ShowdownAction.finditer(hand.handText): + cards = shows.group('CARDS').split(',') + hand.addShownCards(cards, + self.playerNameFromSeatNo(shows.group('PSEAT'), + hand)) + + def readCollectPot(self, hand): + for m in self.re_CollectPot.finditer(hand.handText): + player = self.playerNameFromSeatNo(m.group('PSEAT'), hand) + print "DEBUG: %s collects %s" % (player, m.group('POT')) + hand.addCollectPot(player, str(int(m.group('POT'))/100)) + + def readShownCards(self, hand): + for m in self.re_ShownCards.finditer(hand.handText): + cards = m.group('CARDS').split(',') + hand.addShownCards(cards=cards, player=self.playerNameFromSeatNo(m.group('PSEAT'), hand)) + diff --git a/pyfpdb/FullTiltPokerSummary.py b/pyfpdb/FullTiltPokerSummary.py index 79f50f01..2edcd81e 100644 --- a/pyfpdb/FullTiltPokerSummary.py +++ b/pyfpdb/FullTiltPokerSummary.py @@ -80,6 +80,7 @@ class FullTiltPokerSummary(TourneySummary): re_Currency = re.compile(u"""(?P[%(LS)s]|FPP)""" % substitutions) re_Player = re.compile(u"""(?P[\d]+):\s(?P[^,\r\n]{2,15})(,(\s)?[%(LS)s](?P[.\d]+))?""") + re_Finished = re.compile(u"""(?P[^,\r\n]{2,15}) finished in (?P[\d]+)\S\S place""") re_DateTime = re.compile("\[(?P[0-9]{4})\/(?P[0-9]{2})\/(?P[0-9]{2})[\- ]+(?P[0-9]+):(?P[0-9]+):(?P[0-9]+)") @@ -126,6 +127,7 @@ class FullTiltPokerSummary(TourneySummary): elif mg['CURRENCY'] == "FPP": self.currency="PSFP" m = self.re_Player.finditer(self.summaryText) + playercount = 0 for a in m: mg = a.groupdict() #print "DEBUG: a.groupdict(): %s" % mg @@ -136,4 +138,14 @@ class FullTiltPokerSummary(TourneySummary): if 'WINNINGS' in mg and mg['WINNINGS'] != None: winnings = int(100*Decimal(mg['WINNINGS'])) self.addPlayer(rank, name, winnings, self.currency, None, None, None) + playercount += 1 + # Some files dont contain the normals lines, and only contain the line + # finished in XXXXrd place + if playercount == 0: + m = self.re_Finished.finditer(self.summaryText) + for a in m: + winnings = 0 + name = a.group('NAME') + rank = a.group('RANK') + self.addPlayer(rank, name, winnings, self.currency, None, None, None) diff --git a/pyfpdb/GuiRingPlayerStats.py b/pyfpdb/GuiRingPlayerStats.py index 9a64eac6..4d214767 100644 --- a/pyfpdb/GuiRingPlayerStats.py +++ b/pyfpdb/GuiRingPlayerStats.py @@ -50,6 +50,9 @@ onlinehelp = {'Game':_('Type of Game'), 'VPIP':_('Voluntarily Putting In the pot\n(blinds excluded)'), 'PFR':_('% Pre Flop Raise'), 'PF3':_('% Pre Flop Re-Raise / 3Bet'), + 'PF4':_('% Pre Flop Re-Raise / 4Bet'), + 'PFF3':_('% Pre Flop Fold To Re-Raise / F3Bet'), + 'PFF4':_('% Pre Flop Fold To Re-Raise / F4Bet'), 'AggFac':_('Aggression Factor\n'), 'AggFreq':_('Aggression Frequency\nBet or Raise vs Fold'), 'ContBet':_('Continuation Bet post-flop'), diff --git a/pyfpdb/HUD_config.test.xml b/pyfpdb/HUD_config.test.xml index 7ce84651..7282d0af 100644 --- a/pyfpdb/HUD_config.test.xml +++ b/pyfpdb/HUD_config.test.xml @@ -577,7 +577,7 @@ Left-Drag to Move" - + diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example index a3df15a2..85e6f443 100644 --- a/pyfpdb/HUD_config.xml.example +++ b/pyfpdb/HUD_config.xml.example @@ -24,6 +24,9 @@ + + + @@ -599,6 +602,42 @@ Left-Drag to Move" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -707,8 +746,14 @@ Left-Drag to Move" - + + + + + + + @@ -789,6 +834,7 @@ Left-Drag to Move" + @@ -796,12 +842,6 @@ Left-Drag to Move" - diff --git a/pyfpdb/OnGameToFpdb.py b/pyfpdb/OnGameToFpdb.py index d69170a6..889f2d24 100755 --- a/pyfpdb/OnGameToFpdb.py +++ b/pyfpdb/OnGameToFpdb.py @@ -68,17 +68,19 @@ class OnGame(HandHistoryConverter): # ***** End of hand R5-75443872-57 ***** re_SplitHands = re.compile(u'\*\*\*\*\*\sEnd\sof\shand\s[-A-Z\d]+.*\n(?=\*)') + #TODO: detect play money + # "Play money" rather than "Real money" and set currency accordingly re_HandInfo = re.compile(u""" \*\*\*\*\*\sHistory\sfor\shand\s(?P[-A-Z\d]+).* Start\shand:\s(?P.*) - Table:\s(?P[-\'\w\s]+)\s\[\d+\]\s\( + Table:\s(\[SPEED\]\s)?(?P
[-\'\w\s]+)\s\[\d+\]\s\( ( (?PNO_LIMIT|Limit|LIMIT|Pot\sLimit|POT_LIMIT)\s (?PTEXAS_HOLDEM|OMAHA_HI|SEVEN_CARD_STUD|SEVEN_CARD_STUD_HI_LO|RAZZ|FIVE_CARD_DRAW)\s (?P%(LS)s|)?(?P[.0-9]+)/ (%(LS)s)?(?P[.0-9]+) )? - """ % substitutions, re.MULTILINE|re.DOTALL|re.VERBOSE) #TODO: detect play money (identified by "Play money" rather than "Real money" and set currency accordingly + """ % substitutions, re.MULTILINE|re.DOTALL|re.VERBOSE) re_TailSplitHands = re.compile(u'(\*\*\*\*\*\sEnd\sof\shand\s[-A-Z\d]+.*\n)(?=\*)') re_Button = re.compile('Button: seat (?P""") + + re_Details = re.compile(u"""

(?P

""") + re_Prizepool = re.compile(u"""
.+: (?P[0-9,]+)""") + + re_DateTime = re.compile("\[(?P[0-9]{4})\/(?P[0-9]{2})\/(?P[0-9]{2})[\- ]+(?P[0-9]+):(?P[0-9]+):(?P[0-9]+)") + + codepage = ["utf-8"] + + def parseSummary(self): + self.currency = "EUR" + soup = BeautifulSoup(self.summaryText) + tl = soup.findAll('div', {"class":"left_content"}) + + ps = soup.findAll('p', {"class": "text"}) + for p in ps: + for m in self.re_Details.finditer(str(p)): + mg = m.groupdict() + #print mg + if mg['LABEL'] == 'Buy-in': + mg['VALUE'] = mg['VALUE'].replace(u"€", "") + mg['VALUE'] = mg['VALUE'].replace(u"+", "") + mg['VALUE'] = mg['VALUE'].strip(" $") + bi, fee = mg['VALUE'].split(" ") + self.buyin = int(100*Decimal(bi)) + self.fee = int(100*Decimal(fee)) + #print "DEBUG: bi: '%s' fee: '%s" % (self.buyin, self.fee) + if mg['LABEL'] == 'Nombre de joueurs inscrits': + self.entries = mg['VALUE'] + if mg['LABEL'] == 'D\xc3\xa9but du tournoi': + self.startTime = datetime.datetime.strptime(mg['VALUE'], "%d-%m-%Y %H:%M") + if mg['LABEL'] == 'Nombre de joueurs max': + # Max seats i think + pass + + div = soup.findAll('div', {"class": "title2"}) + for m in self.re_Prizepool.finditer(str(div)): + mg = m.groupdict() + #print mg + self.prizepool = mg['PRIZEPOOL'].replace(u',','.') + + + for m in self.re_GameType.finditer(str(tl[0])): + mg = m.groupdict() + #print mg + self.gametype['limitType'] = self.limits[mg['LIMIT']] + self.gametype['category'] = self.games[mg['GAME']][1] + + for m in self.re_Player.finditer(str(tl[0])): + mg = m.groupdict() + #print mg + winnings = mg['WINNINGS'].strip(u'€').replace(u',','.') + winnings = int(100*Decimal(winnings)) + rank = mg['RANK'] + name = mg['PNAME'] + #print "DEBUG: %s: %s" %(name, winnings) + self.addPlayer(rank, name, winnings, self.currency, None, None, None) + + + for m in self.re_TourNo.finditer(self.summaryText): + mg = m.groupdict() + #print mg + self.tourNo = mg['TOURNO'] diff --git a/pyfpdb/WinamaxToFpdb.py b/pyfpdb/WinamaxToFpdb.py index b8b5ed1e..9d4721ec 100644 --- a/pyfpdb/WinamaxToFpdb.py +++ b/pyfpdb/WinamaxToFpdb.py @@ -276,8 +276,15 @@ class Winamax(HandHistoryConverter): hand.isKO = False info['BIRAKE'] = info['BIRAKE'].strip(u'$€') - hand.buyin = int(100*Decimal(info['BIAMT'])) - hand.fee = int(100*Decimal(info['BIRAKE'])) + rake_factor = 1 + bi_factor = 1 + if info['BIAMT'].find(".") == -1: + bi_factor = 100 + if info['BIRAKE'].find(".") == -1: + rake_factor = 100 + + hand.buyin = bi_factor*info['BIAMT'] + hand.fee = rake_factor*info['BIRAKE'] else: hand.buyin = int(Decimal(info['BIAMT'])) hand.fee = 0 diff --git a/pyfpdb/locale/es/LC_MESSAGES/fpdb.mo b/pyfpdb/locale/es/LC_MESSAGES/fpdb.mo new file mode 100644 index 00000000..0e72f226 Binary files /dev/null and b/pyfpdb/locale/es/LC_MESSAGES/fpdb.mo differ diff --git a/pyfpdb/locale/fpdb-es_ES.po b/pyfpdb/locale/fpdb-es_ES.po new file mode 100644 index 00000000..7174e731 --- /dev/null +++ b/pyfpdb/locale/fpdb-es_ES.po @@ -0,0 +1,3646 @@ +msgid "" +msgstr "" +"Project-Id-Version: fpdb\n" +"POT-Creation-Date: 2011-02-08 08:41+CET\n" +"PO-Revision-Date: \n" +"Last-Translator: Javier Sánchez \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Spanish\n" +"X-Poedit-Country: SPAIN\n" + +#: AbsoluteToFpdb.py:139 BetfairToFpdb.py:76 CarbonToFpdb.py:130 +#: EverleafToFpdb.py:110 FulltiltToFpdb.py:211 OnGameToFpdb.py:157 +#: PartyPokerToFpdb.py:197 PkrToFpdb.py:128 PokerStarsToFpdb.py:190 +#: Win2dayToFpdb.py:95 WinamaxToFpdb.py:172 iPokerToFpdb.py:122 +msgid "determineGameType: Unable to recognise gametype from: '%s'" +msgstr "" + +#: AbsoluteToFpdb.py:140 BetfairToFpdb.py:77 CarbonToFpdb.py:131 +#: EverleafToFpdb.py:111 FulltiltToFpdb.py:212 FulltiltToFpdb.py:251 +#: OnGameToFpdb.py:158 OnGameToFpdb.py:174 PartyPokerToFpdb.py:198 +#: PkrToFpdb.py:129 PkrToFpdb.py:154 PokerStarsToFpdb.py:191 +#: PokerStarsToFpdb.py:217 Win2dayToFpdb.py:96 WinamaxToFpdb.py:173 +#: WinamaxToFpdb.py:191 iPokerToFpdb.py:123 +msgid "determineGameType: Raising FpdbParseError" +msgstr "" + +#: AbsoluteToFpdb.py:141 BetfairToFpdb.py:78 CarbonToFpdb.py:132 +#: EverleafToFpdb.py:112 FulltiltToFpdb.py:213 OnGameToFpdb.py:159 +#: PartyPokerToFpdb.py:199 PkrToFpdb.py:130 PokerStarsToFpdb.py:192 +#: Win2dayToFpdb.py:97 WinamaxToFpdb.py:174 iPokerToFpdb.py:124 +msgid "Unable to recognise gametype from: '%s'" +msgstr "" + +#: AbsoluteToFpdb.py:204 +msgid "readHandInfo: Didn't match: '%s'" +msgstr "" + +#: AbsoluteToFpdb.py:205 +msgid "Absolute: Didn't match re_HandInfo: '%s'" +msgstr "" + +#: AbsoluteToFpdb.py:207 +msgid "readHandInfo: File name didn't match re_*InfoFromFilename" +msgstr "" + +#: AbsoluteToFpdb.py:208 +msgid "File name: %s" +msgstr "Nombre de archivo: %s" + +#: AbsoluteToFpdb.py:209 +msgid "Absolute: Didn't match re_*InfoFromFilename: '%s'" +msgstr "" + +#: AbsoluteToFpdb.py:278 EverleafToFpdb.py:218 FulltiltToFpdb.py:410 +#: OnGameToFpdb.py:292 PokerStarsToFpdb.py:355 Win2dayToFpdb.py:203 +#: WinamaxToFpdb.py:354 +msgid "reading antes" +msgstr "" + +#: AbsoluteToFpdb.py:290 EverleafToFpdb.py:230 +msgid "No bringin found." +msgstr "" + +#: AbsoluteToFpdb.py:297 EverleafToFpdb.py:237 +msgid "No small blind" +msgstr "" + +#: AbsoluteToFpdb.py:324 +msgid "Absolute readStudPlayerCards is only a stub." +msgstr "" + +#: AbsoluteToFpdb.py:401 BetfairToFpdb.py:222 CarbonToFpdb.py:298 +#: EverleafToFpdb.py:326 FulltiltToFpdb.py:778 PartyPokerToFpdb.py:566 +#: PokerStarsToFpdb.py:465 Win2dayToFpdb.py:368 iPokerToFpdb.py:291 +msgid "parse input hand history" +msgstr "" + +#: AbsoluteToFpdb.py:402 BetfairToFpdb.py:223 CarbonToFpdb.py:299 +#: EverleafToFpdb.py:327 FulltiltToFpdb.py:779 PartyPokerToFpdb.py:567 +#: PokerStarsToFpdb.py:466 Win2dayToFpdb.py:369 iPokerToFpdb.py:292 +msgid "output translation to" +msgstr "" + +#: AbsoluteToFpdb.py:403 BetfairToFpdb.py:224 CarbonToFpdb.py:300 +#: EverleafToFpdb.py:328 FulltiltToFpdb.py:780 PartyPokerToFpdb.py:568 +#: PokerStarsToFpdb.py:467 Win2dayToFpdb.py:370 iPokerToFpdb.py:293 +msgid "follow (tail -f) the input" +msgstr "" + +#: Anonymise.py:49 +msgid "Could not find file %s" +msgstr "" + +#: Anonymise.py:55 +msgid "Output being written to" +msgstr "" + +#: BetfairToFpdb.py:108 CarbonToFpdb.py:163 EverleafToFpdb.py:145 +#: iPokerToFpdb.py:156 iPokerToFpdb.py:158 +msgid "Didn't match re_HandInfo" +msgstr "" + +#: BetfairToFpdb.py:109 CarbonToFpdb.py:165 FulltiltToFpdb.py:266 +#: PokerStarsToFpdb.py:228 +msgid "No match in readHandInfo." +msgstr "" + +#: BetfairToFpdb.py:123 +msgid "readPlayerStacks: Less than 2 players found in a hand" +msgstr "" + +#: BetfairToFpdb.py:163 +msgid "No bringin found" +msgstr "" + +#: BetfairToFpdb.py:199 OnGameToFpdb.py:335 PokerStarsToFpdb.py:437 +#: WinamaxToFpdb.py:400 +msgid "DEBUG: unimplemented readAction: '%s' '%s'" +msgstr "" + +#: Card.py:431 +msgid "fpdb card encoding(same as pokersource)" +msgstr "" + +#: Charset.py:45 Charset.py:60 Charset.py:75 Charset.py:86 Charset.py:94 +msgid "Could not convert: \"%s\"\n" +msgstr "" + +#: Charset.py:48 Charset.py:63 Charset.py:78 +msgid "Could not encode: \"%s\"\n" +msgstr "" + +#: Configuration.py:109 Configuration.py:124 +msgid "Config file has been created at %s.\n" +msgstr "" + +#: Configuration.py:123 +msgid "" +"No %s found\n" +" in %s\n" +" or %s\n" +msgstr "" + +#: Configuration.py:128 Configuration.py:129 +msgid "Error copying .example config file, cannot fall back. Exiting.\n" +msgstr "" + +#: Configuration.py:133 Configuration.py:134 +msgid "No %s found, cannot fall back. Exiting.\n" +msgstr "" + +#: Configuration.py:166 +msgid "Default logger initialised for " +msgstr "" + +#: Configuration.py:167 +msgid "Default logger intialised for " +msgstr "" + +#: Configuration.py:178 Database.py:443 Database.py:444 +msgid "Creating directory: '%s'" +msgstr "" + +#: Configuration.py:204 +msgid "" +"Default encoding set to US-ASCII, defaulting to CP1252 instead -- If you're " +"not on a Mac, please report this problem." +msgstr "" + +#: Configuration.py:308 +msgid "Loading site" +msgstr "" + +#: Configuration.py:528 +msgid "config.general: adding %s = %s" +msgstr "" + +#: Configuration.py:575 Configuration.py:576 +msgid "bad number in xalignment was ignored" +msgstr "" + +#: Configuration.py:625 +msgid "missing config section raw_hands" +msgstr "" + +#: Configuration.py:631 +msgid "Invalid config value for raw_hands.save, defaulting to \"error\"" +msgstr "" + +#: Configuration.py:638 +msgid "Invalid config value for raw_hands.compression, defaulting to \"none\"" +msgstr "" + +#: Configuration.py:651 +msgid "missing config section raw_tourneys" +msgstr "" + +#: Configuration.py:657 +msgid "Invalid config value for raw_tourneys.save, defaulting to \"error\"" +msgstr "" + +#: Configuration.py:664 +msgid "" +"Invalid config value for raw_tourneys.compression, defaulting to \"none\"" +msgstr "" + +#: Configuration.py:682 Configuration.py:683 +msgid "Configuration file %s not found. Using defaults." +msgstr "" + +#: Configuration.py:713 +msgid "Reading configuration file %s" +msgstr "" + +#: Configuration.py:714 +msgid "" +"\n" +"Reading configuration file %s\n" +msgstr "" + +#: Configuration.py:720 +msgid "Error parsing %s. See error log file." +msgstr "" + +#: Configuration.py:836 +msgid "Error parsing example file %s. See error log file." +msgstr "" + +#: Database.py:65 +msgid "Not using sqlalchemy connection pool." +msgstr "" + +#: Database.py:72 +msgid "Not using numpy to define variance in sqlite." +msgstr "" + +#: Database.py:246 +msgid "Creating Database instance, sql = %s" +msgstr "" + +#: Database.py:394 +msgid "*** WARNING UNKNOWN MYSQL ERROR:" +msgstr "" + +#: Database.py:448 +msgid "Connecting to SQLite: %(database)s" +msgstr "" + +#: Database.py:460 +msgid "Some database functions will not work without NumPy support" +msgstr "" + +#: Database.py:490 +msgid "outdated or too new database version (%s) - please recreate tables" +msgstr "" + +#: Database.py:496 Database.py:497 +msgid "Failed to read settings table - recreating tables" +msgstr "" + +#: Database.py:501 Database.py:502 +msgid "Failed to read settings table - please recreate tables" +msgstr "" + +#: Database.py:523 +msgid "commit %s failed: info=%s value=%s" +msgstr "" + +#: Database.py:527 +msgid "commit failed" +msgstr "" + +#: Database.py:696 Database.py:729 +msgid "*** Database Error: " +msgstr "" + +#: Database.py:726 +msgid "Database: date n hands ago = " +msgstr "" + +#: Database.py:883 +msgid "ERROR: query %s result does not have player_id as first column" +msgstr "" + +#: Database.py:975 +msgid "getLastInsertId(): problem fetching insert_id? ret=%d" +msgstr "" + +#: Database.py:987 +msgid "getLastInsertId(%s): problem fetching lastval? row=%d" +msgstr "" + +#: Database.py:994 +msgid "getLastInsertId(): unknown backend: %d" +msgstr "" + +#: Database.py:999 +msgid "*** Database get_last_insert_id error: " +msgstr "" + +#: Database.py:1053 Database.py:1478 +msgid "warning: drop pg fk %s_%s_fkey failed: %s, continuing ..." +msgstr "" + +#: Database.py:1057 Database.py:1482 +msgid "warning: constraint %s_%s_fkey not dropped: %s, continuing ..." +msgstr "" + +#: Database.py:1065 Database.py:1356 +msgid "dropping mysql index " +msgstr "" + +#: Database.py:1071 Database.py:1361 Database.py:1369 Database.py:1376 +msgid " drop index failed: " +msgstr "" + +#: Database.py:1076 Database.py:1363 +msgid "dropping pg index " +msgstr "" + +#: Database.py:1089 +msgid "warning: drop index %s_%s_idx failed: %s, continuing ..." +msgstr "" + +#: Database.py:1093 +msgid "warning: index %s_%s_idx not dropped %s, continuing ..." +msgstr "" + +#: Database.py:1133 Database.py:1141 +msgid "Creating foreign key " +msgstr "" + +#: Database.py:1139 Database.py:1148 Database.py:1160 +msgid "Create foreign key failed: " +msgstr "" + +#: Database.py:1155 Database.py:1314 Database.py:1315 +msgid "Creating mysql index %s %s" +msgstr "" + +#: Database.py:1164 +msgid "Creating pg index " +msgstr "" + +#: Database.py:1169 Database.py:1320 Database.py:1329 Database.py:1337 +msgid "Create index failed: " +msgstr "" + +#: Database.py:1210 Database.py:1211 +msgid "Finished recreating tables" +msgstr "" + +#: Database.py:1252 +msgid "***Error creating tables: " +msgstr "" + +#: Database.py:1262 +msgid "*** Error unable to get databasecursor" +msgstr "" + +#: Database.py:1274 Database.py:1285 Database.py:1295 Database.py:1302 +msgid "***Error dropping tables: " +msgstr "" + +#: Database.py:1300 +msgid "*** Error in committing table drop" +msgstr "" + +#: Database.py:1323 Database.py:1324 +msgid "Creating pgsql index %s %s" +msgstr "" + +#: Database.py:1331 Database.py:1332 +msgid "Creating sqlite index %s %s" +msgstr "" + +#: Database.py:1339 +msgid "Unknown database: MySQL, Postgres and SQLite supported" +msgstr "" + +#: Database.py:1344 +msgid "Error creating indexes: " +msgstr "" + +#: Database.py:1371 +msgid "Dropping sqlite index " +msgstr "" + +#: Database.py:1378 +msgid "" +"Fpdb only supports MySQL, Postgres and SQLITE, what are you trying to use?" +msgstr "" + +#: Database.py:1392 Database.py:1432 +msgid " set_isolation_level failed: " +msgstr "" + +#: Database.py:1409 Database.py:1417 +msgid "creating foreign key " +msgstr "" + +#: Database.py:1415 +msgid " create foreign key failed: " +msgstr "" + +#: Database.py:1424 +msgid " create foreign key failed: " +msgstr "" + +#: Database.py:1426 Database.py:1485 +msgid "Only MySQL and Postgres supported so far" +msgstr "" + +#: Database.py:1456 +msgid "dropping mysql foreign key" +msgstr "" + +#: Database.py:1460 +msgid " drop failed: " +msgstr "" + +#: Database.py:1463 +msgid "dropping pg foreign key" +msgstr "" + +#: Database.py:1475 +msgid "dropped pg foreign key %s_%s_fkey, continuing ..." +msgstr "" + +#: Database.py:1596 +msgid "Rebuild hudcache took %.1f seconds" +msgstr "" + +#: Database.py:1599 Database.py:1637 +msgid "Error rebuilding hudcache:" +msgstr "" + +#: Database.py:1649 Database.py:1655 +msgid "Error during analyze:" +msgstr "" + +#: Database.py:1659 +msgid "Analyze took %.1f seconds" +msgstr "" + +#: Database.py:1669 Database.py:1675 +msgid "Error during vacuum:" +msgstr "" + +#: Database.py:1679 +msgid "Vacuum took %.1f seconds" +msgstr "" + +#: Database.py:1691 +msgid "Error during lock_for_insert:" +msgstr "" + +#: Database.py:1700 +msgid "######## Hands ##########" +msgstr "" + +#: Database.py:1704 +msgid "###### End Hands ########" +msgstr "" + +#: Database.py:2098 +msgid "Error aquiring hero ids:" +msgstr "" + +#: Database.py:2204 +msgid "######## Gametype ##########" +msgstr "" + +#: Database.py:2208 +msgid "###### End Gametype ########" +msgstr "" + +#: Database.py:2235 +msgid "queue empty too long - writer stopping ..." +msgstr "" + +#: Database.py:2238 +msgid "writer stopping, error reading queue: " +msgstr "" + +#: Database.py:2263 +msgid "deadlock detected - trying again ..." +msgstr "" + +#: Database.py:2268 +msgid "too many deadlocks - failed to store hand " +msgstr "" + +#: Database.py:2272 +msgid "***Error storing hand: " +msgstr "" + +#: Database.py:2282 +msgid "db writer finished: stored %d hands (%d fails) in %.1f seconds" +msgstr "" + +#: Database.py:2292 +msgid "***Error sending finish: " +msgstr "" + +#: Database.py:2374 +msgid "invalid source in Database.createOrUpdateTourney" +msgstr "" + +#: Database.py:2387 +msgid "invalid source in Database.createOrUpdateTourneysPlayers" +msgstr "" + +#: Database.py:2513 +msgid "HandToWrite.init error: " +msgstr "" + +#: Database.py:2563 +msgid "HandToWrite.set_all error: " +msgstr "" + +#: Database.py:2594 +msgid "nutOmatic is id_player = %d" +msgstr "" + +#: Database.py:2602 +msgid "query plan: " +msgstr "" + +#: Database.py:2611 +msgid "cards =" +msgstr "" + +#: Database.py:2614 +msgid "get_stats took: %4.3f seconds" +msgstr "" + +#: Database.py:2616 +msgid "press enter to continue" +msgstr "" + +#: EverleafToFpdb.py:265 +msgid "Everleaf readStudPlayerCards is only a stub." +msgstr "" + +#: Filters.py:53 +msgid "All" +msgstr "" + +#: Filters.py:53 +msgid "None" +msgstr "" + +#: Filters.py:53 +msgid "Show _Limits" +msgstr "" + +#: Filters.py:54 +msgid "Show Number of _Players" +msgstr "" + +#: Filters.py:54 TourneyFilters.py:51 +msgid "And:" +msgstr "" + +#: Filters.py:54 TourneyFilters.py:51 +msgid "Between:" +msgstr "" + +#: Filters.py:55 +msgid "Games:" +msgstr "" + +#: Filters.py:55 TourneyFilters.py:50 +msgid "Hero:" +msgstr "" + +#: Filters.py:55 TourneyFilters.py:50 +msgid "Sites:" +msgstr "" + +#: Filters.py:56 +msgid "Limits:" +msgstr "" + +#: Filters.py:56 TourneyFilters.py:50 +msgid "Number of Players:" +msgstr "" + +#: Filters.py:57 +msgid "Grouping:" +msgstr "" + +#: Filters.py:57 +msgid "Show Position Stats" +msgstr "" + +#: Filters.py:58 TourneyFilters.py:51 +msgid "Date:" +msgstr "" + +#: Filters.py:59 +msgid "All Players" +msgstr "" + +#: Filters.py:60 +msgid "Ring" +msgstr "" + +#: Filters.py:60 +msgid "Tourney" +msgstr "" + +#: Filters.py:96 TourneyFilters.py:107 +msgid "Either 0 or more than one site matched (%s) - EEK" +msgstr "" + +#: Filters.py:328 +msgid "%s was toggled %s" +msgstr "" + +#: Filters.py:328 +msgid "OFF" +msgstr "" + +#: Filters.py:328 +msgid "ON" +msgstr "" + +#: Filters.py:409 +msgid "self.sites[%s] set to %s" +msgstr "" + +#: Filters.py:415 +msgid "self.games[%s] set to %s" +msgstr "" + +#: Filters.py:421 +msgid "self.limit[%s] set to %s" +msgstr "" + +#: Filters.py:565 +msgid "self.seats[%s] set to %s" +msgstr "" + +#: Filters.py:571 +msgid "self.groups[%s] set to %s" +msgstr "" + +#: Filters.py:612 +msgid "Min # Hands:" +msgstr "" + +#: Filters.py:678 +msgid "INFO: No tourney types returned from database" +msgstr "" + +#: Filters.py:679 +msgid "No tourney types returned from database" +msgstr "" + +#: Filters.py:705 Filters.py:794 +msgid "INFO: No games returned from database" +msgstr "" + +#: Filters.py:706 Filters.py:795 +msgid "No games returned from database" +msgstr "" + +#: Filters.py:974 +msgid "From:" +msgstr "" + +#: Filters.py:988 +msgid "To:" +msgstr "" + +#: Filters.py:993 +msgid " Clear Dates " +msgstr "" + +#: Filters.py:1020 fpdb.pyw:720 +msgid "Pick a date" +msgstr "" + +#: Filters.py:1026 fpdb.pyw:726 +msgid "Done" +msgstr "Hecho" + +#: FullTiltPokerSummary.py:92 PokerStarsSummary.py:81 +msgid "parseSummary: Unable to recognise Tourney Info: '%s'" +msgstr "" + +#: FullTiltPokerSummary.py:93 FullTiltPokerSummary.py:119 +#: PokerStarsSummary.py:82 PokerStarsSummary.py:108 +msgid "parseSummary: Raising FpdbParseError" +msgstr "" + +#: FullTiltPokerSummary.py:94 PokerStarsSummary.py:83 +msgid "Unable to recognise Tourney Info: '%s'" +msgstr "" + +#: FullTiltPokerSummary.py:118 PokerStarsSummary.py:107 +msgid "parseSummary: Unable to locate currency" +msgstr "" + +#: FullTiltPokerSummary.py:120 PokerStarsSummary.py:109 +msgid "Unable to locate currency" +msgstr "" + +#: FulltiltToFpdb.py:252 PkrToFpdb.py:155 PokerStarsToFpdb.py:218 +msgid "Lim_Blinds has no lookup for '%s'" +msgstr "" + +#: FulltiltToFpdb.py:265 +msgid "readHandInfo: Unable to recognise handinfo from: '%s'" +msgstr "" + +#: FulltiltToFpdb.py:420 +msgid "Player bringing in: %s for %s" +msgstr "" + +#: FulltiltToFpdb.py:423 +msgid "No bringin found, handid =%s" +msgstr "" + +#: FulltiltToFpdb.py:430 +msgid "FTP: readButton: Failed to detect button (hand #%s cancelled?)" +msgstr "" + +#: FulltiltToFpdb.py:484 +msgid "FullTilt: DEBUG: unimplemented readAction: '%s' '%s'" +msgstr "" + +#: FulltiltToFpdb.py:560 +msgid "determineTourneyType : Parsing NOK" +msgstr "" + +#: FulltiltToFpdb.py:618 +msgid "Unable to get a valid Tournament ID -- File rejected" +msgstr "" + +#: FulltiltToFpdb.py:649 +msgid "Conflict between buyins read in topline (%s) and in BuyIn field (%s)" +msgstr "" + +#: FulltiltToFpdb.py:656 +msgid "Conflict between fees read in topline (%s) and in BuyIn field (%s)" +msgstr "" + +#: FulltiltToFpdb.py:660 +msgid "Unable to affect a buyin to this tournament : assume it's a freeroll" +msgstr "" + +#: FulltiltToFpdb.py:761 +msgid "FullTilt: Player finishing stats unreadable : %s" +msgstr "" + +#: FulltiltToFpdb.py:770 +msgid "FullTilt: %s not found in tourney.ranks ..." +msgstr "" + +#: FulltiltToFpdb.py:772 +msgid "FullTilt: Bad parsing : finish position incoherent : %s / %s" +msgstr "" + +#: GuiAutoImport.py:90 +msgid "Time between imports in seconds:" +msgstr "Tiempo entre importaciones en segundos:" + +#: GuiAutoImport.py:121 GuiAutoImport.py:189 GuiAutoImport.py:274 +msgid " Start _Auto Import " +msgstr "Empezar _auto importación" + +#: GuiAutoImport.py:140 +msgid "Auto Import Ready." +msgstr "Auto importación preparada." + +#: GuiAutoImport.py:153 +msgid "Please choose the path that you want to Auto Import" +msgstr "" + +#: GuiAutoImport.py:176 +msgid " _Auto Import Running " +msgstr "" + +#: GuiAutoImport.py:187 +msgid " Stop _Auto Import " +msgstr "" + +#: GuiAutoImport.py:213 +msgid "" +"\n" +"Global lock taken ... Auto Import Started.\n" +msgstr "" + +#: GuiAutoImport.py:215 +msgid " _Stop Auto Import " +msgstr "" + +#: GuiAutoImport.py:235 +msgid "opening pipe to HUD" +msgstr "abriendo tubería hacia el HUD" + +#: GuiAutoImport.py:249 +msgid "" +"\n" +"*** GuiAutoImport Error opening pipe: " +msgstr "" + +#: GuiAutoImport.py:261 +msgid "" +"\n" +"Auto Import aborted - global lock not available" +msgstr "" + +#: GuiAutoImport.py:266 +msgid "" +"\n" +"Stopping Auto Import - global lock released." +msgstr "" + +#: GuiAutoImport.py:268 +msgid "" +"\n" +" * Stop Auto Import: HUD already terminated" +msgstr "" + +#: GuiAutoImport.py:296 +msgid "Browse..." +msgstr "" + +#: GuiBulkImport.py:59 +msgid "" +"\n" +"Global lock taken ..." +msgstr "" + +#: GuiBulkImport.py:60 +msgid "Importing..." +msgstr "Importando..." + +#: GuiBulkImport.py:113 +msgid "" +"GuiBulkImport.load done: Stored: %d \tDuplicates: %d \tPartial: %d \tErrors: " +"%d in %s seconds - %.0f/sec" +msgstr "" + +#: GuiBulkImport.py:127 +msgid "Import Complete" +msgstr "Importación completada" + +#: GuiBulkImport.py:135 GuiTourneyImport.py:78 +msgid "bulk import aborted - global lock not available" +msgstr "importación masiva abortada - reloj global no disponible" + +#: GuiBulkImport.py:163 +msgid "Print Start/Stop Info" +msgstr "" + +#: GuiBulkImport.py:170 +msgid "Hands/status print:" +msgstr "" + +#: GuiBulkImport.py:187 +msgid "Number of threads:" +msgstr "Número de hilos:" + +#: GuiBulkImport.py:207 +msgid "Archive File" +msgstr "" + +#: GuiBulkImport.py:212 +msgid "Hands/file:" +msgstr "Manos/archivo:" + +#: GuiBulkImport.py:227 +msgid "Drop indexes:" +msgstr "" + +#: GuiBulkImport.py:236 GuiBulkImport.py:286 +msgid "auto" +msgstr "auto" + +#: GuiBulkImport.py:237 GuiBulkImport.py:287 GuiBulkImport.py:395 +msgid "don't drop" +msgstr "" + +#: GuiBulkImport.py:238 GuiBulkImport.py:288 +msgid "drop" +msgstr "" + +#: GuiBulkImport.py:244 +msgid "HUD Test mode" +msgstr "HUD en modo de prueba" + +#: GuiBulkImport.py:249 GuiTourneyImport.py:106 +msgid "Site filter:" +msgstr "" + +#: GuiBulkImport.py:277 +msgid "Drop HudCache:" +msgstr "" + +#: GuiBulkImport.py:295 GuiTourneyImport.py:135 fpdb.pyw:815 +msgid "_Bulk Import" +msgstr "Importación _masiva" + +#: GuiBulkImport.py:297 GuiTourneyImport.py:137 +msgid "Import clicked" +msgstr "" + +#: GuiBulkImport.py:315 +msgid "Waiting..." +msgstr "Esperando..." + +#: GuiBulkImport.py:344 Options.py:58 +msgid "Input file in quiet mode" +msgstr "" + +#: GuiBulkImport.py:346 +msgid "don't start gui; deprecated (just give a filename with -f)." +msgstr "" + +#: GuiBulkImport.py:348 +msgid "Conversion filter (*Full Tilt Poker, PokerStars, Everleaf, Absolute)" +msgstr "" + +#: GuiBulkImport.py:350 +msgid "If this option is passed it quits when it encounters any error" +msgstr "" + +#: GuiBulkImport.py:352 Options.py:55 +msgid "Print some useful one liners" +msgstr "" + +#: GuiBulkImport.py:354 +msgid "" +"Do the required conversion for Stars Archive format (ie. as provided by " +"support" +msgstr "" + +#: GuiBulkImport.py:356 +msgid "" +"Do the required conversion for FTP Archive format (ie. as provided by support" +msgstr "" + +#: GuiBulkImport.py:358 +msgid "" +"Output the pprinted version of the HandsPlayer hash for regresion testing" +msgstr "" + +#: GuiBulkImport.py:363 GuiTourneyImport.py:267 ImapFetcher.py:172 +msgid "USAGE:" +msgstr "" + +#: GuiBulkImport.py:364 +msgid "PokerStars converter: ./GuiBulkImport.py -c PokerStars -f filename" +msgstr "" +"Convertertidor de PokerStars : ./GuiBulkImport.py -c PokerStars -f filename" + +#: GuiBulkImport.py:365 +msgid "" +"Full Tilt converter: ./GuiBulkImport.py -c \"Full Tilt Poker\" -f filename" +msgstr "" + +#: GuiBulkImport.py:366 +msgid "Everleaf converter: ./GuiBulkImport.py -c Everleaf -f filename" +msgstr "" + +#: GuiBulkImport.py:367 +msgid "Absolute converter: ./GuiBulkImport.py -c Absolute -f filename" +msgstr "" + +#: GuiBulkImport.py:368 +msgid "PartyPoker converter: ./GuiBulkImport.py -c PartyPoker -f filename" +msgstr "" + +#: GuiBulkImport.py:382 +msgid "-q is deprecated. Just use \"-f filename\" instead" +msgstr "" + +#: GuiBulkImport.py:408 +msgid "" +"GuiBulkImport done: Stored: %d \tDuplicates: %d \tPartial: %d \tErrors: %d " +"in %s seconds - %.0f/sec" +msgstr "" + +#: GuiDatabase.py:107 +msgid "_Add" +msgstr "" + +#: GuiDatabase.py:111 +msgid "_Refresh" +msgstr "" + +#: GuiDatabase.py:115 +msgid "Type" +msgstr "" + +#: GuiDatabase.py:116 +msgid "Name" +msgstr "Nombre" + +#: GuiDatabase.py:117 +msgid "Description" +msgstr "Descripción" + +#: GuiDatabase.py:118 GuiDatabase.py:448 GuiImapFetcher.py:110 +msgid "Username" +msgstr "Nombre de usuario" + +#: GuiDatabase.py:119 GuiDatabase.py:455 GuiImapFetcher.py:110 +msgid "Password" +msgstr "Contraseña" + +#: GuiDatabase.py:120 +msgid "Host" +msgstr "" + +#: GuiDatabase.py:121 +msgid "Open" +msgstr "Abrir" + +#: GuiDatabase.py:122 +msgid "Status" +msgstr "Estado" + +#: GuiDatabase.py:256 +msgid "Testing database connections ... " +msgstr "Comprobando conexiones a la base de datos..." + +#: GuiDatabase.py:283 +msgid "finished." +msgstr "Completado." + +#: GuiDatabase.py:293 +msgid "loadDbs error: " +msgstr "" + +#: GuiDatabase.py:314 GuiLogView.py:191 GuiTourneyPlayerStats.py:457 +msgid "***sortCols error: " +msgstr "" + +#: GuiDatabase.py:316 +msgid "sortCols error: " +msgstr "" + +#: GuiDatabase.py:361 +msgid "testDB: trying to connect to: %s/%s, %s, %s/%s" +msgstr "testDB: intentando conectar a: %s/%s, %s, %s/%s" + +#: GuiDatabase.py:364 +msgid " connected ok" +msgstr " conectado bien" + +#: GuiDatabase.py:371 +msgid " not connected but no exception" +msgstr " no conectado pero sin excepción" + +#: GuiDatabase.py:373 fpdb.pyw:891 +msgid "" +"MySQL Server reports: Access denied. Are your permissions set correctly?" +msgstr "" +"MySQL Server dice: Acceso denegado. ¿Estan tus permisos bien configurados?" + +#: GuiDatabase.py:377 fpdb.pyw:893 +msgid "MySQL client reports: 2002 or 2003 error. Unable to connect - " +msgstr "MySQL client dice: error 2002 o 2003. Incapaz de conectar -" + +#: GuiDatabase.py:378 fpdb.pyw:894 +msgid "Please check that the MySQL service has been started" +msgstr "Por favor, compruebe que el servicio MySQL ha sido iniciado" + +#: GuiDatabase.py:382 fpdb.pyw:896 +msgid "" +"PostgreSQL Server reports: Access denied. Are your permissions set correctly?" +msgstr "" + +#: GuiDatabase.py:385 fpdb.pyw:898 +msgid "PostgreSQL client reports: Unable to connect - " +msgstr "" + +#: GuiDatabase.py:386 fpdb.pyw:899 +msgid "Please check that the PostgreSQL service has been started" +msgstr "" + +#: GuiDatabase.py:396 +msgid "db connection to %s, %s, %s, %s, %s failed: %s" +msgstr "" + +#: GuiDatabase.py:404 +msgid "AddDB starting" +msgstr "" + +#: GuiDatabase.py:413 +msgid "Add New Database" +msgstr "" + +#: GuiDatabase.py:423 +msgid "DB Type" +msgstr "" + +#: GuiDatabase.py:433 +msgid "DB Name" +msgstr "" + +#: GuiDatabase.py:441 +msgid "DB Description" +msgstr "" + +#: GuiDatabase.py:462 +msgid "Host Computer" +msgstr "" + +#: GuiDatabase.py:495 +msgid "start creating new db" +msgstr "" + +#: GuiDatabase.py:514 +msgid "tested new db, result=%s" +msgstr "" + +#: GuiDatabase.py:517 +msgid "Database created" +msgstr "" + +#: GuiDatabase.py:520 +msgid "Database creation failed" +msgstr "" + +#: GuiDatabase.py:533 +msgid "check_fields: starting" +msgstr "" + +#: GuiDatabase.py:539 +msgid "No Database Name given" +msgstr "" + +#: GuiDatabase.py:542 +msgid "No Database Description given" +msgstr "" + +#: GuiDatabase.py:545 +msgid "No Username given" +msgstr "" + +#: GuiDatabase.py:548 +msgid "No Password given" +msgstr "" + +#: GuiDatabase.py:551 +msgid "No Host given" +msgstr "" + +#: GuiDatabase.py:565 +msgid "Unknown Database Type selected" +msgstr "" + +#: GuiDatabase.py:569 +msgid "check_fields: open dialog" +msgstr "" + +#: GuiDatabase.py:578 +msgid "Do you want to try again?" +msgstr "" + +#: GuiDatabase.py:585 +msgid "check_fields: destroy dialog" +msgstr "" + +#: GuiDatabase.py:589 +msgid "check_fields: returning ok as %s, try_again as %s" +msgstr "" + +#: GuiDatabase.py:691 GuiLogView.py:204 +msgid "Test Log Viewer" +msgstr "" + +#: GuiDatabase.py:696 GuiLogView.py:209 +msgid "Log Viewer" +msgstr "" + +#: GuiGraphViewer.py:49 GuiTourneyGraphViewer.py:49 +msgid "" +"Failed to load libs for graphing, graphing will not function. Please\n" +" install numpy and matplotlib if you want to use graphs." +msgstr "" + +#: GuiGraphViewer.py:51 GuiTourneyGraphViewer.py:51 +msgid "" +"This is of no consequence for other parts of the program, e.g. import \n" +" and HUD are NOT affected by this problem." +msgstr "" + +#: GuiGraphViewer.py:85 GuiTourneyGraphViewer.py:84 +msgid "Refresh _Graph" +msgstr "" + +#: GuiGraphViewer.py:87 GuiTourneyGraphViewer.py:86 +msgid "_Export to File" +msgstr "" + +#: GuiGraphViewer.py:135 GuiGraphViewer.py:251 GuiSessionViewer.py:372 +#: GuiTourneyGraphViewer.py:134 GuiTourneyGraphViewer.py:232 +msgid "***Error: " +msgstr "" + +#: GuiGraphViewer.py:168 GuiPositionalStats.py:168 GuiRingPlayerStats.py:267 +#: GuiSessionViewer.py:212 GuiTourneyGraphViewer.py:159 +#: GuiTourneyPlayerStats.py:268 +msgid "No sites selected - defaulting to PokerStars" +msgstr "" + +#: GuiGraphViewer.py:173 GuiPositionalStats.py:171 GuiRingPlayerStats.py:270 +#: GuiSessionViewer.py:215 GuiTourneyGraphViewer.py:164 +#: GuiTourneyPlayerStats.py:271 +msgid "No player ids found" +msgstr "" + +#: GuiGraphViewer.py:178 GuiPositionalStats.py:174 GuiRingPlayerStats.py:273 +#: GuiSessionViewer.py:218 +msgid "No limits found" +msgstr "" + +#: GuiGraphViewer.py:188 GuiTourneyGraphViewer.py:174 +msgid "Graph generated in: %s" +msgstr "" + +#: GuiGraphViewer.py:193 +msgid "Hands" +msgstr "" + +#: GuiGraphViewer.py:198 GuiTourneyGraphViewer.py:182 +msgid "No Data for Player(s) Found" +msgstr "" + +#: GuiGraphViewer.py:221 +msgid "" +"Hands: %d\n" +"Profit: $%.2f" +msgstr "" + +#: GuiGraphViewer.py:222 +msgid "Showdown: $%.2f" +msgstr "" + +#: GuiGraphViewer.py:223 +msgid "Non-showdown: $%.2f" +msgstr "" + +#: GuiGraphViewer.py:234 +msgid "" +"Hands: %d\n" +"Profit (%s): %.2f" +msgstr "" + +#: GuiGraphViewer.py:236 +msgid "Showdown (%s): %.2f" +msgstr "" + +#: GuiGraphViewer.py:238 +msgid "Non-showdown (%s): %.2f" +msgstr "" + +#: GuiGraphViewer.py:356 GuiTourneyGraphViewer.py:276 +msgid "Please choose the directory you wish to export to:" +msgstr "" + +#: GuiGraphViewer.py:369 GuiTourneyGraphViewer.py:289 +msgid "Closed, no graph exported" +msgstr "" + +#: GuiGraphViewer.py:387 GuiTourneyGraphViewer.py:307 +msgid "Graph created" +msgstr "" + +#: GuiImapFetcher.py:40 +msgid "To cancel just close this tab." +msgstr "" + +#: GuiImapFetcher.py:43 +msgid "_Save" +msgstr "" + +#: GuiImapFetcher.py:47 +msgid "_Import All" +msgstr "" + +#: GuiImapFetcher.py:51 +msgid "If you change the config you must save before importing" +msgstr "" + +#: GuiImapFetcher.py:89 +msgid "Starting import. Please wait." +msgstr "" + +#: GuiImapFetcher.py:94 +msgid "Finished import without error." +msgstr "" + +#: GuiImapFetcher.py:97 +msgid "" +"Login to mailserver failed: please check mailserver, username and password" +msgstr "" + +#: GuiImapFetcher.py:100 +msgid "" +"Could not connect to mailserver: check mailserver and use SSL settings and " +"internet connectivity" +msgstr "" + +#: GuiImapFetcher.py:110 +msgid "Fetch Type" +msgstr "" + +#: GuiImapFetcher.py:110 +msgid "Mail Folder" +msgstr "" + +#: GuiImapFetcher.py:110 +msgid "Mailserver" +msgstr "" + +#: GuiImapFetcher.py:110 +msgid "Site" +msgstr "" + +#: GuiImapFetcher.py:110 +msgid "Use SSL" +msgstr "" + +#: GuiImapFetcher.py:142 +msgid "Yes" +msgstr "" + +#: GuiImapFetcher.py:143 +msgid "No" +msgstr "" + +#: GuiLogView.py:52 +msgid "Log Messages" +msgstr "" + +#: GuiLogView.py:87 +msgid "Refresh" +msgstr "" + +#: GuiPositionalStats.py:137 +msgid "DEBUG: activesite set to %s" +msgstr "" + +#: GuiPositionalStats.py:323 +msgid "Positional Stats page displayed in %4.2f seconds" +msgstr "" + +#: GuiPrefs.py:72 +msgid "Setting" +msgstr "" + +#: GuiPrefs.py:78 +msgid "Value (double-click to change)" +msgstr "" + +#: GuiPrefs.py:178 +msgid "Test Preferences Dialog" +msgstr "" + +#: GuiPrefs.py:183 fpdb.pyw:294 +msgid "Preferences" +msgstr "" + +#: GuiRingPlayerStats.py:44 +msgid "Type of Game" +msgstr "" + +#: GuiRingPlayerStats.py:45 +msgid "Hole cards" +msgstr "" + +#: GuiRingPlayerStats.py:46 +msgid "Position" +msgstr "" + +#: GuiRingPlayerStats.py:47 +msgid "Name of the player" +msgstr "" + +#: GuiRingPlayerStats.py:48 +msgid "Number of hands played" +msgstr "" + +#: GuiRingPlayerStats.py:49 +msgid "Number of Seats" +msgstr "" + +#: GuiRingPlayerStats.py:50 +msgid "" +"Voluntarily Putting In the pot\n" +"(blinds excluded)" +msgstr "" + +#: GuiRingPlayerStats.py:51 +msgid "% Pre Flop Raise" +msgstr "" + +#: GuiRingPlayerStats.py:52 +msgid "% Pre Flop Re-Raise / 3Bet" +msgstr "" + +#: GuiRingPlayerStats.py:53 +msgid "Aggression Factor\n" +msgstr "" + +#: GuiRingPlayerStats.py:54 +msgid "" +"Aggression Frequency\n" +"Bet or Raise vs Fold" +msgstr "" + +#: GuiRingPlayerStats.py:55 +msgid "Continuation Bet post-flop" +msgstr "" + +#: GuiRingPlayerStats.py:56 +msgid "% Raise First In\\% Raise when first to bet" +msgstr "" + +#: GuiRingPlayerStats.py:57 +msgid "" +"% First to raise pre-flop\n" +"and steal blinds" +msgstr "" + +#: GuiRingPlayerStats.py:58 +msgid "% Saw Flop vs hands dealt" +msgstr "" + +#: GuiRingPlayerStats.py:59 +msgid "Saw Show Down / River" +msgstr "" + +#: GuiRingPlayerStats.py:60 +msgid "Went To Show Down When Saw Flop" +msgstr "" + +#: GuiRingPlayerStats.py:61 +msgid "% Won some money at showdown" +msgstr "" + +#: GuiRingPlayerStats.py:62 +msgid "" +"Flop Aggression\n" +"% Bet or Raise after seeing Flop" +msgstr "" + +#: GuiRingPlayerStats.py:63 +msgid "" +"Turn Aggression\n" +"% Bet or Raise after seeing Turn" +msgstr "" + +#: GuiRingPlayerStats.py:64 +msgid "" +"River Aggression\n" +"% Bet or Raise after seeing River" +msgstr "" + +#: GuiRingPlayerStats.py:65 +msgid "" +"Coming Soon\n" +"Total % agression" +msgstr "" + +#: GuiRingPlayerStats.py:66 +msgid "Amount won" +msgstr "" + +#: GuiRingPlayerStats.py:67 +msgid "" +"Number of Big Blinds won\n" +"or lost per 100 hands" +msgstr "" + +#: GuiRingPlayerStats.py:68 +msgid "Amount of rake paid" +msgstr "" + +#: GuiRingPlayerStats.py:69 +msgid "" +"Number of Big Blinds won\n" +"or lost per 100 hands\n" +"when excluding rake" +msgstr "" + +#: GuiRingPlayerStats.py:70 +msgid "" +"Measure of uncertainty\n" +"The lower, the more stable the amounts won" +msgstr "" + +#: GuiRingPlayerStats.py:338 GuiSessionViewer.py:257 +#: GuiTourneyPlayerStats.py:243 +msgid "Stats page displayed in %4.2f seconds" +msgstr "" + +#: GuiRingPlayerStats.py:385 +msgid "***sortnums error: " +msgstr "" + +#: GuiRingPlayerStats.py:407 +msgid "***sortcols error: " +msgstr "" + +#: GuiRingPlayerStats.py:703 +msgid "Detailed Filters" +msgstr "" + +#: GuiRingPlayerStats.py:712 +msgid "Hand Filters:" +msgstr "" + +#: GuiRingPlayerStats.py:725 +msgid "between" +msgstr "" + +#: GuiRingPlayerStats.py:726 +msgid "and" +msgstr "" + +#: GuiSessionViewer.py:42 +msgid "Failed to load numpy and/or matplotlib in Session Viewer" +msgstr "" + +#: GuiSessionViewer.py:43 +msgid "ImportError: %s" +msgstr "" + +#: GuiSessionViewer.py:81 +msgid "Hand Breakdown for all levels listed above" +msgstr "" + +#: GuiSessionViewer.py:158 +msgid "Session Viewer is proof of concept code only, and contains many bugs.\n" +msgstr "" + +#: GuiSessionViewer.py:159 +msgid "" +"Feel free to use the viewer, but there is no guarantee that the data is " +"accurate.\n" +msgstr "" + +#: GuiSessionViewer.py:160 +msgid "" +"If you are interested in developing the code further please contact us via " +"the usual channels.\n" +msgstr "" + +#: GuiSessionViewer.py:161 +msgid "Thankyou" +msgstr "" + +#: GuiSessionViewer.py:164 GuiStove.py:70 fpdb.pyw:1286 +msgid "FPDB WARNING" +msgstr "" + +#: GuiSessionViewer.py:393 +msgid "Session candlestick graph" +msgstr "" + +#: GuiSessionViewer.py:396 +msgid "Sessions" +msgstr "" + +#: GuiStove.py:63 +msgid "" +"Stove is a GUI mockup of a EV calculation page, and completely non " +"functional.\n" +msgstr "" + +#: GuiStove.py:64 +msgid "" +"Unless you are interested in developing this feature, please ignore this " +"page.\n" +msgstr "" + +#: GuiStove.py:65 +msgid "" +"If you are interested in developing the code further see GuiStove.py and " +"Stove.py\n" +msgstr "" + +#: GuiStove.py:66 +msgid "Thank you" +msgstr "" + +#: GuiTourneyGraphViewer.py:178 +msgid "Tournaments" +msgstr "" + +#: GuiTourneyGraphViewer.py:205 GuiTourneyGraphViewer.py:218 +msgid "" +"Tournaments: %d\n" +"Profit: $%.2f" +msgstr "" + +#: GuiTourneyGraphViewer.py:215 +msgid "Tournament Results" +msgstr "" + +#: GuiTourneyImport.py:72 GuiTourneyImport.py:290 +msgid "" +"GuiTourneyImport.load done: Stored: %d\tErrors: %d in %s seconds - %.0f/sec" +msgstr "" + +#: GuiTourneyImport.py:175 fpdb_import.py:223 +msgid "Attempted to add non-directory '%s' as an import directory" +msgstr "" + +#: GuiTourneyImport.py:191 +msgid "Tourney Summary Import started at %s - %d files to import." +msgstr "" + +#: GuiTourneyImport.py:217 +msgid "TourneyImport: Removing text < 100 characters from end of file" +msgstr "" + +#: GuiTourneyImport.py:221 +msgid "TourneyImport: Removing text < 100 characters from start of file" +msgstr "" + +#: GuiTourneyImport.py:231 +msgid "Finished importing %s/%s tournament summaries" +msgstr "" + +#: GuiTourneyImport.py:252 +msgid "GTI.readFile: '%s'" +msgstr "" + +#: GuiTourneyImport.py:271 ImapFetcher.py:176 +msgid "Need to define a converter" +msgstr "" + +#: GuiTourneyImport.py:278 +msgid "Need a filename to import" +msgstr "" + +#: GuiTourneyPlayerStats.py:75 +msgid "_Refresh Stats" +msgstr "" + +#: GuiTourneyViewer.py:40 +msgid "Enter the tourney number you want to display:" +msgstr "" + +#: GuiTourneyViewer.py:46 +msgid "_Display" +msgstr "" + +#: GuiTourneyViewer.py:53 +msgid "Display _Player" +msgstr "" + +#: GuiTourneyViewer.py:68 +msgid "" +"Tournament not found - please ensure you imported it and selected the " +"correct site" +msgstr "" + +#: GuiTourneyViewer.py:96 +msgid "" +"Player or tourney not found - please ensure you imported it and selected the " +"correct site" +msgstr "" + +#: GuiTourneyViewer.py:110 +msgid "N/A" +msgstr "" + +#: GuiTourneyViewer.py:131 +msgid "invalid entry in tourney number - must enter numbers only" +msgstr "" + +#: HUD_main.pyw:282 +msgid "Table \"%s\" no longer exists\n" +msgstr "" + +#: HUD_main.pyw:314 +msgid "Error resizing HUD for table: %s." +msgstr "" + +#: HUD_main.pyw:328 +msgid "Error killing HUD for table: %s." +msgstr "" + +#: HUD_main.pyw:351 +msgid "Error creating HUD for hand %s." +msgstr "" + +#: HUD_main.pyw:362 +msgid "Error updating HUD for hand %s." +msgstr "" + +#: HUD_run_me.py:45 +msgid "HUD_main starting\n" +msgstr "" + +#: HUD_run_me.py:51 TournamentTracker.py:306 +msgid "Using db name = %s\n" +msgstr "" + +#: HUD_run_me.py:62 +msgid "Closing this window will exit from the HUD." +msgstr "" + +#: HUD_run_me.py:66 +msgid "HUD Main Window" +msgstr "Ventana principal del HUD" + +#: Hand.py:145 +msgid "BB" +msgstr "" + +#: Hand.py:146 +msgid "SB" +msgstr "" + +#: Hand.py:147 +msgid "BUTTONPOS" +msgstr "" + +#: Hand.py:148 +msgid "HAND NO." +msgstr "" + +#: Hand.py:149 TourneySummary.py:131 +msgid "SITE" +msgstr "" + +#: Hand.py:150 +msgid "TABLE NAME" +msgstr "" + +#: Hand.py:151 TourneySummary.py:141 +msgid "HERO" +msgstr "" + +#: Hand.py:152 TourneySummary.py:142 +msgid "MAXSEATS" +msgstr "" + +#: Hand.py:153 +msgid "LEVEL" +msgstr "" + +#: Hand.py:154 TourneySummary.py:147 +msgid "MIXED" +msgstr "" + +#: Hand.py:155 +msgid "LASTBET" +msgstr "" + +#: Hand.py:156 +msgid "ACTION STREETS" +msgstr "" + +#: Hand.py:157 +msgid "STREETS" +msgstr "" + +#: Hand.py:158 +msgid "ALL STREETS" +msgstr "" + +#: Hand.py:159 +msgid "COMMUNITY STREETS" +msgstr "" + +#: Hand.py:160 +msgid "HOLE STREETS" +msgstr "" + +#: Hand.py:161 +msgid "COUNTED SEATS" +msgstr "" + +#: Hand.py:162 +msgid "DEALT" +msgstr "" + +#: Hand.py:163 +msgid "SHOWN" +msgstr "" + +#: Hand.py:164 +msgid "MUCKED" +msgstr "" + +#: Hand.py:165 +msgid "TOTAL POT" +msgstr "" + +#: Hand.py:166 +msgid "TOTAL COLLECTED" +msgstr "" + +#: Hand.py:167 +msgid "RAKE" +msgstr "" + +#: Hand.py:168 TourneySummary.py:132 +msgid "START TIME" +msgstr "" + +#: Hand.py:169 +msgid "TOURNAMENT NO" +msgstr "" + +#: Hand.py:170 TourneySummary.py:137 +msgid "TOURNEY ID" +msgstr "" + +#: Hand.py:171 TourneySummary.py:136 +msgid "TOURNEY TYPE ID" +msgstr "" + +#: Hand.py:172 TourneySummary.py:138 +msgid "BUYIN" +msgstr "" + +#: Hand.py:173 +msgid "BUYIN CURRENCY" +msgstr "" + +#: Hand.py:174 +msgid "BUYIN CHIPS" +msgstr "" + +#: Hand.py:175 TourneySummary.py:139 +msgid "FEE" +msgstr "" + +#: Hand.py:176 +msgid "IS REBUY" +msgstr "" + +#: Hand.py:177 +msgid "IS ADDON" +msgstr "" + +#: Hand.py:178 +msgid "IS KO" +msgstr "" + +#: Hand.py:179 TourneySummary.py:163 +msgid "KO BOUNTY" +msgstr "" + +#: Hand.py:180 +msgid "IS MATRIX" +msgstr "" + +#: Hand.py:181 +msgid "IS SHOOTOUT" +msgstr "" + +#: Hand.py:182 TourneySummary.py:164 +msgid "TOURNEY COMMENT" +msgstr "" + +#: Hand.py:185 TourneySummary.py:176 +msgid "PLAYERS" +msgstr "" + +#: Hand.py:186 +msgid "STACKS" +msgstr "" + +#: Hand.py:187 +msgid "POSTED" +msgstr "" + +#: Hand.py:188 +msgid "POT" +msgstr "" + +#: Hand.py:189 +msgid "SEATING" +msgstr "" + +#: Hand.py:190 +msgid "GAMETYPE" +msgstr "" + +#: Hand.py:191 +msgid "ACTION" +msgstr "" + +#: Hand.py:192 +msgid "COLLECTEES" +msgstr "" + +#: Hand.py:193 +msgid "BETS" +msgstr "" + +#: Hand.py:194 +msgid "BOARD" +msgstr "" + +#: Hand.py:195 +msgid "DISCARDS" +msgstr "" + +#: Hand.py:196 +msgid "HOLECARDS" +msgstr "" + +#: Hand.py:197 +msgid "TOURNEYS PLAYER IDS" +msgstr "" + +#: Hand.py:220 Hand.py:1360 +msgid "[ERROR] Tried to add holecards for unknown player: %s" +msgstr "" + +#: Hand.py:287 +msgid "Hand.insert(): hid #: %s is a duplicate" +msgstr "" + +#: Hand.py:455 +msgid "markstreets didn't match - Assuming hand %s was cancelled" +msgstr "" + +#: Hand.py:457 +msgid "FpdbParseError: markStreets appeared to fail: First 100 chars: '%s'" +msgstr "" + +#: Hand.py:461 +msgid "DEBUG: checkPlayerExists %s fail on hand number %s" +msgstr "" + +#: Hand.py:462 +msgid "checkPlayerExists: '%s fail on hand number %s" +msgstr "" + +#: Hand.py:549 +msgid "%s %s calls %s" +msgstr "" + +#: Hand.py:619 +msgid "%s %s raise %s" +msgstr "" + +#: Hand.py:630 +msgid "%s %s bets %s" +msgstr "" + +#: Hand.py:649 +msgid "%s %s folds" +msgstr "" + +#: Hand.py:658 +msgid "%s %s checks" +msgstr "" + +#: Hand.py:678 +msgid "addShownCards %s hole=%s all=%s" +msgstr "" + +#: Hand.py:789 +msgid "" +"*** ERROR - HAND: calling writeGameLine with unexpected STARTTIME value, " +"expecting datetime.date object, received:" +msgstr "" + +#: Hand.py:790 +msgid "" +"*** Make sure your HandHistoryConverter is setting hand.startTime properly!" +msgstr "" + +#: Hand.py:791 +msgid "*** Game String:" +msgstr "" + +#: Hand.py:872 +msgid "HoldemOmahaHand.__init__:Neither HHC nor DB+handid provided" +msgstr "" + +#: Hand.py:1228 +msgid "*** DEALING HANDS ***" +msgstr "" + +#: Hand.py:1233 +msgid "Dealt to %s: [%s]" +msgstr "" + +#: Hand.py:1238 +msgid "*** FIRST DRAW ***" +msgstr "" + +#: Hand.py:1248 +msgid "*** SECOND DRAW ***" +msgstr "" + +#: Hand.py:1258 +msgid "*** THIRD DRAW ***" +msgstr "" + +#: Hand.py:1268 Hand.py:1487 +msgid "*** SHOW DOWN ***" +msgstr "" + +#: Hand.py:1283 Hand.py:1502 +msgid "*** SUMMARY ***" +msgstr "" + +#: Hand.py:1369 +msgid "%s %s completes %s" +msgstr "" + +#: Hand.py:1387 +msgid "Bringin: %s, %s" +msgstr "" + +#: Hand.py:1427 +msgid "*** 3RD STREET ***" +msgstr "" + +#: Hand.py:1441 +msgid "*** 4TH STREET ***" +msgstr "" + +#: Hand.py:1453 +msgid "*** 5TH STREET ***" +msgstr "" + +#: Hand.py:1465 +msgid "*** 6TH STREET ***" +msgstr "" + +#: Hand.py:1475 +msgid "*** RIVER ***" +msgstr "" + +#: Hand.py:1567 +msgid "" +"join_holecards: # of holecards should be either < 4, 4 or 7 - 5 and 6 should " +"be impossible for anyone who is not a hero" +msgstr "" + +#: Hand.py:1568 +msgid "join_holcards: holecards(%s): %s" +msgstr "" + +#: Hand.py:1570 +msgid "join_holecards: Player '%s' appears not to have been dealt a card" +msgstr "" + +#: Hand.py:1660 +msgid "DEBUG: call Pot.end() before printing pot total" +msgstr "" + +#: Hand.py:1662 +msgid "FpdbError in printing Hand object" +msgstr "" + +#: HandHistoryConverter.py:130 +msgid "Failed sanity check" +msgstr "" + +#: HandHistoryConverter.py:138 +msgid "Tailing '%s'" +msgstr "" + +#: HandHistoryConverter.py:145 +msgid "HHC.start(follow): processHand failed: Exception msg: '%s'" +msgstr "" + +#: HandHistoryConverter.py:149 +msgid "handsList is " +msgstr "" + +#: HandHistoryConverter.py:160 +msgid "HHC.start(): processHand failed: Exception msg: '%s'" +msgstr "" + +#: HandHistoryConverter.py:164 +msgid "Read %d hands (%d failed) in %.3f seconds" +msgstr "" + +#: HandHistoryConverter.py:170 +msgid "Summary file '%s' correctly parsed (took %.3f seconds)" +msgstr "" + +#: HandHistoryConverter.py:172 +msgid "Error converting summary file '%s' (took %.3f seconds)" +msgstr "" + +#: HandHistoryConverter.py:175 +msgid "Error converting '%s'" +msgstr "" + +#: HandHistoryConverter.py:206 +msgid "%s changed inode numbers from %d to %d" +msgstr "" + +#: HandHistoryConverter.py:254 +msgid "Converting starsArchive format to readable" +msgstr "" + +#: HandHistoryConverter.py:259 +msgid "Converting ftpArchive format to readable" +msgstr "" + +#: HandHistoryConverter.py:265 +msgid "Read no hands." +msgstr "" + +#: HandHistoryConverter.py:273 +msgid "Removing text < 50 characters" +msgstr "" + +#: HandHistoryConverter.py:481 +msgid "HH Sanity Check: output and input files are the same, check config" +msgstr "" + +#: HandHistoryConverter.py:504 +msgid "Reading stdin with %s" +msgstr "" + +#: HandHistoryConverter.py:519 +msgid "unable to read file with any codec in list!" +msgstr "" + +#: HandHistoryConverter.py:586 +msgid " given TZ:" +msgstr "" + +#: HandHistoryConverter.py:586 +msgid "raw time:" +msgstr "" + +#: HandHistoryConverter.py:596 +msgid "changeTimeZone: offset=" +msgstr "" + +#: HandHistoryConverter.py:659 +msgid "utcTime:" +msgstr "" + +#: HandHistoryConverter.py:708 +msgid "Unable to create output directory %s for HHC!" +msgstr "" + +#: HandHistoryConverter.py:709 +msgid "*** ERROR: UNABLE TO CREATE OUTPUT DIRECTORY" +msgstr "" + +#: HandHistoryConverter.py:711 +msgid "Created directory '%s'" +msgstr "" + +#: HandHistoryConverter.py:715 +msgid "out_path %s couldn't be opened" +msgstr "" + +#: Hello.py:46 +msgid "creating Hello" +msgstr "" + +#: Hello.py:49 +msgid "Hello World" +msgstr "" + +#: Hello.py:67 +msgid "site =" +msgstr "" + +#: Hello.py:75 +msgid "YOUR NAME HERE" +msgstr "" + +#: Hello.py:106 +msgid "" +"Hello %s\n" +"You have played %d hands\n" +" on %s." +msgstr "" + +#: Hud.py:148 +msgid "Kill This HUD" +msgstr "" + +#: Hud.py:153 +msgid "Save HUD Layout" +msgstr "" + +#: Hud.py:157 +msgid "Reposition StatWindows" +msgstr "" + +#: Hud.py:161 +msgid "Show Player Stats" +msgstr "" + +#: Hud.py:166 Hud.py:235 +msgid "For This Blind Level Only" +msgstr "" + +#: Hud.py:171 Hud.py:240 +msgid "For Multiple Blind Levels:" +msgstr "" + +#: Hud.py:174 Hud.py:243 +msgid " 0.5 to 2.0 x Current Blinds" +msgstr "" + +#: Hud.py:179 Hud.py:248 +msgid " 0.33 to 3.0 x Current Blinds" +msgstr "" + +#: Hud.py:184 Hud.py:253 +msgid " 0.1 to 10 x Current Blinds" +msgstr "" + +#: Hud.py:189 Hud.py:258 +msgid " All Levels" +msgstr "" + +#: Hud.py:194 Hud.py:263 +msgid "For #Seats:" +msgstr "" + +#: Hud.py:197 Hud.py:266 +msgid " Any Number" +msgstr "" + +#: Hud.py:202 Hud.py:271 +msgid " Custom" +msgstr "" + +#: Hud.py:207 Hud.py:276 +msgid " Exact" +msgstr "" + +#: Hud.py:212 Hud.py:281 +msgid "Since:" +msgstr "" + +#: Hud.py:215 Hud.py:284 +msgid " All Time" +msgstr "" + +#: Hud.py:220 Hud.py:289 +msgid " Session" +msgstr "" + +#: Hud.py:225 Hud.py:294 +msgid " %s Days" +msgstr "" + +#: Hud.py:230 +msgid "Show Opponent Stats" +msgstr "" + +#: Hud.py:352 +msgid "Debug StatWindows" +msgstr "" + +#: Hud.py:356 +msgid "Set max seats" +msgstr "" + +#: Hud.py:577 +msgid "Updating config file" +msgstr "" + +#: Hud.py:586 +msgid "No layout found for %d-max games for site %s\n" +msgstr "" + +#: Hud.py:600 +msgid "" +"exception in Hud.adj_seats\n" +"\n" +msgstr "" + +#: Hud.py:601 +msgid "error is %s" +msgstr "" + +#: Hud.py:608 +msgid "Error finding actual seat.\n" +msgstr "" + +#: Hud.py:624 +msgid "Creating hud from hand " +msgstr "" + +#: Hud.py:673 +msgid "" +"KeyError at the start of the for loop in update in hud_main. How this can " +"possibly happen is totally beyond my comprehension. Your HUD may be about to " +"get really weird. -Eric" +msgstr "" + +#: Hud.py:674 +msgid "(btw, the key was %s and statd is %s" +msgstr "" + +#: ImapFetcher.py:44 ImapFetcher.py:53 +msgid "DEBUG: re_SplitTourneys isn't matching" +msgstr "" + +#: ImapFetcher.py:67 +msgid "response to logging in:" +msgstr "" + +#: ImapFetcher.py:83 +msgid "ImapFetcher: Found %s messages to fetch" +msgstr "" + +#: ImapFetcher.py:103 +msgid "Completed retrieving IMAP messages, closing server connection" +msgstr "" + +#: ImapFetcher.py:109 +msgid "No Tournament summaries found." +msgstr "" + +#: ImapFetcher.py:159 +msgid "Finished importing %s/%s PS summaries" +msgstr "" + +#: Mucked.py:327 +msgid "No Name" +msgstr "" + +#: OnGameToFpdb.py:173 WinamaxToFpdb.py:190 +msgid "determineGameType: limit not found in self.limits(%s). hand: '%s'" +msgstr "" + +#: OnGameToFpdb.py:175 WinamaxToFpdb.py:192 +msgid "limit not found in self.limits(%s). hand: '%s'" +msgstr "" + +#: OnGameToFpdb.py:262 PartyPokerToFpdb.py:354 PokerStarsToFpdb.py:317 +#: Win2dayToFpdb.py:162 WinamaxToFpdb.py:323 +msgid "readButton: not found" +msgstr "" + +#: OnGameToFpdb.py:281 WinamaxToFpdb.py:343 +msgid "readBlinds in noSB exception - no SB created" +msgstr "" + +#: Options.py:31 +msgid "If passed error output will go to the console rather than ." +msgstr "" + +#: Options.py:34 +msgid "Overrides the default database name" +msgstr "" + +#: Options.py:37 +msgid "Specifies a configuration file." +msgstr "" + +#: Options.py:40 +msgid "" +"Indicates program was restarted with a different path (only allowed once)." +msgstr "" + +#: Options.py:43 +msgid "Module name for Hand History Converter" +msgstr "" + +#: Options.py:46 +msgid "A sitename" +msgstr "" + +#: Options.py:50 +msgid "Error logging level:" +msgstr "" + +#: Options.py:53 +msgid "Print version information and exit." +msgstr "" + +#: Options.py:60 +msgid "Input out path in quiet mode" +msgstr "" + +#: Options.py:62 +msgid "File to be split is a PokerStars or Full Tilt Poker archive file" +msgstr "" + +#: Options.py:64 +msgid "How many hands do you want saved to each file. Default is 100" +msgstr "" + +#: Options.py:66 +msgid "X location to open window" +msgstr "" + +#: Options.py:68 +msgid "Y location to open Window" +msgstr "" + +#: Options.py:70 +msgid "Auto-start Auto-import" +msgstr "" + +#: Options.py:72 +msgid "Start Minimized" +msgstr "" + +#: Options.py:74 +msgid "Start Hidden" +msgstr "" + +#: Options.py:116 +msgid "press enter to end" +msgstr "" + +#: P5sResultsParser.py:10 +msgid "You need to manually enter the playername" +msgstr "" + +#: PartyPokerToFpdb.py:213 +msgid "Cannot fetch field '%s'" +msgstr "" + +#: PartyPokerToFpdb.py:217 +msgid "Unknown limit '%s'" +msgstr "" + +#: PartyPokerToFpdb.py:222 +msgid "Unknown game type '%s'" +msgstr "" + +#: PartyPokerToFpdb.py:261 +msgid "Cannot read Handinfo for current hand" +msgstr "" + +#: PartyPokerToFpdb.py:266 +msgid "Cannot read GameType for current hand" +msgstr "" + +#: PartyPokerToFpdb.py:525 +msgid "Unimplemented readAction: '%s' '%s'" +msgstr "" + +#: SplitHandHistory.py:76 +msgid "File not found" +msgstr "" + +#: SplitHandHistory.py:126 +msgid "Unexpected error processing file" +msgstr "" + +#: SplitHandHistory.py:165 +msgid "End of file reached" +msgstr "" + +#: Stats.py:127 Stats.py:128 +msgid "Total Profit" +msgstr "" + +#: Stats.py:149 Stats.py:156 +msgid "Voluntarily Put In Pot Pre-Flop%" +msgstr "" + +#: Stats.py:169 Stats.py:177 +msgid "Pre-Flop Raise %" +msgstr "" + +#: Stats.py:190 Stats.py:198 +msgid "% went to showdown" +msgstr "" + +#: Stats.py:211 Stats.py:219 +msgid "% won money at showdown" +msgstr "" + +#: Stats.py:234 Stats.py:243 +msgid "profit/100hands" +msgstr "" + +#: Stats.py:237 +msgid "exception calcing p/100: 100 * %d / %d" +msgstr "" + +#: Stats.py:256 Stats.py:265 +msgid "big blinds/100 hands" +msgstr "" + +#: Stats.py:278 Stats.py:287 +msgid "Big Bets/100 hands" +msgstr "" + +#: Stats.py:281 +msgid "exception calcing BB/100: " +msgstr "" + +#: Stats.py:301 Stats.py:310 +msgid "Flop Seen %" +msgstr "" + +#: Stats.py:333 Stats.py:342 +msgid "number hands seen" +msgstr "" + +#: Stats.py:355 Stats.py:363 +msgid "folded flop/4th" +msgstr "" + +#: Stats.py:376 +msgid "% steal attempted" +msgstr "" + +#: Stats.py:391 Stats.py:398 +msgid "% folded SB to steal" +msgstr "" + +#: Stats.py:410 Stats.py:417 +msgid "% folded BB to steal" +msgstr "" + +#: Stats.py:432 Stats.py:439 +msgid "% folded blind to steal" +msgstr "" + +#: Stats.py:451 +msgid "% 4 Bet preflop/3rd" +msgstr "" + +#: Stats.py:458 +msgid "% 3 Bet preflop/3rd" +msgstr "" + +#: Stats.py:470 Stats.py:477 +msgid "% 4 Bet preflop/4rd" +msgstr "" + +#: Stats.py:489 Stats.py:496 +msgid "% Fold to 3 Bet preflop" +msgstr "" + +#: Stats.py:508 Stats.py:515 +msgid "% Fold to 4 Bet preflop" +msgstr "" + +#: Stats.py:529 Stats.py:536 +msgid "% won$/saw flop/4th" +msgstr "" + +#: Stats.py:548 Stats.py:555 +msgid "Aggression Freq flop/4th" +msgstr "" + +#: Stats.py:567 Stats.py:574 +msgid "Aggression Freq turn/5th" +msgstr "" + +#: Stats.py:586 Stats.py:593 +msgid "Aggression Freq river/6th" +msgstr "" + +#: Stats.py:605 Stats.py:612 +msgid "Aggression Freq 7th" +msgstr "" + +#: Stats.py:631 Stats.py:638 +msgid "Post-Flop Aggression Freq" +msgstr "" + +#: Stats.py:659 Stats.py:666 +msgid "Aggression Freq" +msgstr "" + +#: Stats.py:685 Stats.py:692 +msgid "Aggression Factor" +msgstr "" + +#: Stats.py:709 Stats.py:716 +msgid "% continuation bet " +msgstr "" + +#: Stats.py:728 Stats.py:735 +msgid "% continuation bet flop/4th" +msgstr "" + +#: Stats.py:747 Stats.py:754 +msgid "% continuation bet turn/5th" +msgstr "" + +#: Stats.py:766 Stats.py:773 +msgid "% continuation bet river/6th" +msgstr "" + +#: Stats.py:785 Stats.py:792 +msgid "% continuation bet 7th" +msgstr "" + +#: Stats.py:804 Stats.py:811 +msgid "% fold frequency flop/4th" +msgstr "" + +#: Stats.py:823 Stats.py:830 +msgid "% fold frequency turn/5th" +msgstr "" + +#: Stats.py:842 Stats.py:849 +msgid "% fold frequency river/6th" +msgstr "" + +#: Stats.py:861 Stats.py:868 +msgid "% fold frequency 7th" +msgstr "" + +#: Stats.py:888 +msgid "Example stats, player = %s hand = %s:" +msgstr "" + +#: Stats.py:921 +msgid "" +"\n" +"\n" +"Legal stats:" +msgstr "" + +#: Stats.py:922 +msgid "" +"(add _0 to name to display with 0 decimal places, _1 to display with 1, " +"etc)\n" +msgstr "" + +#: Stove.py:290 +msgid "No board given. Using Monte-Carlo simulation..." +msgstr "" + +#: Tables_Demo.py:61 +msgid "Fake HUD Main Window" +msgstr "" + +#: Tables_Demo.py:91 +msgid "enter table name to find: " +msgstr "" + +#: TournamentTracker.py:39 +msgid "" +"Note: error output is being diverted to fpdb-error-log.txt and HUD-error." +"txt. Any major error will be reported there _only_." +msgstr "" + +#: TournamentTracker.py:100 +msgid "tournament edit window=" +msgstr "" + +#: TournamentTracker.py:103 +msgid "FPDB Tournament Entry" +msgstr "" + +#: TournamentTracker.py:143 +msgid "Closing this window will stop the Tournament Tracker" +msgstr "" + +#: TournamentTracker.py:145 +msgid "Enter Tournament" +msgstr "" + +#: TournamentTracker.py:150 +msgid "FPDB Tournament Tracker" +msgstr "" + +#: TournamentTracker.py:161 +msgid "Edit" +msgstr "" + +#: TournamentTracker.py:164 +msgid "Rebuy" +msgstr "" + +#: TournamentTracker.py:263 +msgid "db error: skipping " +msgstr "" + +#: TournamentTracker.py:265 +msgid "Database error %s in hand %d. Skipping.\n" +msgstr "" + +#: TournamentTracker.py:274 +msgid "could not find tournament: skipping" +msgstr "" + +#: TournamentTracker.py:275 +msgid "Could not find tournament %d in hand %d. Skipping.\n" +msgstr "" + +#: TournamentTracker.py:298 +msgid "table name %s not found, skipping.\n" +msgstr "" + +#: TournamentTracker.py:305 +msgid "tournament tracker starting\n" +msgstr "" + +#: TourneyFilters.py:52 +msgid "Tourney Type" +msgstr "" + +#: TourneyFilters.py:79 +msgid "setting numTourneys:" +msgstr "" + +#: TourneySummary.py:133 +msgid "END TIME" +msgstr "" + +#: TourneySummary.py:134 +msgid "TOURNEY NAME" +msgstr "" + +#: TourneySummary.py:135 +msgid "TOURNEY NO" +msgstr "" + +#: TourneySummary.py:140 +msgid "CURRENCY" +msgstr "" + +#: TourneySummary.py:143 +msgid "ENTRIES" +msgstr "" + +#: TourneySummary.py:144 +msgid "SPEED" +msgstr "" + +#: TourneySummary.py:145 +msgid "PRIZE POOL" +msgstr "" + +#: TourneySummary.py:146 +msgid "STARTING CHIP COUNT" +msgstr "" + +#: TourneySummary.py:148 +msgid "REBUY" +msgstr "" + +#: TourneySummary.py:149 +msgid "ADDON" +msgstr "" + +#: TourneySummary.py:150 +msgid "KO" +msgstr "" + +#: TourneySummary.py:151 +msgid "MATRIX" +msgstr "" + +#: TourneySummary.py:152 +msgid "MATRIX ID PROCESSED" +msgstr "" + +#: TourneySummary.py:153 +msgid "SHOOTOUT" +msgstr "" + +#: TourneySummary.py:154 +msgid "MATRIX MATCH ID" +msgstr "" + +#: TourneySummary.py:155 +msgid "SUB TOURNEY BUY IN" +msgstr "" + +#: TourneySummary.py:156 +msgid "SUB TOURNEY FEE" +msgstr "" + +#: TourneySummary.py:157 +msgid "REBUY CHIPS" +msgstr "" + +#: TourneySummary.py:158 +msgid "ADDON CHIPS" +msgstr "" + +#: TourneySummary.py:159 +msgid "REBUY COST" +msgstr "" + +#: TourneySummary.py:160 +msgid "ADDON COST" +msgstr "" + +#: TourneySummary.py:161 +msgid "TOTAL REBUYS" +msgstr "" + +#: TourneySummary.py:162 +msgid "TOTAL ADDONS" +msgstr "" + +#: TourneySummary.py:165 +msgid "SNG" +msgstr "" + +#: TourneySummary.py:166 +msgid "SATELLITE" +msgstr "" + +#: TourneySummary.py:167 +msgid "DOUBLE OR NOTHING" +msgstr "" + +#: TourneySummary.py:168 +msgid "GUARANTEE" +msgstr "" + +#: TourneySummary.py:169 +msgid "ADDED" +msgstr "" + +#: TourneySummary.py:170 +msgid "ADDED CURRENCY" +msgstr "" + +#: TourneySummary.py:171 +msgid "COMMENT" +msgstr "" + +#: TourneySummary.py:172 +msgid "COMMENT TIMESTAMP" +msgstr "" + +#: TourneySummary.py:175 +msgid "PLAYER IDS" +msgstr "" + +#: TourneySummary.py:177 +msgid "TOURNEYS PLAYERS IDS" +msgstr "" + +#: TourneySummary.py:178 +msgid "RANKS" +msgstr "" + +#: TourneySummary.py:179 +msgid "WINNINGS" +msgstr "" + +#: TourneySummary.py:180 +msgid "WINNINGS CURRENCY" +msgstr "" + +#: TourneySummary.py:181 +msgid "COUNT REBUYS" +msgstr "" + +#: TourneySummary.py:182 +msgid "COUNT ADDONS" +msgstr "" + +#: TourneySummary.py:183 +msgid "NB OF KO" +msgstr "" + +#: TourneySummary.py:230 +msgid "Tourney Insert/Update done" +msgstr "" + +#: TourneySummary.py:250 +msgid "addPlayer: rank:%s - name : '%s' - Winnings (%s)" +msgstr "" + +#: TourneySummary.py:277 +msgid "incrementPlayerWinnings: name : '%s' - Add Winnings (%s)" +msgstr "" + +#: TreeViewTooltips.py:108 +msgid "" +"This module was developed and tested with version 2.8.18 of gtk. You are " +"using version %d.%d.%d. Your milage may vary." +msgstr "" + +#: WinTables.py:73 +msgid "self.window doesn't exist? why?" +msgstr "" + +#: WinamaxToFpdb.py:262 +msgid "failed to detect currency" +msgstr "" + +#: WinamaxToFpdb.py:311 +msgid "Failed to add streets. handtext=%s" +msgstr "" + +#: fpdb.pyw:38 +msgid " - press return to continue\n" +msgstr "" + +#: fpdb.pyw:45 +msgid "" +"\n" +"python 2.5-2.7 not found, please install python 2.5, 2.6 or 2.7 for fpdb\n" +msgstr "" + +#: fpdb.pyw:46 fpdb.pyw:58 fpdb.pyw:80 +msgid "Press ENTER to continue." +msgstr "" + +#: fpdb.pyw:57 +msgid "" +"We appear to be running in Windows, but the Windows Python Extensions are " +"not loading. Please install the PYWIN32 package from http://sourceforge.net/" +"projects/pywin32/" +msgstr "" + +#: fpdb.pyw:79 +msgid "" +"Unable to load PyGTK modules required for GUI. Please install PyCairo, " +"PyGObject, and PyGTK from www.pygtk.org." +msgstr "" + +#: fpdb.pyw:244 +msgid "" +"Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " +"sqlcoder, Bostik, and others" +msgstr "" + +#: fpdb.pyw:245 +msgid "" +"You are free to change, and distribute original or changed versions of fpdb " +"within the rules set out by the license" +msgstr "" + +#: fpdb.pyw:246 +msgid "Please see fpdb's start screen for license information" +msgstr "" + +#: fpdb.pyw:250 +msgid "and others" +msgstr "" + +#: fpdb.pyw:256 +msgid "Operating System" +msgstr "" + +#: fpdb.pyw:277 +msgid "Your config file is: " +msgstr "" + +#: fpdb.pyw:282 +msgid "Version Information:" +msgstr "" + +#: fpdb.pyw:289 +msgid "Threads: " +msgstr "" + +#: fpdb.pyw:312 +msgid "" +"Updated preferences have not been loaded because windows are open. Re-start " +"fpdb to load them." +msgstr "" + +#: fpdb.pyw:322 +msgid "Maintain Databases" +msgstr "" + +#: fpdb.pyw:332 +msgid "saving updated db data" +msgstr "" + +#: fpdb.pyw:339 +msgid "guidb response was " +msgstr "" + +#: fpdb.pyw:345 +msgid "" +"Cannot open Database Maintenance window because other windows have been " +"opened. Re-start fpdb to use this option." +msgstr "" + +#: fpdb.pyw:348 +msgid "Number of Hands: " +msgstr "" + +#: fpdb.pyw:349 +msgid "" +"\n" +"Number of Tourneys: " +msgstr "" + +#: fpdb.pyw:350 +msgid "" +"\n" +"Number of TourneyTypes: " +msgstr "" + +#: fpdb.pyw:351 +msgid "Database Statistics" +msgstr "" + +#: fpdb.pyw:360 +msgid "HUD Configurator - choose category" +msgstr "" + +#: fpdb.pyw:366 +msgid "" +"Please select the game category for which you want to configure HUD stats:" +msgstr "" + +#: fpdb.pyw:418 +msgid "HUD Configurator - please choose your stats" +msgstr "" + +#: fpdb.pyw:424 +msgid "Please choose the stats you wish to use in the below table." +msgstr "" + +#: fpdb.pyw:428 +msgid "Note that you may not select any stat more than once or it will crash." +msgstr "" + +#: fpdb.pyw:432 +msgid "" +"It is not currently possible to select \"empty\" or anything else to that " +"end." +msgstr "" + +#: fpdb.pyw:436 +msgid "" +"To configure things like colouring you will still have to use the " +"Preferences dialogue or manually edit your HUD_config.xml." +msgstr "" + +#: fpdb.pyw:543 +msgid "Confirm deleting and recreating tables" +msgstr "" + +#: fpdb.pyw:544 +msgid "Please confirm that you want to (re-)create the tables." +msgstr "" + +#: fpdb.pyw:545 +msgid "" +" If there already are tables in the database %s on %s they will be deleted " +"and you will have to re-import your histories.\n" +msgstr "" + +#: fpdb.pyw:546 +msgid "This may take a while." +msgstr "" + +#: fpdb.pyw:571 +msgid "User cancelled recreating tables" +msgstr "" + +#: fpdb.pyw:578 +msgid "Please confirm that you want to re-create the HUD cache." +msgstr "" + +#: fpdb.pyw:586 +msgid " Hero's cache starts: " +msgstr "" + +#: fpdb.pyw:600 +msgid " Villains' cache starts: " +msgstr "" + +#: fpdb.pyw:613 +msgid " Rebuilding HUD Cache ... " +msgstr "" + +#: fpdb.pyw:621 +msgid "User cancelled rebuilding hud cache" +msgstr "" + +#: fpdb.pyw:633 +msgid "Confirm rebuilding database indexes" +msgstr "" + +#: fpdb.pyw:634 +msgid "Please confirm that you want to rebuild the database indexes." +msgstr "" + +#: fpdb.pyw:642 +msgid " Rebuilding Indexes ... " +msgstr "" + +#: fpdb.pyw:649 +msgid " Cleaning Database ... " +msgstr "" + +#: fpdb.pyw:654 +msgid " Analyzing Database ... " +msgstr "" + +#: fpdb.pyw:659 +msgid "User cancelled rebuilding db indexes" +msgstr "" + +#: fpdb.pyw:754 +msgid "" +"Unimplemented: Save Profile (try saving a HUD layout, that should do it)" +msgstr "" + +#: fpdb.pyw:809 +msgid "_Main" +msgstr "_Principal" + +#: fpdb.pyw:810 fpdb.pyw:841 +msgid "_Quit" +msgstr "_Salir" + +#: fpdb.pyw:811 +msgid "L" +msgstr "" + +#: fpdb.pyw:811 +msgid "_Load Profile (broken)" +msgstr "_Cargar perfil (roto)" + +#: fpdb.pyw:812 +msgid "S" +msgstr "" + +#: fpdb.pyw:812 +msgid "_Save Profile (todo)" +msgstr "_Guardar perfil (todo)" + +#: fpdb.pyw:813 +msgid "F" +msgstr "" + +#: fpdb.pyw:813 +msgid "Pre_ferences" +msgstr "Pre_ferencias" + +#: fpdb.pyw:814 +msgid "_Import" +msgstr "_Importar" + +#: fpdb.pyw:815 +msgid "B" +msgstr "" + +#: fpdb.pyw:816 +msgid "R" +msgstr "" + +#: fpdb.pyw:816 +msgid "Tournament _Results Import" +msgstr "Importar _resultados de torneos" + +#: fpdb.pyw:817 +msgid "I" +msgstr "" + +#: fpdb.pyw:817 +msgid "_Import through eMail/IMAP" +msgstr "_Importar a través de eMail/IMAP" + +#: fpdb.pyw:818 +msgid "_Viewers" +msgstr "" + +#: fpdb.pyw:819 +msgid "A" +msgstr "" + +#: fpdb.pyw:819 +msgid "_Auto Import and HUD" +msgstr "" + +#: fpdb.pyw:820 +msgid "H" +msgstr "" + +#: fpdb.pyw:820 +msgid "_HUD Configurator" +msgstr "Configurador del _HUD" + +#: fpdb.pyw:821 +msgid "G" +msgstr "" + +#: fpdb.pyw:821 +msgid "_Graphs" +msgstr "" + +#: fpdb.pyw:822 fpdb.pyw:1097 +msgid "Tourney Graphs" +msgstr "" + +#: fpdb.pyw:823 +msgid "Stove (preview)" +msgstr "" + +#: fpdb.pyw:824 +msgid "P" +msgstr "" + +#: fpdb.pyw:824 +msgid "Ring _Player Stats (tabulated view, not on pgsql)" +msgstr "Estadísticas de Full Ring (vista tabulada, no en postgresql)" + +#: fpdb.pyw:825 +msgid "T" +msgstr "" + +#: fpdb.pyw:825 +msgid "_Tourney Stats (tabulated view, not on pgsql)" +msgstr "" + +#: fpdb.pyw:826 +msgid "Tourney _Viewer" +msgstr "" + +#: fpdb.pyw:827 +msgid "O" +msgstr "" + +#: fpdb.pyw:827 +msgid "P_ositional Stats (tabulated view, not on sqlite)" +msgstr "" + +#: fpdb.pyw:828 fpdb.pyw:1056 +msgid "Session Stats" +msgstr "Estadísticas de la sesión" + +#: fpdb.pyw:829 +msgid "Hand _Replayer (not working yet)" +msgstr "" + +#: fpdb.pyw:830 +msgid "_Database" +msgstr "" + +#: fpdb.pyw:831 +msgid "_Maintain Databases" +msgstr "" + +#: fpdb.pyw:832 +msgid "Create or Recreate _Tables" +msgstr "Crear o recrear _tablas" + +#: fpdb.pyw:833 +msgid "Rebuild HUD Cache" +msgstr "" + +#: fpdb.pyw:834 +msgid "Rebuild DB Indexes" +msgstr "" + +#: fpdb.pyw:835 +msgid "_Statistics" +msgstr "" + +#: fpdb.pyw:836 +msgid "Dump Database to Textfile (takes ALOT of time)" +msgstr "" + +#: fpdb.pyw:837 +msgid "_Help" +msgstr "_Ayuda" + +#: fpdb.pyw:838 +msgid "_Log Messages" +msgstr "_Registro de mensajes" + +#: fpdb.pyw:839 +msgid "A_bout, License, Copying" +msgstr "Acerca de, Licencia, Copia" + +#: fpdb.pyw:857 +msgid "There is an error in your config file\n" +msgstr "" + +#: fpdb.pyw:858 +msgid "" +"\n" +"\n" +"Error is: " +msgstr "" + +#: fpdb.pyw:859 +msgid "CONFIG FILE ERROR" +msgstr "ERROR EN EL ARCHIVO DE CONFIGURACION" + +#: fpdb.pyw:863 +msgid "Logfile is %s\n" +msgstr "Archivo de registro es %s\n" + +#: fpdb.pyw:865 +msgid "Config file" +msgstr "Archivo de configuración" + +#: fpdb.pyw:866 +msgid "" +"has been created at:\n" +"%s.\n" +msgstr "" +"ha sido creado el:\n" +"%s.\n" + +#: fpdb.pyw:867 +msgid "" +"Edit your screen_name and hand history path in the supported_sites section " +"of the Preferences window (Main menu) before trying to import hands." +msgstr "" +"Edita tu screen_name y la ruta del historial de manos en la sección " +"supported_sites de la ventana de Preferencias (Menú principal) antes de " +"intentar importar manos." + +#: fpdb.pyw:889 +msgid "Connected to SQLite: %s" +msgstr "Conectado a SQLite: %s" + +#: fpdb.pyw:923 +msgid "Strong Warning - Invalid database version" +msgstr "Advertencia importante - Versión incorrecta de base de datos" + +#: fpdb.pyw:925 +msgid "An invalid DB version or missing tables have been detected." +msgstr "" +"Una versión incorrecta de la BD o ausencia de tablas ha sido detectada." + +#: fpdb.pyw:929 +msgid "" +"This error is not necessarily fatal but it is strongly recommended that you " +"recreate the tables by using the Database menu." +msgstr "" +"Este error no es fatal necesariamente pero le recomendamos encarecidamente " +"que recree las tablas usando el menú de Bases de Datos." + +#: fpdb.pyw:933 +msgid "" +"Not doing this will likely lead to misbehaviour including fpdb crashes, " +"corrupt data etc." +msgstr "" +"El no hacerlo es favorable a causar extraño comportamiento en fpdb " +"incluyendo bloqueos, corrupción de datos, etc." + +#: fpdb.pyw:947 +msgid "Status: Connected to %s database named %s on host %s" +msgstr "Estado: Conectado a la base de datos %s llamada %s en la máquina %s" + +#: fpdb.pyw:957 +msgid "" +"\n" +"Global lock taken by %s" +msgstr "" +"\n" +"Reloj global usado por %s" + +#: fpdb.pyw:960 +msgid "" +"\n" +"Failed to get global lock, it is currently held by %s" +msgstr "" +"\n" +"Fallo al acceder al reloj global, está siendo utilizado por %s" + +#: fpdb.pyw:970 +msgid "Quitting normally" +msgstr "Saliendo de forma normal" + +#: fpdb.pyw:995 +msgid "Global lock released.\n" +msgstr "" + +#: fpdb.pyw:1002 +msgid "Auto Import" +msgstr "" + +#: fpdb.pyw:1012 +msgid "Bulk Import" +msgstr "Importe masivo" + +#: fpdb.pyw:1019 +msgid "Tournament Results Import" +msgstr "" + +#: fpdb.pyw:1025 +msgid "eMail Import" +msgstr "" + +#: fpdb.pyw:1032 +msgid "Ring Player Stats" +msgstr "" + +#: fpdb.pyw:1038 +msgid "Tourney Stats" +msgstr "" + +#: fpdb.pyw:1044 +msgid "Tourney Viewer" +msgstr "" + +#: fpdb.pyw:1050 +msgid "Positional Stats" +msgstr "" + +#: fpdb.pyw:1062 +msgid "Hand Replayer" +msgstr "" + +#: fpdb.pyw:1066 +#, fuzzy +msgid "" +"Fpdb needs translators!\n" +"If you speak another language and have a few minutes or more to spare get in " +"touch by emailing steffen@schaumburger.info\n" +"\n" +"Welcome to Fpdb!\n" +"To be notified of new snapshots and releases go to https://lists.sourceforge." +"net/lists/listinfo/fpdb-announce and subscribe.\n" +"If you want to follow development more closely go to https://lists." +"sourceforge.net/lists/listinfo/fpdb-main and subscribe.\n" +"\n" +"This program is currently in an alpha-state, so our database format is still " +"sometimes changed.\n" +"You should therefore always keep your hand history files so that you can re-" +"import after an update, if necessary.\n" +"\n" +"For documentation please visit our website/wiki at http://fpdb.sourceforge." +"net/.\n" +"If you need help click on Contact - Get Help on our website.\n" +"Please note that default.conf is no longer needed nor used, all " +"configuration now happens in HUD_config.xml.\n" +"\n" +"This program is free/libre open source software licensed partially under the " +"AGPL3, and partially under GPL2 or later.\n" +"The Windows installer package includes code licensed under the MIT license.\n" +"You can find the full license texts in agpl-3.0.txt, gpl-2.0.txt, gpl-3.0." +"txt and mit.txt in the fpdb installation directory." +msgstr "" +"Fpdb necesita traductores!\n" +"Si hablas otro idioma y tienes unos pocos minutos o más para dedicarle ponte " +"en contacto con steffen@schaumburger.info\n" +"\n" +"Bienvenido a Fpdb!\n" +"Para ser notificado de nuevas versiones entre en https://lists.sourceforge." +"net/lists/listinfo/fpdb-announce y subscribase.\n" +"Si quiere seguir el desarollo más de cerca vaya a https://lists.sourceforge." +"net/lists/listinfo/fpdb-main y subsribase.\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"lala" + +#: fpdb.pyw:1083 +msgid "Help" +msgstr "" + +#: fpdb.pyw:1090 +msgid "Graphs" +msgstr "" + +#: fpdb.pyw:1104 +msgid "Stove" +msgstr "" + +#: fpdb.pyw:1177 +msgid "" +"\n" +"Note: error output is being diverted to fpdb-errors.txt and HUD-errors.txt " +"in: %s" +msgstr "" + +#: fpdb.pyw:1178 +msgid "" +"\n" +"Any major error will be reported there _only_.\n" +msgstr "" + +#: fpdb.pyw:1207 +msgid "fpdb starting ..." +msgstr "fpdb iniciando ..." + +#: fpdb.pyw:1306 +msgid "" +"WARNING: Unable to find output hand history directory %s\n" +"\n" +" Press YES to create this directory, or NO to select a new one." +msgstr "" + +#: fpdb.pyw:1314 +msgid "" +"WARNING: Unable to create hand output directory. Importing is not likely to " +"work until this is fixed." +msgstr "" + +#: fpdb.pyw:1325 +msgid "" +"WARNING: Unable to find site '%s'\n" +"\n" +"Press YES to add this site to the database." +msgstr "" + +#: fpdb.pyw:1341 +msgid "" +"\n" +"Enter short code for %s\n" +"(up to 3 characters):\n" +msgstr "" + +#: fpdb_import.py:51 +msgid "Import database module: MySQLdb not found" +msgstr "" + +#: fpdb_import.py:58 +msgid "Import database module: psycopg2 not found" +msgstr "" + +#: fpdb_import.py:185 +msgid "Database ID for %s not found" +msgstr "" + +#: fpdb_import.py:187 +msgid "" +"[ERROR] More than 1 Database ID found for %s - Multiple currencies not " +"implemented yet" +msgstr "" + +#: fpdb_import.py:233 +msgid "Started at %s -- %d files to import. indexes: %s" +msgstr "" + +#: fpdb_import.py:242 +msgid "No need to drop indexes." +msgstr "" + +#: fpdb_import.py:261 +msgid "writers finished already" +msgstr "" + +#: fpdb_import.py:264 +msgid "waiting for writers to finish ..." +msgstr "" + +#: fpdb_import.py:274 +msgid " ... writers finished" +msgstr "" + +#: fpdb_import.py:280 +msgid "No need to rebuild indexes." +msgstr "" + +#: fpdb_import.py:284 +msgid "No need to rebuild hudcache." +msgstr "" + +#: fpdb_import.py:318 +msgid "sending finish message queue length =" +msgstr "" + +#: fpdb_import.py:445 fpdb_import.py:447 +msgid "Converting %s" +msgstr "" + +#: fpdb_import.py:485 +msgid "Hand processed but empty" +msgstr "" + +#: fpdb_import.py:506 +msgid "fpdb_import: sending hand to hud" +msgstr "" + +#: fpdb_import.py:509 +msgid "Failed to send hand to HUD: %s" +msgstr "" + +#: fpdb_import.py:524 +msgid "Unknown filter filter_name:'%s' in filter:'%s'" +msgstr "" + +#: fpdb_import.py:535 +msgid "" +"Error No.%s please send the hand causing this to fpdb-main@lists.sourceforge." +"net so we can fix the problem." +msgstr "" + +#: fpdb_import.py:536 +msgid "Filename:" +msgstr "" + +#: fpdb_import.py:537 +msgid "" +"Here is the first line of the hand so you can identify it. Please mention " +"that the error was a ValueError:" +msgstr "" + +#: fpdb_import.py:539 +msgid "Hand logged to hand-errors.txt" +msgstr "" + +#: fpdb_import.py:595 +msgid "Importing" +msgstr "" + +#: fpdb_import.py:623 +msgid "CLI for importing hands is GuiBulkImport.py" +msgstr "" + +#: interlocks.py:52 +msgid "lock already held by:" +msgstr "" + +#: test_Database.py:50 +msgid "DEBUG: Testing variance function" +msgstr "" + +#: test_Database.py:51 +msgid "DEBUG: result: %s expecting: 0.666666 (result-expecting ~= 0.0): %s" +msgstr "" + +#: windows_make_bats.py:39 +msgid "" +"\n" +"This script is only for windows\n" +msgstr "" + +#: windows_make_bats.py:66 +msgid "" +"\n" +"no gtk directories found in your path - install gtk or edit the path " +"manually\n" +msgstr "" diff --git a/pyfpdb/regression-test-files/cash/Absolute/Flop/IHH20090610 Chile Way - Hold'em No Limit $0.02(Real Money) Table 9339866.txt.hp b/pyfpdb/regression-test-files/cash/Absolute/Flop/IHH20090610 Chile Way - Hold'em No Limit $0.02(Real Money) Table 9339866.txt.hp index 26e2c35d..174b0f3d 100644 --- a/pyfpdb/regression-test-files/cash/Absolute/Flop/IHH20090610 Chile Way - Hold'em No Limit $0.02(Real Money) Table 9339866.txt.hp +++ b/pyfpdb/regression-test-files/cash/Absolute/Flop/IHH20090610 Chile Way - Hold'em No Limit $0.02(Real Money) Table 9339866.txt.hp @@ -47,10 +47,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 4, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -635,10 +665,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -675,6 +709,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -733,10 +768,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -773,6 +812,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -781,4 +821,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Carbon/Flop/NLHE-9max-USD-0.25-0.50.200810.All.Streets.txt.hp b/pyfpdb/regression-test-files/cash/Carbon/Flop/NLHE-9max-USD-0.25-0.50.200810.All.Streets.txt.hp index 8452dcd2..fcecce5b 100644 --- a/pyfpdb/regression-test-files/cash/Carbon/Flop/NLHE-9max-USD-0.25-0.50.200810.All.Streets.txt.hp +++ b/pyfpdb/regression-test-files/cash/Carbon/Flop/NLHE-9max-USD-0.25-0.50.200810.All.Streets.txt.hp @@ -1,4 +1,107 @@ -{ u'Player1': { 'card1': 0, +{ u'Hero': { 'card1': 13, + 'card2': 46, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': False, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 5, + 'raiseFirstInChance': True, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 2, + 'sitout': False, + 'startCards': 91, + 'startCash': 4925, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': False, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': False, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': False, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': 0, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, + u'Player1': { 'card1': 0, 'card2': 0, 'card3': 0, 'card4': 0, @@ -47,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,104 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, - 'totalProfit': 0, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 0, - 'wonAtSD': 0.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}, - u'Hero': { 'card1': 13, - 'card2': 46, - 'card3': 0, - 'card4': 0, - 'card5': 0, - 'card6': 0, - 'card7': 0, - 'foldBbToStealChance': False, - 'foldSbToStealChance': False, - 'foldToOtherRaisedStreet0': False, - 'foldToOtherRaisedStreet1': False, - 'foldToOtherRaisedStreet2': False, - 'foldToOtherRaisedStreet3': False, - 'foldToOtherRaisedStreet4': False, - 'foldToStreet1CBChance': False, - 'foldToStreet1CBDone': False, - 'foldToStreet2CBChance': False, - 'foldToStreet2CBDone': False, - 'foldToStreet3CBChance': False, - 'foldToStreet3CBDone': False, - 'foldToStreet4CBChance': False, - 'foldToStreet4CBDone': False, - 'foldedBbToSteal': False, - 'foldedSbToSteal': False, - 'other3BStreet0': False, - 'other4BStreet0': False, - 'otherRaisedStreet0': False, - 'otherRaisedStreet1': False, - 'otherRaisedStreet2': False, - 'otherRaisedStreet3': False, - 'otherRaisedStreet4': False, - 'position': 5, - 'raiseFirstInChance': True, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': False, - 'seatNo': 2, - 'sitout': False, - 'startCards': 91, - 'startCash': 4925, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': False, - 'street0_FoldTo3BChance': False, - 'street0_FoldTo3BDone': False, - 'street0_FoldTo4BChance': False, - 'street0_FoldTo4BDone': False, - 'street1Aggr': False, - 'street1Bets': 0, - 'street1CBChance': False, - 'street1CBDone': False, - 'street1Calls': 0, - 'street1CheckCallRaiseChance': False, - 'street1CheckCallRaiseDone': False, - 'street1Raises': 0, - 'street1Seen': False, - 'street2Aggr': False, - 'street2Bets': 0, - 'street2CBChance': False, - 'street2CBDone': False, - 'street2Calls': 0, - 'street2CheckCallRaiseChance': False, - 'street2CheckCallRaiseDone': False, - 'street2Raises': 0, - 'street2Seen': False, - 'street3Aggr': False, - 'street3Bets': 0, - 'street3CBChance': False, - 'street3CBDone': False, - 'street3Calls': 0, - 'street3CheckCallRaiseChance': False, - 'street3CheckCallRaiseDone': False, - 'street3Raises': 0, - 'street3Seen': False, - 'street4Aggr': False, - 'street4Bets': 0, - 'street4CBChance': False, - 'street4CBDone': False, - 'street4Calls': 0, - 'street4CheckCallRaiseChance': False, - 'street4CheckCallRaiseDone': False, - 'street4Raises': 0, - 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +253,14 @@ 'street0_3BDone': True, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': True, 'street1Bets': 1, 'street1CBChance': True, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 2700, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -25, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -100, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -635,10 +665,14 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -675,6 +709,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2867, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -733,10 +768,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -773,6 +812,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -781,4 +821,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt b/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt new file mode 100644 index 00000000..1b983f37 --- /dev/null +++ b/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt @@ -0,0 +1,34 @@ + + + + + + + + -- + 8h + -- + 2c + -- + Qc + -- + Ah + + + 5750 + 6s, 8c, Jh + + + 17750 + 6h + + + 17750 + 4c + + + + 17750 + + + diff --git a/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.gt b/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.gt new file mode 100644 index 00000000..4ed55f6d --- /dev/null +++ b/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.gt @@ -0,0 +1 @@ +(15, 'EUR', 'ring', 'hold', 'omahahi', 'pl', 'h', 500, 1000, 1000, 2000) diff --git a/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.hands b/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.hands new file mode 100644 index 00000000..769e5899 --- /dev/null +++ b/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.hands @@ -0,0 +1,30 @@ +{ 'boardcard1': 44, + 'boardcard2': 0, + 'boardcard3': 0, + 'boardcard4': 5, + 'boardcard5': 29, + 'gametypeId': 1, + 'importTime': None, + 'maxSeats': 10, + 'playersAtShowdown': 0, + 'playersAtStreet1': 2, + 'playersAtStreet2': 2, + 'playersAtStreet3': 2, + 'playersAtStreet4': 0, + 'playersVpi': 2, + 'seats': 2, + 'showdownPot': 0, + 'siteHandNo': u'6351562000', + 'startTime': datetime.datetime(2011, 2, 9, 11, 58), + 'street0Raises': 1, + 'street1Pot': 18000, + 'street1Raises': 1, + 'street2Pot': 18000, + 'street2Raises': 0, + 'street3Pot': 36000, + 'street3Raises': 1, + 'street4Pot': 0, + 'street4Raises': 0, + 'tableName': u'Toulouse-2', + 'texture': None, + 'tourneyId': None} diff --git a/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.hp b/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.hp new file mode 100644 index 00000000..691c5a52 --- /dev/null +++ b/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.hp @@ -0,0 +1,206 @@ +{ u'Hero': { 'card1': 0, + 'card2': 0, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': True, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': True, + 'otherRaisedStreet2': False, + 'otherRaisedStreet3': True, + 'otherRaisedStreet4': False, + 'position': 'S', + 'raiseFirstInChance': True, + 'raisedFirstIn': True, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': u'0', + 'sitout': False, + 'startCards': 0, + 'startCash': 10000000, + 'street0Aggr': True, + 'street0Bets': 1, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': True, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 1, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': True, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': True, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': True, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': -9000, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, + u'Villain': { 'card1': 0, + 'card2': 0, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': True, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': False, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 'B', + 'raiseFirstInChance': False, + 'raisedFirstIn': False, + 'rake': 300, + 'sawShowdown': False, + 'seatNo': u'4', + 'sitout': False, + 'startCards': 0, + 'startCash': 5000000, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 1, + 'street0Raises': 0, + 'street0VPI': True, + 'street0_3BChance': True, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': True, + 'street1Bets': 1, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': True, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': True, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': True, + 'street3Aggr': True, + 'street3Bets': 1, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': True, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': 8700, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 17700, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 1.0, + 'wonWhenSeenStreet2': 1.0, + 'wonWhenSeenStreet3': 1.0, + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Everleaf/Flop/NLHE-10max-USD-0.01-0.02-201008.2Way.All-in.pre.txt.hp b/pyfpdb/regression-test-files/cash/Everleaf/Flop/NLHE-10max-USD-0.01-0.02-201008.2Way.All-in.pre.txt.hp index 1e3cdfd9..c941e73f 100644 --- a/pyfpdb/regression-test-files/cash/Everleaf/Flop/NLHE-10max-USD-0.01-0.02-201008.2Way.All-in.pre.txt.hp +++ b/pyfpdb/regression-test-files/cash/Everleaf/Flop/NLHE-10max-USD-0.01-0.02-201008.2Way.All-in.pre.txt.hp @@ -47,10 +47,14 @@ 'street0_3BDone': True, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -98, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 96, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -635,10 +665,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -675,6 +709,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -3, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -733,10 +768,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -773,6 +812,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -781,4 +821,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-0.10-0.20-201011.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-0.10-0.20-201011.txt.hp index 4ee3f055..c74bf089 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-0.10-0.20-201011.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-0.10-0.20-201011.txt.hp @@ -47,10 +47,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -5, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': True, 'street1Bets': 1, 'street1CBChance': True, @@ -185,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 50, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -50, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -585,4 +615,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-150-300-201012.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-150-300-201012.txt.hp index ea91b78e..27a8cac5 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-150-300-201012.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-150-300-201012.txt.hp @@ -47,10 +47,14 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -7500, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -15000, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': True, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': True, 'street1Bets': 1, 'street1CBChance': True, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -135000, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': True, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 157200, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -487,4 +512,4 @@ 'wonWhenSeenStreet1': 1.0, 'wonWhenSeenStreet2': 1.0, 'wonWhenSeenStreet3': 1.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-250-500-201011.Hero.sitting.out.but.not.listed.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-250-500-201011.Hero.sitting.out.but.not.listed.txt.hp index 99480387..ca3be971 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-250-500-201011.Hero.sitting.out.but.not.listed.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-250-500-201011.Hero.sitting.out.but.not.listed.txt.hp @@ -47,10 +47,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -25000, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -12500, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 37500, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -389,4 +409,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Flop/LHE-9max-USD-1-2.201012.Button.Player4.Sitting.out.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Flop/LHE-9max-USD-1-2.201012.Button.Player4.Sitting.out.txt.hp index 55a4640f..4f5c207f 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Flop/LHE-9max-USD-1-2.201012.Button.Player4.Sitting.out.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Flop/LHE-9max-USD-1-2.201012.Button.Player4.Sitting.out.txt.hp @@ -47,10 +47,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': True, 'street1Bets': 1, 'street1CBChance': False, @@ -185,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -600, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': True, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 875, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -50, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -100, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -635,10 +665,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': True, @@ -675,6 +709,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -200, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -683,4 +718,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-6max-EUR-0.01-0.02.201008.Weird.table.character.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-6max-EUR-0.01-0.02.201008.Weird.table.character.txt.hp index b9083181..7510c741 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-6max-EUR-0.01-0.02.201008.Weird.table.character.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-6max-EUR-0.01-0.02.201008.Weird.table.character.txt.hp @@ -1,4 +1,107 @@ -{ u'Player1': { 'card1': 0, +{ u'Hero': { 'card1': 1, + 'card2': 34, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': True, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': True, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': False, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 'B', + 'raiseFirstInChance': False, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 5, + 'sitout': False, + 'startCards': 8, + 'startCash': 200, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': True, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': False, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': False, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': False, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': -2, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, + u'Player1': { 'card1': 0, 'card2': 0, 'card3': 0, 'card4': 0, @@ -47,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 3, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -1, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -390,104 +513,6 @@ 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet4': 0.0}, - u'Hero': { 'card1': 1, - 'card2': 34, - 'card3': 0, - 'card4': 0, - 'card5': 0, - 'card6': 0, - 'card7': 0, - 'foldBbToStealChance': True, - 'foldSbToStealChance': False, - 'foldToOtherRaisedStreet0': False, - 'foldToOtherRaisedStreet1': False, - 'foldToOtherRaisedStreet2': False, - 'foldToOtherRaisedStreet3': False, - 'foldToOtherRaisedStreet4': False, - 'foldToStreet1CBChance': False, - 'foldToStreet1CBDone': False, - 'foldToStreet2CBChance': False, - 'foldToStreet2CBDone': False, - 'foldToStreet3CBChance': False, - 'foldToStreet3CBDone': False, - 'foldToStreet4CBChance': False, - 'foldToStreet4CBDone': False, - 'foldedBbToSteal': True, - 'foldedSbToSteal': False, - 'other3BStreet0': False, - 'other4BStreet0': False, - 'otherRaisedStreet0': False, - 'otherRaisedStreet1': False, - 'otherRaisedStreet2': False, - 'otherRaisedStreet3': False, - 'otherRaisedStreet4': False, - 'position': 'B', - 'raiseFirstInChance': False, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': False, - 'seatNo': 5, - 'sitout': False, - 'startCards': 8, - 'startCash': 200, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': True, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': False, - 'street0_FoldTo3BChance': False, - 'street0_FoldTo3BDone': False, - 'street0_FoldTo4BChance': False, - 'street0_FoldTo4BDone': False, - 'street1Aggr': False, - 'street1Bets': 0, - 'street1CBChance': False, - 'street1CBDone': False, - 'street1Calls': 0, - 'street1CheckCallRaiseChance': False, - 'street1CheckCallRaiseDone': False, - 'street1Raises': 0, - 'street1Seen': False, - 'street2Aggr': False, - 'street2Bets': 0, - 'street2CBChance': False, - 'street2CBDone': False, - 'street2Calls': 0, - 'street2CheckCallRaiseChance': False, - 'street2CheckCallRaiseDone': False, - 'street2Raises': 0, - 'street2Seen': False, - 'street3Aggr': False, - 'street3Bets': 0, - 'street3CBChance': False, - 'street3CBDone': False, - 'street3Calls': 0, - 'street3CheckCallRaiseChance': False, - 'street3CheckCallRaiseDone': False, - 'street3Raises': 0, - 'street3Seen': False, - 'street4Aggr': False, - 'street4Bets': 0, - 'street4CBChance': False, - 'street4CBDone': False, - 'street4Calls': 0, - 'street4CheckCallRaiseChance': False, - 'street4CheckCallRaiseDone': False, - 'street4Raises': 0, - 'street4Seen': False, - 'totalProfit': -2, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 0, - 'wonAtSD': 0.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}, u'Player6': { 'card1': 0, 'card2': 0, 'card3': 0, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -585,4 +615,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-9max-USD-0.02-0.05.201007.Short.lived.date.format.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-9max-USD-0.02-0.05.201007.Short.lived.date.format.txt.hp index 0b733471..73c93cc9 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-9max-USD-0.02-0.05.201007.Short.lived.date.format.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-9max-USD-0.02-0.05.201007.Short.lived.date.format.txt.hp @@ -1,4 +1,107 @@ -{ u'MANUTD': { 'card1': 0, +{ u'Hero': { 'card1': 50, + 'card2': 16, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': False, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 'B', + 'raiseFirstInChance': False, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 6, + 'sitout': False, + 'startCards': 37, + 'startCash': 200, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': False, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': False, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': False, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': 2, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 4, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, + u'MANUTD': { 'card1': 0, 'card2': 0, 'card3': 0, 'card4': 0, @@ -47,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -194,104 +307,6 @@ 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet4': 0.0}, - u'Hero': { 'card1': 50, - 'card2': 16, - 'card3': 0, - 'card4': 0, - 'card5': 0, - 'card6': 0, - 'card7': 0, - 'foldBbToStealChance': False, - 'foldSbToStealChance': False, - 'foldToOtherRaisedStreet0': False, - 'foldToOtherRaisedStreet1': False, - 'foldToOtherRaisedStreet2': False, - 'foldToOtherRaisedStreet3': False, - 'foldToOtherRaisedStreet4': False, - 'foldToStreet1CBChance': False, - 'foldToStreet1CBDone': False, - 'foldToStreet2CBChance': False, - 'foldToStreet2CBDone': False, - 'foldToStreet3CBChance': False, - 'foldToStreet3CBDone': False, - 'foldToStreet4CBChance': False, - 'foldToStreet4CBDone': False, - 'foldedBbToSteal': False, - 'foldedSbToSteal': False, - 'other3BStreet0': False, - 'other4BStreet0': False, - 'otherRaisedStreet0': False, - 'otherRaisedStreet1': False, - 'otherRaisedStreet2': False, - 'otherRaisedStreet3': False, - 'otherRaisedStreet4': False, - 'position': 'B', - 'raiseFirstInChance': False, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': False, - 'seatNo': 6, - 'sitout': False, - 'startCards': 37, - 'startCash': 200, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': False, - 'street0_FoldTo3BChance': False, - 'street0_FoldTo3BDone': False, - 'street0_FoldTo4BChance': False, - 'street0_FoldTo4BDone': False, - 'street1Aggr': False, - 'street1Bets': 0, - 'street1CBChance': False, - 'street1CBDone': False, - 'street1Calls': 0, - 'street1CheckCallRaiseChance': False, - 'street1CheckCallRaiseDone': False, - 'street1Raises': 0, - 'street1Seen': False, - 'street2Aggr': False, - 'street2Bets': 0, - 'street2CBChance': False, - 'street2CBDone': False, - 'street2Calls': 0, - 'street2CheckCallRaiseChance': False, - 'street2CheckCallRaiseDone': False, - 'street2Raises': 0, - 'street2Seen': False, - 'street3Aggr': False, - 'street3Bets': 0, - 'street3CBChance': False, - 'street3CBDone': False, - 'street3Calls': 0, - 'street3CheckCallRaiseChance': False, - 'street3CheckCallRaiseDone': False, - 'street3Raises': 0, - 'street3Seen': False, - 'street4Aggr': False, - 'street4Bets': 0, - 'street4CBChance': False, - 'street4CBDone': False, - 'street4Calls': 0, - 'street4CheckCallRaiseChance': False, - 'street4CheckCallRaiseDone': False, - 'street4Raises': 0, - 'street4Seen': False, - 'totalProfit': 2, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 4, - 'wonAtSD': 0.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}, u'proud2Bwhack': { 'card1': 0, 'card2': 0, 'card3': 0, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -635,10 +665,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -675,6 +709,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -733,10 +768,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -773,6 +812,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -831,10 +871,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -871,6 +915,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -879,4 +924,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Flop/PLO-6max-USD-0.01-0.02.201003.River.Showdown.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Flop/PLO-6max-USD-0.01-0.02.201003.River.Showdown.txt.hp index 3e582b8d..da6dd693 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Flop/PLO-6max-USD-0.01-0.02.201003.River.Showdown.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Flop/PLO-6max-USD-0.01-0.02.201003.River.Showdown.txt.hp @@ -47,10 +47,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -194,6 +204,109 @@ 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet4': 0.0}, + u'Hero': { 'card1': 15, + 'card2': 10, + 'card3': 42, + 'card4': 25, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': False, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 0, + 'raiseFirstInChance': False, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 1, + 'sitout': False, + 'startCards': 0, + 'startCash': 209, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': False, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': False, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': False, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': 0, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, u'ShaDiv': { 'card1': 0, 'card2': 0, 'card3': 0, @@ -243,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -16, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -292,104 +410,6 @@ 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet4': 0.0}, - u'Hero': { 'card1': 15, - 'card2': 10, - 'card3': 42, - 'card4': 25, - 'card5': 0, - 'card6': 0, - 'card7': 0, - 'foldBbToStealChance': False, - 'foldSbToStealChance': False, - 'foldToOtherRaisedStreet0': False, - 'foldToOtherRaisedStreet1': False, - 'foldToOtherRaisedStreet2': False, - 'foldToOtherRaisedStreet3': False, - 'foldToOtherRaisedStreet4': False, - 'foldToStreet1CBChance': False, - 'foldToStreet1CBDone': False, - 'foldToStreet2CBChance': False, - 'foldToStreet2CBDone': False, - 'foldToStreet3CBChance': False, - 'foldToStreet3CBDone': False, - 'foldToStreet4CBChance': False, - 'foldToStreet4CBDone': False, - 'foldedBbToSteal': False, - 'foldedSbToSteal': False, - 'other3BStreet0': False, - 'other4BStreet0': False, - 'otherRaisedStreet0': False, - 'otherRaisedStreet1': False, - 'otherRaisedStreet2': False, - 'otherRaisedStreet3': False, - 'otherRaisedStreet4': False, - 'position': 0, - 'raiseFirstInChance': False, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': False, - 'seatNo': 1, - 'sitout': False, - 'startCards': 0, - 'startCash': 209, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': False, - 'street0_FoldTo3BChance': False, - 'street0_FoldTo3BDone': False, - 'street0_FoldTo4BChance': False, - 'street0_FoldTo4BDone': False, - 'street1Aggr': False, - 'street1Bets': 0, - 'street1CBChance': False, - 'street1CBDone': False, - 'street1Calls': 0, - 'street1CheckCallRaiseChance': False, - 'street1CheckCallRaiseDone': False, - 'street1Raises': 0, - 'street1Seen': False, - 'street2Aggr': False, - 'street2Bets': 0, - 'street2CBChance': False, - 'street2CBDone': False, - 'street2Calls': 0, - 'street2CheckCallRaiseChance': False, - 'street2CheckCallRaiseDone': False, - 'street2Raises': 0, - 'street2Seen': False, - 'street3Aggr': False, - 'street3Bets': 0, - 'street3CBChance': False, - 'street3CBDone': False, - 'street3Calls': 0, - 'street3CheckCallRaiseChance': False, - 'street3CheckCallRaiseDone': False, - 'street3Raises': 0, - 'street3Seen': False, - 'street4Aggr': False, - 'street4Bets': 0, - 'street4CBChance': False, - 'street4CBDone': False, - 'street4Calls': 0, - 'street4CheckCallRaiseChance': False, - 'street4CheckCallRaiseDone': False, - 'street4Raises': 0, - 'street4Seen': False, - 'totalProfit': 0, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 0, - 'wonAtSD': 0.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}, u'Timoha777': { 'card1': 24, 'card2': 23, 'card3': 16, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 53, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': True, 'street1Bets': 1, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -41, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -585,4 +615,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Stud/7-Stud-USD-3-6-20106.Steal.from.Button.Failure.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Stud/7-Stud-USD-3-6-20106.Steal.from.Button.Failure.txt.hp index 33661ab2..dbf7b285 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Stud/7-Stud-USD-3-6-20106.Steal.from.Button.Failure.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Stud/7-Stud-USD-3-6-20106.Steal.from.Button.Failure.txt.hp @@ -1,102 +1,4 @@ -{ u'Hero': { 'card1': 43, - 'card2': 1, - 'card3': 9, - 'card4': 0, - 'card5': 0, - 'card6': 0, - 'card7': 0, - 'foldBbToStealChance': False, - 'foldSbToStealChance': False, - 'foldToOtherRaisedStreet0': False, - 'foldToOtherRaisedStreet1': False, - 'foldToOtherRaisedStreet2': False, - 'foldToOtherRaisedStreet3': False, - 'foldToOtherRaisedStreet4': False, - 'foldToStreet1CBChance': False, - 'foldToStreet1CBDone': False, - 'foldToStreet2CBChance': False, - 'foldToStreet2CBDone': False, - 'foldToStreet3CBChance': False, - 'foldToStreet3CBDone': False, - 'foldToStreet4CBChance': False, - 'foldToStreet4CBDone': False, - 'foldedBbToSteal': False, - 'foldedSbToSteal': False, - 'other3BStreet0': False, - 'other4BStreet0': False, - 'otherRaisedStreet0': False, - 'otherRaisedStreet1': False, - 'otherRaisedStreet2': False, - 'otherRaisedStreet3': False, - 'otherRaisedStreet4': False, - 'position': 1, - 'raiseFirstInChance': True, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': False, - 'seatNo': 5, - 'sitout': False, - 'startCards': 0, - 'startCash': 26550, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': False, - 'street0_FoldTo3BChance': False, - 'street0_FoldTo3BDone': False, - 'street0_FoldTo4BChance': False, - 'street0_FoldTo4BDone': False, - 'street1Aggr': False, - 'street1Bets': 0, - 'street1CBChance': False, - 'street1CBDone': False, - 'street1Calls': 0, - 'street1CheckCallRaiseChance': False, - 'street1CheckCallRaiseDone': False, - 'street1Raises': 0, - 'street1Seen': False, - 'street2Aggr': False, - 'street2Bets': 0, - 'street2CBChance': False, - 'street2CBDone': False, - 'street2Calls': 0, - 'street2CheckCallRaiseChance': False, - 'street2CheckCallRaiseDone': False, - 'street2Raises': 0, - 'street2Seen': False, - 'street3Aggr': False, - 'street3Bets': 0, - 'street3CBChance': False, - 'street3CBDone': False, - 'street3Calls': 0, - 'street3CheckCallRaiseChance': False, - 'street3CheckCallRaiseDone': False, - 'street3Raises': 0, - 'street3Seen': False, - 'street4Aggr': False, - 'street4Bets': 0, - 'street4CBChance': False, - 'street4CBDone': False, - 'street4Calls': 0, - 'street4CheckCallRaiseChance': False, - 'street4CheckCallRaiseDone': False, - 'street4Raises': 0, - 'street4Seen': False, - 'totalProfit': -50, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 0, - 'wonAtSD': 0.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}, - u'FILL A RACK': { 'card1': 0, +{ u'FILL A RACK': { 'card1': 0, 'card2': 0, 'card3': 26, 'card4': 0, @@ -145,10 +47,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -50, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -194,6 +101,109 @@ 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet4': 0.0}, + u'Hero': { 'card1': 43, + 'card2': 1, + 'card3': 9, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': False, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 1, + 'raiseFirstInChance': True, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 5, + 'sitout': False, + 'startCards': 0, + 'startCash': 26550, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': False, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': False, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': False, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': -50, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, u'arjun1111': { 'card1': 0, 'card2': 0, 'card3': 52, @@ -243,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': True, 'street1Bets': 1, 'street1CBChance': True, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 600, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -50, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -50, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -50, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -635,10 +665,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -675,6 +709,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -350, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -683,4 +718,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.CCT.and.ET.timeformat.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.CCT.and.ET.timeformat.txt.hp index 48c0d6df..46a8ad32 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.CCT.and.ET.timeformat.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.CCT.and.ET.timeformat.txt.hp @@ -47,10 +47,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -22, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -5, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -42, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -635,10 +665,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': True, 'street1Bets': 1, 'street1CBChance': False, @@ -675,6 +709,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 70, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -683,4 +718,4 @@ 'wonWhenSeenStreet1': 1.0, 'wonWhenSeenStreet2': 1.0, 'wonWhenSeenStreet3': 1.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.Player6.listed.but.doesnt.act.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.Player6.listed.but.doesnt.act.txt.hp index 29a22f29..af7edc3e 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.Player6.listed.but.doesnt.act.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.Player6.listed.but.doesnt.act.txt.hp @@ -47,10 +47,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': True, 'street1Bets': 1, 'street1CBChance': False, @@ -87,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -15, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -5, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -635,10 +665,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -675,6 +709,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -733,10 +768,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -773,6 +812,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 26, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -781,4 +821,4 @@ 'wonWhenSeenStreet1': 1.0, 'wonWhenSeenStreet2': 1.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/OnGame/Flop/LHE-9max-USD-0.50-1.00-201008.All-in.with.showdown.txt.hp b/pyfpdb/regression-test-files/cash/OnGame/Flop/LHE-9max-USD-0.50-1.00-201008.All-in.with.showdown.txt.hp index 1c2f8ba6..0091a810 100644 --- a/pyfpdb/regression-test-files/cash/OnGame/Flop/LHE-9max-USD-0.50-1.00-201008.All-in.with.showdown.txt.hp +++ b/pyfpdb/regression-test-files/cash/OnGame/Flop/LHE-9max-USD-0.50-1.00-201008.All-in.with.showdown.txt.hp @@ -1,4 +1,107 @@ -{ u'player1': { 'card1': 0, +{ u'Hero': { 'card1': 25, + 'card2': 51, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': False, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 2, + 'raiseFirstInChance': True, + 'raisedFirstIn': True, + 'rake': 215, + 'sawShowdown': True, + 'seatNo': 1, + 'sitout': False, + 'startCards': 155, + 'startCash': 2610, + 'street0Aggr': True, + 'street0Bets': 1, + 'street0Calls': 1, + 'street0Raises': 0, + 'street0VPI': True, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': True, + 'street0_4BDone': True, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': True, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': True, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': True, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': 120, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 325, + 'wonAtSD': 1.0, + 'wonWhenSeenStreet1': 1.0, + 'wonWhenSeenStreet2': 1.0, + 'wonWhenSeenStreet3': 1.0, + 'wonWhenSeenStreet4': 0.0}, + u'player1': { 'card1': 0, 'card2': 0, 'card3': 0, 'card4': 0, @@ -47,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -105, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -194,104 +307,6 @@ 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet4': 0.0}, - u'Hero': { 'card1': 25, - 'card2': 51, - 'card3': 0, - 'card4': 0, - 'card5': 0, - 'card6': 0, - 'card7': 0, - 'foldBbToStealChance': False, - 'foldSbToStealChance': False, - 'foldToOtherRaisedStreet0': False, - 'foldToOtherRaisedStreet1': False, - 'foldToOtherRaisedStreet2': False, - 'foldToOtherRaisedStreet3': False, - 'foldToOtherRaisedStreet4': False, - 'foldToStreet1CBChance': False, - 'foldToStreet1CBDone': False, - 'foldToStreet2CBChance': False, - 'foldToStreet2CBDone': False, - 'foldToStreet3CBChance': False, - 'foldToStreet3CBDone': False, - 'foldToStreet4CBChance': False, - 'foldToStreet4CBDone': False, - 'foldedBbToSteal': False, - 'foldedSbToSteal': False, - 'other3BStreet0': False, - 'other4BStreet0': False, - 'otherRaisedStreet0': False, - 'otherRaisedStreet1': False, - 'otherRaisedStreet2': False, - 'otherRaisedStreet3': False, - 'otherRaisedStreet4': False, - 'position': 2, - 'raiseFirstInChance': True, - 'raisedFirstIn': True, - 'rake': 215, - 'sawShowdown': True, - 'seatNo': 1, - 'sitout': False, - 'startCards': 155, - 'startCash': 2610, - 'street0Aggr': True, - 'street0Bets': 1, - 'street0Calls': 1, - 'street0Raises': 0, - 'street0VPI': True, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': True, - 'street0_4BDone': True, - 'street0_FoldTo3BChance': False, - 'street0_FoldTo3BDone': False, - 'street0_FoldTo4BChance': False, - 'street0_FoldTo4BDone': False, - 'street1Aggr': False, - 'street1Bets': 0, - 'street1CBChance': False, - 'street1CBDone': False, - 'street1Calls': 0, - 'street1CheckCallRaiseChance': False, - 'street1CheckCallRaiseDone': False, - 'street1Raises': 0, - 'street1Seen': True, - 'street2Aggr': False, - 'street2Bets': 0, - 'street2CBChance': False, - 'street2CBDone': False, - 'street2Calls': 0, - 'street2CheckCallRaiseChance': False, - 'street2CheckCallRaiseDone': False, - 'street2Raises': 0, - 'street2Seen': True, - 'street3Aggr': False, - 'street3Bets': 0, - 'street3CBChance': False, - 'street3CBDone': False, - 'street3Calls': 0, - 'street3CheckCallRaiseChance': False, - 'street3CheckCallRaiseDone': False, - 'street3Raises': 0, - 'street3Seen': True, - 'street4Aggr': False, - 'street4Bets': 0, - 'street4CBChance': False, - 'street4CBDone': False, - 'street4Calls': 0, - 'street4CheckCallRaiseChance': False, - 'street4CheckCallRaiseDone': False, - 'street4Raises': 0, - 'street4Seen': False, - 'totalProfit': 120, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 325, - 'wonAtSD': 1.0, - 'wonWhenSeenStreet1': 1.0, - 'wonWhenSeenStreet2': 1.0, - 'wonWhenSeenStreet3': 1.0, - 'wonWhenSeenStreet4': 0.0}, u'player4': { 'card1': 0, 'card2': 0, 'card3': 0, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -25, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': True, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -205, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -487,4 +512,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt b/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt new file mode 100644 index 00000000..fce4beda --- /dev/null +++ b/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt @@ -0,0 +1,48 @@ +***** History for hand R5-22678800-36 ***** +Start hand: Sun Feb 13 14:14:04 GMT+0100 2011 +Table: [SPEED] Dijon [22678800] (NO_LIMIT TEXAS_HOLDEM €0.02/€0.04, Real money) +User: Hero +Button: seat 10 +Players in round: 6 +Seat 2: Player2 (€2.26) +Seat 3: Hero (€4) +Seat 5: Player5 (€1.60) +Seat 7: Player7 (€1.35) +Seat 8: Player8 (€1.70) +Seat 10: Player10 (€3.66) +Player2 posts small blind (€0.02) +Hero posts big blind (€0.04) +--- +Dealing pocket cards +Dealing to Hero: [7d, Td] +Player5 folds +Player7 folds +Player8 calls €0.04 +Player10 calls €0.04 +Player2 calls €0.02 +Hero checks +--- Dealing flop [Jc, 4d, Qs] +Player2 checks +Hero checks +Player8 checks +Player10 checks +--- Dealing turn [Js] +Player2 checks +Hero bets €0.10 +Player8 calls €0.10 +Player10 folds +Player2 folds +--- Dealing river [Ts] +Hero checks +Player8 checks +--- +Summary: +Main pot: €0.36 won by Hero (€0.35) +Rake taken: €0.01 +Seat 2: Player2 (€2.22), net: -€0.04 +Seat 3: Hero (€4.21), net: +€0.21, [7d, Td] (TWO_PAIR JACK, TEN) +Seat 5: Player5 (€1.60) +Seat 7: Player7 (€1.35) +Seat 8: Player8 (€1.56), net: -€0.14 +Seat 10: Player10 (€3.62), net: -€0.04 +***** End of hand R5-22678800-36 ***** diff --git a/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.gt b/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.gt new file mode 100644 index 00000000..88d53c79 --- /dev/null +++ b/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.gt @@ -0,0 +1 @@ +(5, 'EUR', 'ring', 'hold', 'holdem', 'nl', 'h', 2, 4, 4, 8) diff --git a/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.hands b/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.hands new file mode 100644 index 00000000..8b831c9f --- /dev/null +++ b/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.hands @@ -0,0 +1,30 @@ +{ 'boardcard1': 36, + 'boardcard2': 16, + 'boardcard3': 50, + 'boardcard4': 49, + 'boardcard5': 48, + 'gametypeId': 1, + 'importTime': None, + 'maxSeats': 10, + 'playersAtShowdown': 2, + 'playersAtStreet1': 4, + 'playersAtStreet2': 4, + 'playersAtStreet3': 2, + 'playersAtStreet4': 0, + 'playersVpi': 3, + 'seats': 6, + 'showdownPot': 0, + 'siteHandNo': u'52267880036', + 'startTime': datetime.datetime(2011, 2, 13, 13, 14, 4, tzinfo=pytz.utc), + 'street0Raises': 0, + 'street1Pot': 16, + 'street1Raises': 0, + 'street2Pot': 36, + 'street2Raises': 1, + 'street3Pot': 36, + 'street3Raises': 0, + 'street4Pot': 0, + 'street4Raises': 0, + 'tableName': u'Dijon', + 'texture': None, + 'tourneyId': None} diff --git a/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.hp b/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.hp new file mode 100644 index 00000000..00b4d0f4 --- /dev/null +++ b/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.hp @@ -0,0 +1,618 @@ +{ u'Hero': { 'card1': 19, + 'card2': 22, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': False, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 'B', + 'raiseFirstInChance': False, + 'raisedFirstIn': False, + 'rake': 1, + 'sawShowdown': True, + 'seatNo': 3, + 'sitout': False, + 'startCards': 110, + 'startCash': 421, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': True, + 'street2Aggr': True, + 'street2Bets': 1, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': True, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': True, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': True, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': 21, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 35, + 'wonAtSD': 1.0, + 'wonWhenSeenStreet1': 1.0, + 'wonWhenSeenStreet2': 1.0, + 'wonWhenSeenStreet3': 1.0, + 'wonWhenSeenStreet4': 0.0}, + u'Player10': { 'card1': 0, + 'card2': 0, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': True, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': True, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 0, + 'raiseFirstInChance': False, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 10, + 'sitout': False, + 'startCards': 0, + 'startCash': 362, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 1, + 'street0Raises': 0, + 'street0VPI': True, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': True, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': True, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': False, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': -4, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, + u'Player2': { 'card1': 0, + 'card2': 0, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': True, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': True, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 'S', + 'raiseFirstInChance': False, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 2, + 'sitout': False, + 'startCards': 0, + 'startCash': 222, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 1, + 'street0Raises': 0, + 'street0VPI': True, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': True, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': True, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': True, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': False, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': -4, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, + u'Player5': { 'card1': 0, + 'card2': 0, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': False, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 3, + 'raiseFirstInChance': True, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 5, + 'sitout': False, + 'startCards': 0, + 'startCash': 160, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': False, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': False, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': False, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': 0, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, + u'Player7': { 'card1': 0, + 'card2': 0, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': False, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 2, + 'raiseFirstInChance': True, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 7, + 'sitout': False, + 'startCards': 0, + 'startCash': 135, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': False, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': False, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': False, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': 0, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, + u'Player8': { 'card1': 0, + 'card2': 0, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': True, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 1, + 'raiseFirstInChance': True, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': True, + 'seatNo': 8, + 'sitout': False, + 'startCards': 0, + 'startCash': 156, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 1, + 'street0Raises': 0, + 'street0VPI': True, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': True, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 1, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': True, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': True, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': -14, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/PKR/Flop/NLHE-2max-USD-0.02-0.04-200903.All-in.on.turn.txt.hp b/pyfpdb/regression-test-files/cash/PKR/Flop/NLHE-2max-USD-0.02-0.04-200903.All-in.on.turn.txt.hp index 02238e95..71587ec7 100644 --- a/pyfpdb/regression-test-files/cash/PKR/Flop/NLHE-2max-USD-0.02-0.04-200903.All-in.on.turn.txt.hp +++ b/pyfpdb/regression-test-files/cash/PKR/Flop/NLHE-2max-USD-0.02-0.04-200903.All-in.on.turn.txt.hp @@ -1,4 +1,103 @@ -{ u'Player1': { 'card1': 0, +{ u'Hero': { 'card1': 26, + 'card2': 7, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': True, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': True, + 'otherRaisedStreet2': True, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 3, + 'raiseFirstInChance': False, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 6, + 'sitout': False, + 'startCards': 91, + 'startCash': 400, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': True, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': True, + 'street2Aggr': True, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': True, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': False, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': -88, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, + u'Player1': { 'card1': 0, 'card2': 0, 'card3': 0, 'card4': 0, @@ -47,6 +146,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -83,6 +186,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -141,6 +245,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': True, 'street1Bets': 1, 'street1CBChance': False, @@ -177,6 +285,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -28, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -235,6 +344,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -271,6 +384,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 219, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -329,6 +443,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -365,6 +483,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -159, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -374,100 +493,6 @@ 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet4': 0.0}, - u'Hero': { 'card1': 26, - 'card2': 7, - 'card3': 0, - 'card4': 0, - 'card5': 0, - 'card6': 0, - 'card7': 0, - 'foldBbToStealChance': False, - 'foldSbToStealChance': False, - 'foldToOtherRaisedStreet0': False, - 'foldToOtherRaisedStreet1': False, - 'foldToOtherRaisedStreet2': True, - 'foldToOtherRaisedStreet3': False, - 'foldToOtherRaisedStreet4': False, - 'foldToStreet1CBChance': False, - 'foldToStreet1CBDone': False, - 'foldToStreet2CBChance': False, - 'foldToStreet2CBDone': False, - 'foldToStreet3CBChance': False, - 'foldToStreet3CBDone': False, - 'foldToStreet4CBChance': False, - 'foldToStreet4CBDone': False, - 'foldedBbToSteal': False, - 'foldedSbToSteal': False, - 'other3BStreet0': False, - 'other4BStreet0': False, - 'otherRaisedStreet0': False, - 'otherRaisedStreet1': True, - 'otherRaisedStreet2': True, - 'otherRaisedStreet3': False, - 'otherRaisedStreet4': False, - 'position': 3, - 'raiseFirstInChance': False, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': False, - 'seatNo': 6, - 'sitout': False, - 'startCards': 91, - 'startCash': 400, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': False, - 'street1Aggr': True, - 'street1Bets': 0, - 'street1CBChance': False, - 'street1CBDone': False, - 'street1Calls': 0, - 'street1CheckCallRaiseChance': False, - 'street1CheckCallRaiseDone': False, - 'street1Raises': 0, - 'street1Seen': True, - 'street2Aggr': True, - 'street2Bets': 0, - 'street2CBChance': False, - 'street2CBDone': False, - 'street2Calls': 0, - 'street2CheckCallRaiseChance': False, - 'street2CheckCallRaiseDone': False, - 'street2Raises': 0, - 'street2Seen': True, - 'street3Aggr': False, - 'street3Bets': 0, - 'street3CBChance': False, - 'street3CBDone': False, - 'street3Calls': 0, - 'street3CheckCallRaiseChance': False, - 'street3CheckCallRaiseDone': False, - 'street3Raises': 0, - 'street3Seen': False, - 'street4Aggr': False, - 'street4Bets': 0, - 'street4CBChance': False, - 'street4CBDone': False, - 'street4Calls': 0, - 'street4CheckCallRaiseChance': False, - 'street4CheckCallRaiseDone': False, - 'street4Raises': 0, - 'street4Seen': False, - 'totalProfit': -88, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 0, - 'wonAtSD': 0.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}, u'allout96': { 'card1': 0, 'card2': 0, 'card3': 0, @@ -517,6 +542,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -553,6 +582,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -561,4 +591,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.01-0.02-201008.Sample.txt.hp b/pyfpdb/regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.01-0.02-201008.Sample.txt.hp index a44ec8da..90478edb 100644 --- a/pyfpdb/regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.01-0.02-201008.Sample.txt.hp +++ b/pyfpdb/regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.01-0.02-201008.Sample.txt.hp @@ -1,4 +1,107 @@ -{ u'Lisypoker': { 'card1': 0, +{ u'Hero': { 'card1': 49, + 'card2': 9, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': False, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 'B', + 'raiseFirstInChance': False, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': True, + 'seatNo': 8, + 'sitout': False, + 'startCards': 114, + 'startCash': 206, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 1, + 'street0Raises': 0, + 'street0VPI': True, + 'street0_3BChance': True, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': True, + 'street1Bets': 1, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': True, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': True, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': True, + 'street3Aggr': True, + 'street3Bets': 1, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': True, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': -30, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, + u'Lisypoker': { 'card1': 0, 'card2': 0, 'card3': 0, 'card4': 0, @@ -47,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -8, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -194,104 +307,6 @@ 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet4': 0.0}, - u'Hero': { 'card1': 49, - 'card2': 9, - 'card3': 0, - 'card4': 0, - 'card5': 0, - 'card6': 0, - 'card7': 0, - 'foldBbToStealChance': False, - 'foldSbToStealChance': False, - 'foldToOtherRaisedStreet0': False, - 'foldToOtherRaisedStreet1': False, - 'foldToOtherRaisedStreet2': False, - 'foldToOtherRaisedStreet3': False, - 'foldToOtherRaisedStreet4': False, - 'foldToStreet1CBChance': False, - 'foldToStreet1CBDone': False, - 'foldToStreet2CBChance': False, - 'foldToStreet2CBDone': False, - 'foldToStreet3CBChance': False, - 'foldToStreet3CBDone': False, - 'foldToStreet4CBChance': False, - 'foldToStreet4CBDone': False, - 'foldedBbToSteal': False, - 'foldedSbToSteal': False, - 'other3BStreet0': False, - 'other4BStreet0': False, - 'otherRaisedStreet0': False, - 'otherRaisedStreet1': False, - 'otherRaisedStreet2': False, - 'otherRaisedStreet3': False, - 'otherRaisedStreet4': False, - 'position': 'B', - 'raiseFirstInChance': False, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': True, - 'seatNo': 8, - 'sitout': False, - 'startCards': 114, - 'startCash': 206, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 1, - 'street0Raises': 0, - 'street0VPI': True, - 'street0_3BChance': True, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': False, - 'street0_FoldTo3BChance': False, - 'street0_FoldTo3BDone': False, - 'street0_FoldTo4BChance': False, - 'street0_FoldTo4BDone': False, - 'street1Aggr': True, - 'street1Bets': 1, - 'street1CBChance': False, - 'street1CBDone': False, - 'street1Calls': 0, - 'street1CheckCallRaiseChance': False, - 'street1CheckCallRaiseDone': False, - 'street1Raises': 0, - 'street1Seen': True, - 'street2Aggr': False, - 'street2Bets': 0, - 'street2CBChance': True, - 'street2CBDone': False, - 'street2Calls': 0, - 'street2CheckCallRaiseChance': False, - 'street2CheckCallRaiseDone': False, - 'street2Raises': 0, - 'street2Seen': True, - 'street3Aggr': True, - 'street3Bets': 1, - 'street3CBChance': False, - 'street3CBDone': False, - 'street3Calls': 0, - 'street3CheckCallRaiseChance': False, - 'street3CheckCallRaiseDone': False, - 'street3Raises': 0, - 'street3Seen': True, - 'street4Aggr': False, - 'street4Bets': 0, - 'street4CBChance': False, - 'street4CBDone': False, - 'street4Calls': 0, - 'street4CheckCallRaiseChance': False, - 'street4CheckCallRaiseDone': False, - 'street4Raises': 0, - 'street4Seen': False, - 'totalProfit': -30, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 0, - 'wonAtSD': 0.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}, u'potikuus': { 'card1': 0, 'card2': 0, 'card3': 0, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 35, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -585,5 +615,4 @@ 'wonWhenSeenStreet1': 1.0, 'wonWhenSeenStreet2': 1.0, 'wonWhenSeenStreet3': 1.0, - 'wonWhenSeenStreet4': 0.0}} - + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt.hp index 25cadbbd..1b594587 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt.hp @@ -47,10 +47,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 50, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -50, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -193,4 +203,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt.hp index 1c131411..a81ed755 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt.hp @@ -47,10 +47,14 @@ 'street0_3BDone': True, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': True, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 1915, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -25, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -292,6 +307,109 @@ 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet4': 0.0}, + u'Hero': { 'card1': 39, + 'card2': 52, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': False, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 3, + 'raiseFirstInChance': True, + 'raisedFirstIn': True, + 'rake': 0, + 'sawShowdown': True, + 'seatNo': 5, + 'sitout': False, + 'startCards': 169, + 'startCash': 2985, + 'street0Aggr': True, + 'street0Bets': 0, + 'street0Calls': 1, + 'street0Raises': 0, + 'street0VPI': True, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': True, + 'street0_4BDone': True, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': True, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': True, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': True, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': True, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': -2020, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, u'Kinewma': { 'card1': 0, 'card2': 0, 'card3': 0, @@ -341,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -75, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -487,102 +615,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}, - u'Hero': { 'card1': 39, - 'card2': 52, - 'card3': 0, - 'card4': 0, - 'card5': 0, - 'card6': 0, - 'card7': 0, - 'foldBbToStealChance': False, - 'foldSbToStealChance': False, - 'foldToOtherRaisedStreet0': False, - 'foldToOtherRaisedStreet1': False, - 'foldToOtherRaisedStreet2': False, - 'foldToOtherRaisedStreet3': False, - 'foldToOtherRaisedStreet4': False, - 'foldToStreet1CBChance': False, - 'foldToStreet1CBDone': False, - 'foldToStreet2CBChance': False, - 'foldToStreet2CBDone': False, - 'foldToStreet3CBChance': False, - 'foldToStreet3CBDone': False, - 'foldToStreet4CBChance': False, - 'foldToStreet4CBDone': False, - 'foldedBbToSteal': False, - 'foldedSbToSteal': False, - 'other3BStreet0': False, - 'other4BStreet0': False, - 'otherRaisedStreet0': False, - 'otherRaisedStreet1': False, - 'otherRaisedStreet2': False, - 'otherRaisedStreet3': False, - 'otherRaisedStreet4': False, - 'position': 3, - 'raiseFirstInChance': True, - 'raisedFirstIn': True, - 'rake': 0, - 'sawShowdown': True, - 'seatNo': 5, - 'sitout': False, - 'startCards': 169, - 'startCash': 2985, - 'street0Aggr': True, - 'street0Bets': 0, - 'street0Calls': 1, - 'street0Raises': 0, - 'street0VPI': True, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': True, - 'street0_4BDone': True, - 'street0_FoldTo3BChance': True, - 'street0_FoldTo3BDone': False, - 'street0_FoldTo4BChance': False, - 'street0_FoldTo4BDone': False, - 'street1Aggr': False, - 'street1Bets': 0, - 'street1CBChance': False, - 'street1CBDone': False, - 'street1Calls': 0, - 'street1CheckCallRaiseChance': False, - 'street1CheckCallRaiseDone': False, - 'street1Raises': 0, - 'street1Seen': True, - 'street2Aggr': False, - 'street2Bets': 0, - 'street2CBChance': False, - 'street2CBDone': False, - 'street2Calls': 0, - 'street2CheckCallRaiseChance': False, - 'street2CheckCallRaiseDone': False, - 'street2Raises': 0, - 'street2Seen': True, - 'street3Aggr': False, - 'street3Bets': 0, - 'street3CBChance': False, - 'street3CBDone': False, - 'street3Calls': 0, - 'street3CheckCallRaiseChance': False, - 'street3CheckCallRaiseDone': False, - 'street3Raises': 0, - 'street3Seen': True, - 'street4Aggr': False, - 'street4Bets': 0, - 'street4CBChance': False, - 'street4CBDone': False, - 'street4Calls': 0, - 'street4CheckCallRaiseChance': False, - 'street4CheckCallRaiseDone': False, - 'street4Raises': 0, - 'street4Seen': False, - 'totalProfit': -2020, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 0, - 'wonAtSD': 0.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-CAP-9max-USD-0.25-0.50-201011.Capped.preflop.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-CAP-9max-USD-0.25-0.50-201011.Capped.preflop.txt.hp index 00d955be..5907e754 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-CAP-9max-USD-0.25-0.50-201011.Capped.preflop.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-CAP-9max-USD-0.25-0.50-201011.Capped.preflop.txt.hp @@ -47,10 +47,14 @@ 'street0_3BDone': True, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, - 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BChance': True, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -1000, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -635,10 +665,14 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': True, - 'street0_FoldTo3BChance': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': True, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -675,6 +709,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 900, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -683,4 +718,4 @@ 'wonWhenSeenStreet1': 1.0, 'wonWhenSeenStreet2': 1.0, 'wonWhenSeenStreet3': 1.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-FR-USD-0.01-0.02-201004.4betPF.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-FR-USD-0.01-0.02-201004.4betPF.txt.hp index a9cffd09..8f9a9173 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-FR-USD-0.01-0.02-201004.4betPF.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-FR-USD-0.01-0.02-201004.4betPF.txt.hp @@ -1,4 +1,107 @@ -{ u'Player0': { 'card1': 0, +{ u'Hero': { 'card1': 15, + 'card2': 51, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': False, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 2, + 'raiseFirstInChance': False, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 2, + 'sitout': False, + 'startCards': 25, + 'startCash': 35, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': True, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': False, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': False, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': False, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': 0, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, + u'Player0': { 'card1': 0, 'card2': 0, 'card3': 0, 'card4': 0, @@ -47,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -24, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -96,104 +204,6 @@ 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet4': 0.0}, - u'Hero': { 'card1': 15, - 'card2': 51, - 'card3': 0, - 'card4': 0, - 'card5': 0, - 'card6': 0, - 'card7': 0, - 'foldBbToStealChance': False, - 'foldSbToStealChance': False, - 'foldToOtherRaisedStreet0': False, - 'foldToOtherRaisedStreet1': False, - 'foldToOtherRaisedStreet2': False, - 'foldToOtherRaisedStreet3': False, - 'foldToOtherRaisedStreet4': False, - 'foldToStreet1CBChance': False, - 'foldToStreet1CBDone': False, - 'foldToStreet2CBChance': False, - 'foldToStreet2CBDone': False, - 'foldToStreet3CBChance': False, - 'foldToStreet3CBDone': False, - 'foldToStreet4CBChance': False, - 'foldToStreet4CBDone': False, - 'foldedBbToSteal': False, - 'foldedSbToSteal': False, - 'other3BStreet0': False, - 'other4BStreet0': False, - 'otherRaisedStreet0': False, - 'otherRaisedStreet1': False, - 'otherRaisedStreet2': False, - 'otherRaisedStreet3': False, - 'otherRaisedStreet4': False, - 'position': 2, - 'raiseFirstInChance': False, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': False, - 'seatNo': 2, - 'sitout': False, - 'startCards': 25, - 'startCash': 35, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': True, - 'street0_4BDone': False, - 'street0_FoldTo3BChance': False, - 'street0_FoldTo3BDone': False, - 'street0_FoldTo4BChance': False, - 'street0_FoldTo4BDone': False, - 'street1Aggr': False, - 'street1Bets': 0, - 'street1CBChance': False, - 'street1CBDone': False, - 'street1Calls': 0, - 'street1CheckCallRaiseChance': False, - 'street1CheckCallRaiseDone': False, - 'street1Raises': 0, - 'street1Seen': False, - 'street2Aggr': False, - 'street2Bets': 0, - 'street2CBChance': False, - 'street2CBDone': False, - 'street2Calls': 0, - 'street2CheckCallRaiseChance': False, - 'street2CheckCallRaiseDone': False, - 'street2Raises': 0, - 'street2Seen': False, - 'street3Aggr': False, - 'street3Bets': 0, - 'street3CBChance': False, - 'street3CBDone': False, - 'street3Calls': 0, - 'street3CheckCallRaiseChance': False, - 'street3CheckCallRaiseDone': False, - 'street3Raises': 0, - 'street3Seen': False, - 'street4Aggr': False, - 'street4Bets': 0, - 'street4CBChance': False, - 'street4CBDone': False, - 'street4Calls': 0, - 'street4CheckCallRaiseChance': False, - 'street4CheckCallRaiseDone': False, - 'street4Raises': 0, - 'street4Seen': False, - 'totalProfit': 0, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 0, - 'wonAtSD': 0.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}, u'Player2': { 'card1': 36, 'card2': 23, 'card3': 0, @@ -243,10 +253,14 @@ 'street0_3BDone': True, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -131, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': True, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 148, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -635,10 +665,14 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -675,6 +709,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -1, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -733,10 +768,14 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -753,8 +792,8 @@ 'street2Calls': 0, 'street2CheckCallRaiseChance': False, 'street2CheckCallRaiseDone': False, - 'street2Seen': False, 'street2Raises': False, + 'street2Seen': False, 'street3Aggr': False, 'street3Bets': 0, 'street3CBChance': False, @@ -773,6 +812,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -781,4 +821,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-9max-USD-0.01-0.02-20100829.No.VPIP.from.posted.bb.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-9max-USD-0.01-0.02-20100829.No.VPIP.from.posted.bb.txt.hp index 352f0995..1d327cfd 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-9max-USD-0.01-0.02-20100829.No.VPIP.from.posted.bb.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-9max-USD-0.01-0.02-20100829.No.VPIP.from.posted.bb.txt.hp @@ -1,102 +1,4 @@ -{ u'Hero': { 'card1': 50, - 'card2': 9, - 'card3': 28, - 'card4': 2, - 'card5': 0, - 'card6': 0, - 'card7': 0, - 'foldBbToStealChance': False, - 'foldSbToStealChance': False, - 'foldToOtherRaisedStreet0': False, - 'foldToOtherRaisedStreet1': False, - 'foldToOtherRaisedStreet2': True, - 'foldToOtherRaisedStreet3': False, - 'foldToOtherRaisedStreet4': False, - 'foldToStreet1CBChance': False, - 'foldToStreet1CBDone': False, - 'foldToStreet2CBChance': False, - 'foldToStreet2CBDone': False, - 'foldToStreet3CBChance': False, - 'foldToStreet3CBDone': False, - 'foldToStreet4CBChance': False, - 'foldToStreet4CBDone': False, - 'foldedBbToSteal': False, - 'foldedSbToSteal': False, - 'other3BStreet0': False, - 'other4BStreet0': False, - 'otherRaisedStreet0': False, - 'otherRaisedStreet1': False, - 'otherRaisedStreet2': True, - 'otherRaisedStreet3': False, - 'otherRaisedStreet4': False, - 'position': 3, - 'raiseFirstInChance': False, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': False, - 'seatNo': 3, - 'sitout': False, - 'startCards': 0, - 'startCash': 500, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': False, - 'street0_FoldTo3BChance': False, - 'street0_FoldTo3BDone': False, - 'street0_FoldTo4BChance': False, - 'street0_FoldTo4BDone': False, - 'street1Aggr': False, - 'street1Bets': 0, - 'street1CBChance': False, - 'street1CBDone': False, - 'street1Calls': 0, - 'street1CheckCallRaiseChance': False, - 'street1CheckCallRaiseDone': False, - 'street1Raises': 0, - 'street1Seen': True, - 'street2Aggr': False, - 'street2Bets': 0, - 'street2CBChance': False, - 'street2CBDone': False, - 'street2Calls': 0, - 'street2CheckCallRaiseChance': False, - 'street2CheckCallRaiseDone': False, - 'street2Raises': 0, - 'street2Seen': True, - 'street3Aggr': False, - 'street3Bets': 0, - 'street3CBChance': False, - 'street3CBDone': False, - 'street3Calls': 0, - 'street3CheckCallRaiseChance': True, - 'street3CheckCallRaiseDone': False, - 'street3Raises': 0, - 'street3Seen': False, - 'street4Aggr': False, - 'street4Bets': 0, - 'street4CBChance': False, - 'street4CBDone': False, - 'street4Calls': 0, - 'street4CheckCallRaiseChance': False, - 'street4CheckCallRaiseDone': False, - 'street4Raises': 0, - 'street4Seen': False, - 'totalProfit': -2, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 0, - 'wonAtSD': 0.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}, - u'2TONTOM': { 'card1': 0, +{ u'2TONTOM': { 'card1': 0, 'card2': 0, 'card3': 0, 'card4': 0, @@ -145,10 +47,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -292,6 +204,109 @@ 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet4': 0.0}, + u'Hero': { 'card1': 50, + 'card2': 9, + 'card3': 28, + 'card4': 2, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': True, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': True, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 3, + 'raiseFirstInChance': False, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 3, + 'sitout': False, + 'startCards': 0, + 'startCash': 500, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': True, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': True, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': True, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': False, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': -2, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, u'Mr NoNo! Srb': { 'card1': 0, 'card2': 0, 'card3': 0, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -635,10 +665,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -675,6 +709,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -733,10 +768,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -773,6 +812,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -831,10 +871,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -871,6 +915,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 12, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -879,4 +924,4 @@ 'wonWhenSeenStreet1': 1.0, 'wonWhenSeenStreet2': 1.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt.hp index fd1bd3db..da11104a 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt.hp @@ -47,10 +47,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -3, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -96,6 +101,109 @@ 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet4': 0.0}, + u'Hero': { 'card1': 32, + 'card2': 41, + 'card3': 4, + 'card4': 37, + 'card5': 38, + 'card6': 18, + 'card7': 16, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': True, + 'otherRaisedStreet3': True, + 'otherRaisedStreet4': True, + 'position': 6, + 'raiseFirstInChance': True, + 'raisedFirstIn': False, + 'rake': 2, + 'sawShowdown': True, + 'seatNo': 5, + 'sitout': False, + 'startCards': 0, + 'startCash': 152, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 1, + 'street0Raises': 0, + 'street0VPI': True, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': True, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 1, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': True, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 1, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': True, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 1, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': True, + 'success_Steal': False, + 'totalProfit': 13, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 40, + 'wonAtSD': 1.0, + 'wonWhenSeenStreet1': 1.0, + 'wonWhenSeenStreet2': 1.0, + 'wonWhenSeenStreet3': 1.0, + 'wonWhenSeenStreet4': 1.0}, u'Soroka69': { 'card1': 0, 'card2': 0, 'card3': 19, @@ -145,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +297,7 @@ 'street4CheckCallRaiseDone': True, 'street4Raises': 0, 'street4Seen': True, + 'success_Steal': False, 'totalProfit': -19, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -1, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -3, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': True, + 'success_Steal': False, 'totalProfit': 13, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +665,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +709,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -3, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -586,104 +719,6 @@ 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet4': 0.0}, - u'Hero': { 'card1': 32, - 'card2': 41, - 'card3': 4, - 'card4': 37, - 'card5': 38, - 'card6': 18, - 'card7': 16, - 'foldBbToStealChance': False, - 'foldSbToStealChance': False, - 'foldToOtherRaisedStreet0': False, - 'foldToOtherRaisedStreet1': False, - 'foldToOtherRaisedStreet2': False, - 'foldToOtherRaisedStreet3': False, - 'foldToOtherRaisedStreet4': False, - 'foldToStreet1CBChance': False, - 'foldToStreet1CBDone': False, - 'foldToStreet2CBChance': False, - 'foldToStreet2CBDone': False, - 'foldToStreet3CBChance': False, - 'foldToStreet3CBDone': False, - 'foldToStreet4CBChance': False, - 'foldToStreet4CBDone': False, - 'foldedBbToSteal': False, - 'foldedSbToSteal': False, - 'other3BStreet0': False, - 'other4BStreet0': False, - 'otherRaisedStreet0': False, - 'otherRaisedStreet1': False, - 'otherRaisedStreet2': True, - 'otherRaisedStreet3': True, - 'otherRaisedStreet4': True, - 'position': 6, - 'raiseFirstInChance': True, - 'raisedFirstIn': False, - 'rake': 2, - 'sawShowdown': True, - 'seatNo': 5, - 'sitout': False, - 'startCards': 0, - 'startCash': 152, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 1, - 'street0Raises': 0, - 'street0VPI': True, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': False, - 'street0_FoldTo3BChance': False, - 'street0_FoldTo3BDone': False, - 'street0_FoldTo4BChance': False, - 'street0_FoldTo4BDone': False, - 'street1Aggr': False, - 'street1Bets': 0, - 'street1CBChance': False, - 'street1CBDone': False, - 'street1Calls': 0, - 'street1CheckCallRaiseChance': False, - 'street1CheckCallRaiseDone': False, - 'street1Raises': 0, - 'street1Seen': True, - 'street2Aggr': False, - 'street2Bets': 0, - 'street2CBChance': False, - 'street2CBDone': False, - 'street2Calls': 1, - 'street2CheckCallRaiseChance': False, - 'street2CheckCallRaiseDone': False, - 'street2Raises': 0, - 'street2Seen': True, - 'street3Aggr': False, - 'street3Bets': 0, - 'street3CBChance': False, - 'street3CBDone': False, - 'street3Calls': 1, - 'street3CheckCallRaiseChance': False, - 'street3CheckCallRaiseDone': False, - 'street3Raises': 0, - 'street3Seen': True, - 'street4Aggr': False, - 'street4Bets': 0, - 'street4CBChance': False, - 'street4CBDone': False, - 'street4Calls': 1, - 'street4CheckCallRaiseChance': False, - 'street4CheckCallRaiseDone': False, - 'street4Raises': 0, - 'street4Seen': True, - 'totalProfit': 13, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 40, - 'wonAtSD': 1.0, - 'wonWhenSeenStreet1': 1.0, - 'wonWhenSeenStreet2': 1.0, - 'wonWhenSeenStreet3': 1.0, - 'wonWhenSeenStreet4': 1.0}, u'u.pressure': { 'card1': 0, 'card2': 0, 'card3': 22, @@ -733,10 +768,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -773,6 +812,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -1, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -781,4 +821,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/UltimateBet/Flop/IHH20101106 Baseline Rd - Hold'em No Limit $0.02(Real Money) Table 25932774.txt.hp b/pyfpdb/regression-test-files/cash/UltimateBet/Flop/IHH20101106 Baseline Rd - Hold'em No Limit $0.02(Real Money) Table 25932774.txt.hp index d70ac4c7..67337aba 100644 --- a/pyfpdb/regression-test-files/cash/UltimateBet/Flop/IHH20101106 Baseline Rd - Hold'em No Limit $0.02(Real Money) Table 25932774.txt.hp +++ b/pyfpdb/regression-test-files/cash/UltimateBet/Flop/IHH20101106 Baseline Rd - Hold'em No Limit $0.02(Real Money) Table 25932774.txt.hp @@ -47,10 +47,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -635,10 +665,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -675,6 +709,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -1, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -733,10 +768,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -773,6 +812,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -831,10 +871,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -871,6 +915,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 7, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -879,4 +924,4 @@ 'wonWhenSeenStreet1': 1.0, 'wonWhenSeenStreet2': 1.0, 'wonWhenSeenStreet3': 1.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Win2day/Flop/NLHE-USD-0.05-0.10-Date-unknown.Sample.txt.hp b/pyfpdb/regression-test-files/cash/Win2day/Flop/NLHE-USD-0.05-0.10-Date-unknown.Sample.txt.hp index c556aeeb..08298491 100644 --- a/pyfpdb/regression-test-files/cash/Win2day/Flop/NLHE-USD-0.05-0.10-Date-unknown.Sample.txt.hp +++ b/pyfpdb/regression-test-files/cash/Win2day/Flop/NLHE-USD-0.05-0.10-Date-unknown.Sample.txt.hp @@ -47,10 +47,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -30, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': True, 'street1Bets': 1, 'street1CBChance': False, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 27, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -291,4 +306,4 @@ 'wonWhenSeenStreet1': 1.0, 'wonWhenSeenStreet2': 1.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample.txt.hp b/pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample.txt.hp index 5e75242e..cafbceda 100644 --- a/pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample.txt.hp +++ b/pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample.txt.hp @@ -47,10 +47,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +91,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -127, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -10, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -15, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -47, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 178, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -487,4 +512,4 @@ 'wonWhenSeenStreet1': 1.0, 'wonWhenSeenStreet2': 1.0, 'wonWhenSeenStreet3': 1.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Invalid.side.pot.Player8.txt.hp b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Invalid.side.pot.Player8.txt.hp index eb8f97ea..c42f243a 100644 --- a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Invalid.side.pot.Player8.txt.hp +++ b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Invalid.side.pot.Player8.txt.hp @@ -1,4 +1,107 @@ -{ u'Player1': { 'card1': 0, +{ u'Hero': { 'card1': 20, + 'card2': 7, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': False, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 1, + 'raiseFirstInChance': False, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 4, + 'sitout': False, + 'startCards': 85, + 'startCash': 493, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': True, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': False, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': False, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': False, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': 0, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, + u'Player1': { 'card1': 0, 'card2': 0, 'card3': 0, 'card4': 0, @@ -47,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -87,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -5, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -145,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 599, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -292,104 +410,6 @@ 'wonWhenSeenStreet2': 1.0, 'wonWhenSeenStreet3': 1.0, 'wonWhenSeenStreet4': 0.0}, - u'Hero': { 'card1': 20, - 'card2': 7, - 'card3': 0, - 'card4': 0, - 'card5': 0, - 'card6': 0, - 'card7': 0, - 'foldBbToStealChance': False, - 'foldSbToStealChance': False, - 'foldToOtherRaisedStreet0': False, - 'foldToOtherRaisedStreet1': False, - 'foldToOtherRaisedStreet2': False, - 'foldToOtherRaisedStreet3': False, - 'foldToOtherRaisedStreet4': False, - 'foldToStreet1CBChance': False, - 'foldToStreet1CBDone': False, - 'foldToStreet2CBChance': False, - 'foldToStreet2CBDone': False, - 'foldToStreet3CBChance': False, - 'foldToStreet3CBDone': False, - 'foldToStreet4CBChance': False, - 'foldToStreet4CBDone': False, - 'foldedBbToSteal': False, - 'foldedSbToSteal': False, - 'other3BStreet0': False, - 'other4BStreet0': False, - 'otherRaisedStreet0': False, - 'otherRaisedStreet1': False, - 'otherRaisedStreet2': False, - 'otherRaisedStreet3': False, - 'otherRaisedStreet4': False, - 'position': 1, - 'raiseFirstInChance': False, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': False, - 'seatNo': 4, - 'sitout': False, - 'startCards': 85, - 'startCash': 493, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': True, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': False, - 'street0_FoldTo3BChance': False, - 'street0_FoldTo3BDone': False, - 'street0_FoldTo4BChance': False, - 'street0_FoldTo4BDone': False, - 'street1Aggr': False, - 'street1Bets': 0, - 'street1CBChance': False, - 'street1CBDone': False, - 'street1Calls': 0, - 'street1CheckCallRaiseChance': False, - 'street1CheckCallRaiseDone': False, - 'street1Raises': 0, - 'street1Seen': False, - 'street2Aggr': False, - 'street2Bets': 0, - 'street2CBChance': False, - 'street2CBDone': False, - 'street2Calls': 0, - 'street2CheckCallRaiseChance': False, - 'street2CheckCallRaiseDone': False, - 'street2Raises': 0, - 'street2Seen': False, - 'street3Aggr': False, - 'street3Bets': 0, - 'street3CBChance': False, - 'street3CBDone': False, - 'street3Calls': 0, - 'street3CheckCallRaiseChance': False, - 'street3CheckCallRaiseDone': False, - 'street3Raises': 0, - 'street3Seen': False, - 'street4Aggr': False, - 'street4Bets': 0, - 'street4CBChance': False, - 'street4CBDone': False, - 'street4Calls': 0, - 'street4CheckCallRaiseChance': False, - 'street4CheckCallRaiseDone': False, - 'street4Raises': 0, - 'street4Seen': False, - 'totalProfit': 0, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 0, - 'wonAtSD': 0.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}, u'Player5': { 'card1': 0, 'card2': 0, 'card3': 0, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -635,10 +665,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -675,6 +709,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -5, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -733,10 +768,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': True, 'street1Bets': 1, 'street1CBChance': True, @@ -773,6 +812,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -493, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -831,10 +871,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': True, 'street1Bets': 0, 'street1CBChance': False, @@ -871,6 +915,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -152, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -879,4 +924,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Real.side.pot.with.bad.collected.Biggest.stack.wins.txt.hp b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Real.side.pot.with.bad.collected.Biggest.stack.wins.txt.hp index 18c28727..a85c7280 100644 --- a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Real.side.pot.with.bad.collected.Biggest.stack.wins.txt.hp +++ b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Real.side.pot.with.bad.collected.Biggest.stack.wins.txt.hp @@ -1,101 +1,106 @@ { u'Hero': { 'card1': 51, - 'card2': 9, - 'card3': 0, - 'card4': 0, - 'card5': 0, - 'card6': 0, - 'card7': 0, - 'foldBbToStealChance': False, - 'foldSbToStealChance': False, - 'foldToOtherRaisedStreet0': False, - 'foldToOtherRaisedStreet1': False, - 'foldToOtherRaisedStreet2': True, - 'foldToOtherRaisedStreet3': False, - 'foldToOtherRaisedStreet4': False, - 'foldToStreet1CBChance': False, - 'foldToStreet1CBDone': False, - 'foldToStreet2CBChance': False, - 'foldToStreet2CBDone': False, - 'foldToStreet3CBChance': False, - 'foldToStreet3CBDone': False, - 'foldToStreet4CBChance': False, - 'foldToStreet4CBDone': False, - 'foldedBbToSteal': False, - 'foldedSbToSteal': False, - 'other3BStreet0': False, - 'other4BStreet0': False, - 'otherRaisedStreet0': False, - 'otherRaisedStreet1': True, - 'otherRaisedStreet2': True, - 'otherRaisedStreet3': False, - 'otherRaisedStreet4': False, - 'position': 1, - 'raiseFirstInChance': False, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': False, - 'seatNo': 1, - 'sitout': False, - 'startCards': 116, - 'startCash': 500, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': False, - 'street0_FoldTo3BChance': False, - 'street0_FoldTo3BDone': False, - 'street0_FoldTo4BChance': False, - 'street0_FoldTo4BDone': False, - 'street1Aggr': False, - 'street1Bets': 0, - 'street1CBChance': False, - 'street1CBDone': False, - 'street1Calls': 1, - 'street1CheckCallRaiseChance': False, - 'street1CheckCallRaiseDone': False, - 'street1Raises': 0, - 'street1Seen': True, - 'street2Aggr': False, - 'street2Bets': 0, - 'street2CBChance': False, - 'street2CBDone': False, - 'street2Calls': 0, - 'street2CheckCallRaiseChance': False, - 'street2CheckCallRaiseDone': False, - 'street2Raises': 0, - 'street2Seen': True, - 'street3Aggr': False, - 'street3Bets': 0, - 'street3CBChance': False, - 'street3CBDone': False, - 'street3Calls': 0, - 'street3CheckCallRaiseChance': False, - 'street3CheckCallRaiseDone': False, - 'street3Raises': 0, - 'street3Seen': False, - 'street4Aggr': False, - 'street4Bets': 0, - 'street4CBChance': False, - 'street4CBDone': False, - 'street4Calls': 0, - 'street4CheckCallRaiseChance': False, - 'street4CheckCallRaiseDone': False, - 'street4Raises': 0, - 'street4Seen': False, - 'totalProfit': -10, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 0, - 'wonAtSD': 0.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}, + 'card2': 9, + 'card3': 0, + 'card4': 0, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': True, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': True, + 'otherRaisedStreet2': True, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 1, + 'raiseFirstInChance': False, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 1, + 'sitout': False, + 'startCards': 116, + 'startCash': 500, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 1, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': True, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': True, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': False, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': -10, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, u'Player2': { 'card1': 0, 'card2': 0, 'card3': 0, @@ -145,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -185,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -5, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -243,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -2, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,7 +400,8 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, - 'totalProfit': 483, + 'success_Steal': False, + 'totalProfit': 319, 'tourneyTypeId': None, 'tourneysPlayersIds': None, 'winnings': 656, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -635,10 +665,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -675,6 +709,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -733,10 +768,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': True, 'street1Bets': 1, 'street1CBChance': False, @@ -773,6 +812,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -337, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -831,10 +871,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -871,6 +915,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -879,4 +924,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp b/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp index 59fe0747..22155cce 100644 --- a/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp +++ b/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp @@ -1,4 +1,107 @@ -{ u'Player10': { 'card1': 32, +{ u'Hero': { 'card1': 8, + 'card2': 28, + 'card3': 3, + 'card4': 29, + 'card5': 0, + 'card6': 0, + 'card7': 0, + 'foldBbToStealChance': False, + 'foldSbToStealChance': False, + 'foldToOtherRaisedStreet0': False, + 'foldToOtherRaisedStreet1': False, + 'foldToOtherRaisedStreet2': False, + 'foldToOtherRaisedStreet3': False, + 'foldToOtherRaisedStreet4': False, + 'foldToStreet1CBChance': False, + 'foldToStreet1CBDone': False, + 'foldToStreet2CBChance': False, + 'foldToStreet2CBDone': False, + 'foldToStreet3CBChance': False, + 'foldToStreet3CBDone': False, + 'foldToStreet4CBChance': False, + 'foldToStreet4CBDone': False, + 'foldedBbToSteal': False, + 'foldedSbToSteal': False, + 'other3BStreet0': False, + 'other4BStreet0': False, + 'otherRaisedStreet0': False, + 'otherRaisedStreet1': False, + 'otherRaisedStreet2': False, + 'otherRaisedStreet3': False, + 'otherRaisedStreet4': False, + 'position': 4, + 'raiseFirstInChance': True, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 8, + 'sitout': False, + 'startCards': 0, + 'startCash': 1271, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, + 'street1Aggr': False, + 'street1Bets': 0, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': False, + 'street2Aggr': False, + 'street2Bets': 0, + 'street2CBChance': False, + 'street2CBDone': False, + 'street2Calls': 0, + 'street2CheckCallRaiseChance': False, + 'street2CheckCallRaiseDone': False, + 'street2Raises': 0, + 'street2Seen': False, + 'street3Aggr': False, + 'street3Bets': 0, + 'street3CBChance': False, + 'street3CBDone': False, + 'street3Calls': 0, + 'street3CheckCallRaiseChance': False, + 'street3CheckCallRaiseDone': False, + 'street3Raises': 0, + 'street3Seen': False, + 'street4Aggr': False, + 'street4Bets': 0, + 'street4CBChance': False, + 'street4CBDone': False, + 'street4Calls': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'success_Steal': False, + 'totalProfit': 0, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, + u'Player10': { 'card1': 32, 'card2': 19, 'card3': 5, 'card4': 46, @@ -47,10 +150,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': True, 'street1Bets': 1, 'street1CBChance': False, @@ -87,6 +194,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -145, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -96,104 +204,6 @@ 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet4': 0.0}, - u'Hero': { 'card1': 8, - 'card2': 28, - 'card3': 3, - 'card4': 29, - 'card5': 0, - 'card6': 0, - 'card7': 0, - 'foldBbToStealChance': False, - 'foldSbToStealChance': False, - 'foldToOtherRaisedStreet0': False, - 'foldToOtherRaisedStreet1': False, - 'foldToOtherRaisedStreet2': False, - 'foldToOtherRaisedStreet3': False, - 'foldToOtherRaisedStreet4': False, - 'foldToStreet1CBChance': False, - 'foldToStreet1CBDone': False, - 'foldToStreet2CBChance': False, - 'foldToStreet2CBDone': False, - 'foldToStreet3CBChance': False, - 'foldToStreet3CBDone': False, - 'foldToStreet4CBChance': False, - 'foldToStreet4CBDone': False, - 'foldedBbToSteal': False, - 'foldedSbToSteal': False, - 'other3BStreet0': False, - 'other4BStreet0': False, - 'otherRaisedStreet0': False, - 'otherRaisedStreet1': False, - 'otherRaisedStreet2': False, - 'otherRaisedStreet3': False, - 'otherRaisedStreet4': False, - 'position': 4, - 'raiseFirstInChance': True, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': False, - 'seatNo': 8, - 'sitout': False, - 'startCards': 0, - 'startCash': 1271, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': False, - 'street0_FoldTo3BChance': False, - 'street0_FoldTo3BDone': False, - 'street0_FoldTo4BChance': False, - 'street0_FoldTo4BDone': False, - 'street1Aggr': False, - 'street1Bets': 0, - 'street1CBChance': False, - 'street1CBDone': False, - 'street1Calls': 0, - 'street1CheckCallRaiseChance': False, - 'street1CheckCallRaiseDone': False, - 'street1Raises': 0, - 'street1Seen': False, - 'street2Aggr': False, - 'street2Bets': 0, - 'street2CBChance': False, - 'street2CBDone': False, - 'street2Calls': 0, - 'street2CheckCallRaiseChance': False, - 'street2CheckCallRaiseDone': False, - 'street2Raises': 0, - 'street2Seen': False, - 'street3Aggr': False, - 'street3Bets': 0, - 'street3CBChance': False, - 'street3CBDone': False, - 'street3Calls': 0, - 'street3CheckCallRaiseChance': False, - 'street3CheckCallRaiseDone': False, - 'street3Raises': 0, - 'street3Seen': False, - 'street4Aggr': False, - 'street4Bets': 0, - 'street4CBChance': False, - 'street4CBDone': False, - 'street4Calls': 0, - 'street4CheckCallRaiseChance': False, - 'street4CheckCallRaiseDone': False, - 'street4Raises': 0, - 'street4Seen': False, - 'totalProfit': 0, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 0, - 'wonAtSD': 0.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}, u'Player14': { 'card1': 0, 'card2': 0, 'card3': 0, @@ -243,10 +253,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -283,6 +297,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -5, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -341,10 +356,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -381,6 +400,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -439,10 +459,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -479,6 +503,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 0, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -537,10 +562,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -577,6 +606,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -27, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -635,10 +665,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -675,6 +709,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -57, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -733,10 +768,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -773,6 +812,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': -27, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -831,10 +871,14 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_C4BChance': False, + 'street0_C4BDone': False, 'street0_FoldTo3BChance': False, 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, + 'street0_SqueezeChance': False, + 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -871,6 +915,7 @@ 'street4CheckCallRaiseDone': False, 'street4Raises': 0, 'street4Seen': False, + 'success_Steal': False, 'totalProfit': 239, 'tourneyTypeId': None, 'tourneysPlayersIds': None, @@ -879,4 +924,4 @@ 'wonWhenSeenStreet1': 1.0, 'wonWhenSeenStreet2': 1.0, 'wonWhenSeenStreet3': 1.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file
(?P.+?)<\/td>(?P.+?)