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

Merge branch 'sorrow' into chazdazzle

Browse Source
This commit is contained in:
Chaz Littlejohn 2011-03-31 16:41:28 +00:00
commit 54f05e4866
5 changed files with 132 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pyfpdb/TestHandsPlayers.py
View File

@ -21,8 +21,6 @@
import sys import sys
import os import os
import codecs import codecs
import pprint
import PokerStarsToFpdb
from Hand import * from Hand import *
import Configuration import Configuration
import Database import Database
@ -31,6 +29,8 @@ import fpdb_import
import Options import Options
import datetime import datetime
import pytz import pytz
import pprint
pp = pprint.PrettyPrinter(indent=4)
DEBUG = False DEBUG = False
@ -149,6 +149,9 @@ def compare_hands_file(filename, importer, errors):
for hand in handlist: for hand in handlist:
ghash = hand.stats.getHands() ghash = hand.stats.getHands()
# Delete unused data from hash
del ghash['gsc']
del ghash['sc']
for datum in ghash: for datum in ghash:
#print "DEBUG: hand: '%s'" % datum #print "DEBUG: hand: '%s'" % datum
try: try:

64
pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-0.10-0.20-201011.txt.hp
View File

@ -1,4 +1,12 @@
{ u'Hero': { 'card1': 0, { u'Hero': { 'card1': 9,
'card2': 17,
'card3': 13,
'card4': 48,
'card5': 37,
'card6': 0,
'card7': 0,
'card8': 0,
'card9': 0,
'card10': 0, 'card10': 0,
'card11': 0, 'card11': 0,
'card12': 0, 'card12': 0,
@ -9,15 +17,7 @@
'card17': 0, 'card17': 0,
'card18': 0, 'card18': 0,
'card19': 0, 'card19': 0,
'card2': 0,
'card20': 0, 'card20': 0,
'card3': 0,
'card4': 0,
'card5': 0,
'card6': 0,
'card7': 0,
'card8': 0,
'card9': 0,
'foldBbToStealChance': False, 'foldBbToStealChance': False,
'foldSbToStealChance': False, 'foldSbToStealChance': False,
'foldToOtherRaisedStreet0': False, 'foldToOtherRaisedStreet0': False,
@ -117,18 +117,7 @@
'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet3': 0.0,
'wonWhenSeenStreet4': 0.0}, 'wonWhenSeenStreet4': 0.0},
u'Player1': { 'card1': 0, u'Player1': { 'card1': 0,
'card10': 0,
'card11': 0,
'card12': 0,
'card13': 0,
'card14': 0,
'card15': 0,
'card16': 0,
'card17': 0,
'card18': 0,
'card19': 0,
'card2': 0, 'card2': 0,
'card20': 0,
'card3': 0, 'card3': 0,
'card4': 0, 'card4': 0,
'card5': 0, 'card5': 0,
@ -136,6 +125,17 @@
'card7': 0, 'card7': 0,
'card8': 0, 'card8': 0,
'card9': 0, 'card9': 0,
'card10': 0,
'card11': 0,
'card12': 0,
'card13': 0,
'card14': 0,
'card15': 0,
'card16': 32,
'card17': 31,
'card18': 29,
'card19': 15,
'card20': 14,
'foldBbToStealChance': False, 'foldBbToStealChance': False,
'foldSbToStealChance': False, 'foldSbToStealChance': False,
'foldToOtherRaisedStreet0': False, 'foldToOtherRaisedStreet0': False,
@ -353,18 +353,7 @@
'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet3': 0.0,
'wonWhenSeenStreet4': 0.0}, 'wonWhenSeenStreet4': 0.0},
u'Player3': { 'card1': 0, u'Player3': { 'card1': 0,
'card10': 0,
'card11': 0,
'card12': 0,
'card13': 0,
'card14': 0,
'card15': 0,
'card16': 0,
'card17': 0,
'card18': 0,
'card19': 0,
'card2': 0, 'card2': 0,
'card20': 0,
'card3': 0, 'card3': 0,
'card4': 0, 'card4': 0,
'card5': 0, 'card5': 0,
@ -372,6 +361,17 @@
'card7': 0, 'card7': 0,
'card8': 0, 'card8': 0,
'card9': 0, 'card9': 0,
'card10': 0,
'card11': 0,
'card12': 0,
'card13': 0,
'card14': 0,
'card15': 0,
'card16': 21,
'card17': 7,
'card18': 6,
'card19': 30,
'card20': 40,
'foldBbToStealChance': False, 'foldBbToStealChance': False,
'foldSbToStealChance': False, 'foldSbToStealChance': False,
'foldToOtherRaisedStreet0': False, 'foldToOtherRaisedStreet0': False,
@ -705,4 +705,4 @@
'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet1': 0.0,
'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet2': 0.0,
'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet3': 0.0,
'wonWhenSeenStreet4': 0.0}} 'wonWhenSeenStreet4': 0.0}}

40
pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-150-300-201012.txt.hp
View File

@ -1,4 +1,12 @@
{ u'Hero': { 'card1': 0, { u'Hero': { 'card1': 1,
'card2': 24,
'card3': 42,
'card4': 35,
'card5': 27,
'card6': 0,
'card7': 0,
'card8': 0,
'card9': 0,
'card10': 0, 'card10': 0,
'card11': 0, 'card11': 0,
'card12': 0, 'card12': 0,
@ -9,15 +17,7 @@
'card17': 0, 'card17': 0,
'card18': 0, 'card18': 0,
'card19': 0, 'card19': 0,
'card2': 0,
'card20': 0, 'card20': 0,
'card3': 0,
'card4': 0,
'card5': 0,
'card6': 0,
'card7': 0,
'card8': 0,
'card9': 0,
'foldBbToStealChance': False, 'foldBbToStealChance': False,
'foldSbToStealChance': False, 'foldSbToStealChance': False,
'foldToOtherRaisedStreet0': False, 'foldToOtherRaisedStreet0': False,
@ -359,12 +359,12 @@
'card13': 0, 'card13': 0,
'card14': 0, 'card14': 0,
'card15': 0, 'card15': 0,
'card16': 0, 'card16': 6,
'card17': 0, 'card17': 32,
'card18': 0, 'card18': 33,
'card19': 0, 'card19': 17,
'card20': 15,
'card2': 0, 'card2': 0,
'card20': 0,
'card3': 0, 'card3': 0,
'card4': 0, 'card4': 0,
'card5': 0, 'card5': 0,
@ -477,12 +477,12 @@
'card13': 0, 'card13': 0,
'card14': 0, 'card14': 0,
'card15': 0, 'card15': 0,
'card16': 0, 'card16': 49,
'card17': 0, 'card17': 19,
'card18': 0, 'card18': 30,
'card19': 0, 'card19': 28,
'card20': 14,
'card2': 0, 'card2': 0,
'card20': 0,
'card3': 0, 'card3': 0,
'card4': 0, 'card4': 0,
'card5': 0, 'card5': 0,
@ -587,4 +587,4 @@
'wonWhenSeenStreet1': 1.0, 'wonWhenSeenStreet1': 1.0,
'wonWhenSeenStreet2': 1.0, 'wonWhenSeenStreet2': 1.0,
'wonWhenSeenStreet3': 1.0, 'wonWhenSeenStreet3': 1.0,
'wonWhenSeenStreet4': 0.0}} 'wonWhenSeenStreet4': 0.0}}

86
pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hp
View File

@ -1,4 +1,12 @@
{ u'Hero': { 'card1': 0, { u'Hero': { 'card1': 48,
'card2': 17,
'card3': 44,
'card4': 14,
'card5': 7,
'card6': 0,
'card7': 0,
'card8': 0,
'card9': 0,
'card10': 0, 'card10': 0,
'card11': 0, 'card11': 0,
'card12': 0, 'card12': 0,
@ -9,15 +17,7 @@
'card17': 0, 'card17': 0,
'card18': 0, 'card18': 0,
'card19': 0, 'card19': 0,
'card2': 0,
'card20': 0, 'card20': 0,
'card3': 0,
'card4': 0,
'card5': 0,
'card6': 0,
'card7': 0,
'card8': 0,
'card9': 0,
'foldBbToStealChance': False, 'foldBbToStealChance': False,
'foldSbToStealChance': False, 'foldSbToStealChance': False,
'foldToOtherRaisedStreet0': False, 'foldToOtherRaisedStreet0': False,
@ -117,18 +117,7 @@
'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet3': 0.0,
'wonWhenSeenStreet4': 0.0}, 'wonWhenSeenStreet4': 0.0},
u'Player1': { 'card1': 0, u'Player1': { 'card1': 0,
'card10': 0,
'card11': 0,
'card12': 0,
'card13': 0,
'card14': 0,
'card15': 0,
'card16': 0,
'card17': 0,
'card18': 0,
'card19': 0,
'card2': 0, 'card2': 0,
'card20': 0,
'card3': 0, 'card3': 0,
'card4': 0, 'card4': 0,
'card5': 0, 'card5': 0,
@ -136,6 +125,17 @@
'card7': 0, 'card7': 0,
'card8': 0, 'card8': 0,
'card9': 0, 'card9': 0,
'card10': 0,
'card11': 0,
'card12': 0,
'card13': 0,
'card14': 0,
'card15': 0,
'card16': 6,
'card17': 19,
'card18': 45,
'card19': 11,
'card20': 50,
'foldBbToStealChance': False, 'foldBbToStealChance': False,
'foldSbToStealChance': False, 'foldSbToStealChance': False,
'foldToOtherRaisedStreet0': False, 'foldToOtherRaisedStreet0': False,
@ -235,18 +235,7 @@
'wonWhenSeenStreet3': 1.0, 'wonWhenSeenStreet3': 1.0,
'wonWhenSeenStreet4': 0.0}, 'wonWhenSeenStreet4': 0.0},
u'Player2': { 'card1': 0, u'Player2': { 'card1': 0,
'card10': 0,
'card11': 0,
'card12': 0,
'card13': 0,
'card14': 0,
'card15': 0,
'card16': 0,
'card17': 0,
'card18': 0,
'card19': 0,
'card2': 0, 'card2': 0,
'card20': 0,
'card3': 0, 'card3': 0,
'card4': 0, 'card4': 0,
'card5': 0, 'card5': 0,
@ -254,6 +243,17 @@
'card7': 0, 'card7': 0,
'card8': 0, 'card8': 0,
'card9': 0, 'card9': 0,
'card10': 0,
'card11': 0,
'card12': 0,
'card13': 0,
'card14': 0,
'card15': 0,
'card16': 13,
'card17': 52,
'card18': 23,
'card19': 49,
'card20': 2,
'foldBbToStealChance': False, 'foldBbToStealChance': False,
'foldSbToStealChance': False, 'foldSbToStealChance': False,
'foldToOtherRaisedStreet0': False, 'foldToOtherRaisedStreet0': False,
@ -353,18 +353,7 @@
'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet3': 0.0,
'wonWhenSeenStreet4': 0.0}, 'wonWhenSeenStreet4': 0.0},
u'Player3': { 'card1': 0, u'Player3': { 'card1': 0,
'card10': 0,
'card11': 0,
'card12': 0,
'card13': 0,
'card14': 0,
'card15': 0,
'card16': 0,
'card17': 0,
'card18': 0,
'card19': 0,
'card2': 0, 'card2': 0,
'card20': 0,
'card3': 0, 'card3': 0,
'card4': 0, 'card4': 0,
'card5': 0, 'card5': 0,
@ -372,6 +361,17 @@
'card7': 0, 'card7': 0,
'card8': 0, 'card8': 0,
'card9': 0, 'card9': 0,
'card10': 0,
'card11': 0,
'card12': 0,
'card13': 0,
'card14': 0,
'card15': 0,
'card16': 10,
'card17': 36,
'card18': 40,
'card19': 1,
'card20': 12,
'foldBbToStealChance': False, 'foldBbToStealChance': False,
'foldSbToStealChance': False, 'foldSbToStealChance': False,
'foldToOtherRaisedStreet0': False, 'foldToOtherRaisedStreet0': False,
@ -587,4 +587,4 @@
'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet1': 0.0,
'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet2': 0.0,
'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet3': 0.0,
'wonWhenSeenStreet4': 0.0}} 'wonWhenSeenStreet4': 0.0}}

64
pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-NL-USD-0.10-0.20-201011.Saw.Showdown.Not.UTF16.txt.hp
View File

@ -1,4 +1,12 @@
{ u'Hero': { 'card1': 0, { u'Hero': { 'card1': 7,
'card2': 6,
'card3': 32,
'card4': 50,
'card5': 10,
'card6': 0,
'card7': 0,
'card8': 0,
'card9': 0,
'card10': 0, 'card10': 0,
'card11': 0, 'card11': 0,
'card12': 0, 'card12': 0,
@ -9,15 +17,7 @@
'card17': 0, 'card17': 0,
'card18': 0, 'card18': 0,
'card19': 0, 'card19': 0,
'card2': 0,
'card20': 0, 'card20': 0,
'card3': 0,
'card4': 0,
'card5': 0,
'card6': 0,
'card7': 0,
'card8': 0,
'card9': 0,
'foldBbToStealChance': False, 'foldBbToStealChance': False,
'foldSbToStealChance': False, 'foldSbToStealChance': False,
'foldToOtherRaisedStreet0': False, 'foldToOtherRaisedStreet0': False,
@ -117,18 +117,7 @@
'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet3': 0.0,
'wonWhenSeenStreet4': 0.0}, 'wonWhenSeenStreet4': 0.0},
u'Player1': { 'card1': 0, u'Player1': { 'card1': 0,
'card10': 0,
'card11': 0,
'card12': 0,
'card13': 0,
'card14': 0,
'card15': 0,
'card16': 0,
'card17': 0,
'card18': 0,
'card19': 0,
'card2': 0, 'card2': 0,
'card20': 0,
'card3': 0, 'card3': 0,
'card4': 0, 'card4': 0,
'card5': 0, 'card5': 0,
@ -136,6 +125,17 @@
'card7': 0, 'card7': 0,
'card8': 0, 'card8': 0,
'card9': 0, 'card9': 0,
'card10': 0,
'card11': 0,
'card12': 0,
'card13': 0,
'card14': 0,
'card15': 0,
'card16': 38,
'card17': 37,
'card18': 30,
'card19': 29,
'card20': 28,
'foldBbToStealChance': False, 'foldBbToStealChance': False,
'foldSbToStealChance': False, 'foldSbToStealChance': False,
'foldToOtherRaisedStreet0': False, 'foldToOtherRaisedStreet0': False,
@ -235,18 +235,7 @@
'wonWhenSeenStreet3': 1.0, 'wonWhenSeenStreet3': 1.0,
'wonWhenSeenStreet4': 0.0}, 'wonWhenSeenStreet4': 0.0},
u'Player2': { 'card1': 0, u'Player2': { 'card1': 0,
'card10': 0,
'card11': 0,
'card12': 0,
'card13': 0,
'card14': 0,
'card15': 0,
'card16': 0,
'card17': 0,
'card18': 0,
'card19': 0,
'card2': 0, 'card2': 0,
'card20': 0,
'card3': 0, 'card3': 0,
'card4': 0, 'card4': 0,
'card5': 0, 'card5': 0,
@ -254,6 +243,17 @@
'card7': 0, 'card7': 0,
'card8': 0, 'card8': 0,
'card9': 0, 'card9': 0,
'card10': 0,
'card11': 0,
'card12': 0,
'card13': 0,
'card14': 0,
'card15': 0,
'card16': 49,
'card17': 36,
'card18': 21,
'card19': 47,
'card20': 43,
'foldBbToStealChance': False, 'foldBbToStealChance': False,
'foldSbToStealChance': False, 'foldSbToStealChance': False,
'foldToOtherRaisedStreet0': False, 'foldToOtherRaisedStreet0': False,
@ -705,4 +705,4 @@
'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet1': 0.0,
'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet2': 0.0,
'wonWhenSeenStreet3': 0.0, 'wonWhenSeenStreet3': 0.0,
'wonWhenSeenStreet4': 0.0}} 'wonWhenSeenStreet4': 0.0}}