From 1f3855c7179bafab03045a937de754b2cc320da6 Mon Sep 17 00:00:00 2001 From: Worros Date: Thu, 11 Nov 2010 17:58:18 +0800 Subject: [PATCH 01/17] Regression: Stars local summary file format for tourneys --- ...TT-4max-2.00-201011.Stars.local.format.txt | 450 ++++++++++++++++++ 1 file changed, 450 insertions(+) create mode 100644 pyfpdb/regression-test-files/summaries/Stars/NLHE-USD-MTT-4max-2.00-201011.Stars.local.format.txt diff --git a/pyfpdb/regression-test-files/summaries/Stars/NLHE-USD-MTT-4max-2.00-201011.Stars.local.format.txt b/pyfpdb/regression-test-files/summaries/Stars/NLHE-USD-MTT-4max-2.00-201011.Stars.local.format.txt new file mode 100644 index 00000000..d558def8 --- /dev/null +++ b/pyfpdb/regression-test-files/summaries/Stars/NLHE-USD-MTT-4max-2.00-201011.Stars.local.format.txt @@ -0,0 +1,450 @@ +PokerStars Tournament #329147523, No Limit Hold'em +Buy-In: $2.00/$0.20 USD +440 players +Total Prize Pool: $880.00 USD +Tournament started 2010/11/10 8:15:00 ET + + 1: koppelbaas (wijchen), still playing + 2: cmdc007 (curitiba-Brasil), still playing + 3: Daannijmegen (nijmegen), still playing + 4: tommy10aces (Mandurah), still playing + 5: Svensson91 (Sweden), still playing + 6: roulis1966 (katerini), still playing + 7: Sinan01 (Auburn), still playing + 8: McKallito (Lüchow), still playing + 9: SirMichel123 (Grootebroek), still playing + 10: Zens7 (Spa), still playing + 11: lybermixa (Lyubertsy), still playing + 12: jan e.h.692 (værløse), still playing + 13: NDTLDN (Erpe-Mere), still playing + 14: bars444 (станица Казанская), still playing + 15: rfk091154 (Holyoke), still playing + 16: bier-boy18 (Norden), still playing + 17: big-al 567 (T-B-D-K-A---), still playing + 18: 13♠ (Minsk), still playing + 19: Full-I-one (Сатка), still playing + 20: Bécike7474 (segesd), still playing + 21: ehrenfeld1 (Köln), still playing + 22: Zico90 (Warszawa), still playing + 23: finalframe23 (München), still playing + 24: choc3 (cleveland), still playing + 25: WeissBrot6 (Ratingen), still playing + 26: cashflow1004 (Mannheim), still playing + 27: divaina81 (Palma de Mallorca), still playing + 28: 202063 (Cincinnati), still playing + 29: arifino (Tilburg), still playing + 30: er-kan001 (Alkmaar), still playing + 31: bredadarter (breda), still playing + 32: fizban_07 (Athens), still playing + 33: netzroller (Cologne), still playing + 34: villi5 (alagon), still playing + 35: Yanis989 (Ярославль), still playing + 36: ahtoh88 (Kolpino), still playing + 37: toonman65 (gateshead), still playing + 38: Druiddew (Новосибирск), still playing + 39: petertje95 (san jose), still playing + 40: TiltFkrTilt (Canberra), still playing + 41: dgoker33 (живой ручей), still playing + 42: DijkieAA (Veendam), still playing + 43: GP10000 (Maria Wörth), still playing + 44: Nedb52 (КАЛИНИНГРАД), still playing + 45: PayForMyAudi (Vladimir), still playing + 46: Perry600 (boskoop), still playing + 47: Kiri urba (A Coruña), still playing + 48: charo0247 (Toledo), still playing + 49: yelmosuras (madrid), still playing + 50: Purplejaze (Lake Havasu City), still playing + 51: Deckeldome (Buchs), still playing + 52: briand99 (hjørring), still playing + 53: bucepena (santiago), still playing + 54: hahol21 (Livani), still playing + 55: geocupra1979 (Αθηνα), still playing + 56: benhenro (4600 vise), still playing + 57: ptothedizzle (Oxford), still playing + 58: barca91 (mirna), still playing + 59: Marissa0815 (Berlin), still playing + 60: monguz7 (Oroszlány), still playing + 61: bragadosss (salamanca), still playing + 62: soxo12 (Москва), still playing + 63: Rhubein (Vejle), still playing + 64: tamebabe44 (Saint John), still playing + 65: guennixx (Darmstadt), still playing + 66: getuk (Zwijndrecht), still playing + 67: mcaurich (berlin), still playing + 68: Tschibu (Lucerne/Switzerland), still playing + 69: mihaicatrina (targoviste), still playing + 70: pawelt (Warszawa), still playing + 71: wallie5504 (eindhoven), still playing + 72: KlimoFF-AK (Brest), still playing + 73: monkey VSOP (Москва), still playing + 74: acer2410 (москва), still playing + 75: qqisso (Rio de Janeiro), still playing + 76: bigmac17603 (lancaster), still playing + 77: huojin chen (Auburn), still playing + 78: K238 (Melbourne), still playing + 79: nene_natxo (Manacor), still playing + 80: Vasyan99 (Чехов), still playing + 81: Vader123 (Anaheim), still playing + 82: jennie446 (nyborg), still playing + 83: CmeTilt (Surrey), still playing + 84: Patoche1978 (Genève), still playing + 85: manuel151075 (lugo), still playing + 86: dany131313 (Kraków), still playing + 87: boomer3264 (crewe), still playing + 88: iason9 (korinthos), still playing + 89: grantaver (logroño(españa)), still playing + 90: fgmma (Sherman Oaks), still playing + 91: rabbit7408 (Dortmund), still playing + 92: Blekbull (Timisoara), still playing + 93: Xitur (paphos), still playing + 94: heidi96 (Juist), still playing + 95: mangan76 (Göteborg), still playing + 96: lukmalik3 (Southampton), still playing + 97: maggy345 (Gentbrugge), still playing + 98: august1305 (hankensbüttel), still playing + 99: ochief266 (stockholm), still playing + 100: peterlarge (den-helder), still playing + 101: MightyPol (Saint-Hubert), still playing + 102: karkoul (TINOS), still playing + 103: belitus (cordoba), still playing + 104: cryzeiro9229 (Riga), still playing + 105: meggitt1977 (Bellevue), still playing + 106: SumStor (Kharkov), still playing + 107: nokrassaa (antwerpen), still playing + 108: Stravados (Berlaar), still playing + 109: astef4n (Moscow), still playing + 110: Santei87 (Vladivostok), still playing + 111: beest1r (Elen), still playing + 112: capNemo86 (Sofia), still playing + 113: V557722V (красноярск), still playing + 114: Srappy4sure (Miami), still playing + 115: Netolip (Hörby), still playing + 116: hjald (copenhagen), still playing + 117: Don_Pet (København), still playing + 118: fani1977 (Moscow), still playing + 119: paojuve (ATHENS), still playing + 120: aboeraga (oss), still playing + 121: Martin_Sucu (Asturias), still playing + 122: luc3131 (sherbrooke), still playing + 123: UG82CDBB (MOUNT PEARL), still playing + 124: paiporta885 (valencia), still playing + 125: robustianoma (monzon (españa)), still playing + 126: moscowknight (moscow), still playing + 127: Rom1809 (Uglich), still playing + 128: dbkarcz (Hartville), still playing + 129: n0_lov3 (Ekaterinburg), still playing + 130: bardachek (Moskow), still playing + 131: hollywoody97 (Marina del Rey), still playing + 132: boast123 (Stade), still playing + 133: gaezka (FERRERIES), still playing + 134: Bandicot25 (Denmark), still playing + 135: feki023 (Kisújszállás), still playing + 136: puupsius (Alytus), still playing + 137: VasjaVasilev (Черновцы), still playing + 138: Avalium (Bayreuth), still playing + 139: W1INGING IT (Bournemouth), still playing + 140: MrHunting (Dresden), still playing + 141: küsz541 (badacsony), still playing + 142: poosar (kiel), still playing + 143: MrzimRadit (Ljubljana), still playing + 144: DartSven (Burscheid), still playing + 145: devilcarp666 (Hengelo), still playing + 146: woodman18 (opmeer), still playing + 147: POSADKIN (MOSCOW), still playing + 148: CSKA2010 (Moscow), still playing + 149: orelius (dianalund), still playing + 150: zeesatek (zumaia), still playing + 151: andipanda75 (Balti), still playing + 152: dj_soso9 (blaj), still playing + 153: Xnina67 (Melbourne), still playing + 154: ulliente (Auetal), still playing + 155: advex (Москва), still playing + 156: gejzir (Hatvan), still playing + 157: henkibenki (Höheinöd), still playing + 158: monalagarto (Funchal), still playing + 159: whlegend (Alnwick), still playing + 160: bakkie886 (moordrecht), still playing + 161: loren39 (malaga marbella), still playing + 162: OUF RE (halkidiki), still playing + 163: luda555 (moscow), still playing + 164: bretstl (washington), still playing + 165: mikeyb35 (ellsworth), still playing + 166: djrewa (москва), still playing + 167: lburt1111 (Naples), still playing + 168: mixalis84t (pafos), still playing + 169: faylp (salisbury), still playing + 170: iAmPokerPr0 (Irvine), still playing + 171: miospb (Санкт-Петербург), still playing + 172: matija360 (ljubljana), still playing + 173: sm2000p (Bristol), still playing + 174: Opsa (Åtvidaberg), still playing + 175: snoky320 (Heidenau), still playing + 176: teufeltanzt (Malsch), still playing + 177: )(OM9K (Stariy Oskol), still playing + 178: vroli23 (Kazincbarcika), still playing + 179: dolly525 (Sofia), still playing + 180: knvb1988 (Olginka), still playing + 181: IamDaDean (Breitenbrunn), still playing + 182: svak78 (EKATERINBURG), still playing + 183: Mcdee1234 (Brandon), still playing + 184: theone513 (milford), still playing + 185: jensjensen4 (Dortmund), still playing + 186: robereskila (zaragoza), still playing + 187: transporte55 (enschede), still playing + 188: StarG777 (Izhevsk), still playing + 189: kent132 (сочи), still playing + 190: Pokerbum1313 (Boyceville), still playing + 191: Kalypsoid (Göttingen), still playing + 192: Schveik (Москва), still playing + 193: VAGameHunter (kenbridge), still playing + 194: Mvleent123 (Groningen), still playing + 195: Marusya99222 (Сочи), still playing + 196: linoflo (erp), still playing + 197: tokkopas (Espoo), still playing + 198: dpnn (Ardmore), still playing + 199: cat777aa (Ivanovo), still playing + 200: raca1983 (šentjur), still playing + 201: lennoncruz (Poços de caldas), still playing + 202: BORUSSE1981 (DORTMUND), still playing + 203: kfldt (Fribourg), still playing + 204: LanzelotRuS (г. Барнаул), still playing + 205: robse68 (Heddesheim), still playing + 206: Schlumpf1988 (Mönchengladbach), still playing + 207: subine (Vilnius), still playing + 208: Perlablu575 (Sulzbach murr), still playing + 209: Ants722 (Москва), still playing + 210: trickytwos (toowoomba), still playing + 211: beertje 65 (helmond), still playing + 212: bucku2020 (byron bay), still playing + 213: STXIKI (arrasate), still playing + 214: jimvandam33 (Saint Clair), still playing + 215: blacki1164 (Witten), still playing + 216: LSUCATMAN (Nebraska City), still playing + 217: qia2000 (Neupre), still playing + 218: spaunit (anp), still playing + 219: jps860 (manitowoc), still playing + 220: region08 (Москва), still playing + 221: fkldo77 (Dortmund), still playing + 222: kiselevich1 (Ekaterinburg), still playing + 223: hunter171 (berlin), still playing + 224: uzunL (анапа), still playing + 225: Robinus (Alma), still playing + 226: ROSEMARY1234 (AKRON), still playing + 227: jopi44 (Berlin), still playing + 228: Twistedd1 (Warmenhuizen), still playing + 229: AAS481 (Moscow), still playing + 230: AAirlines97 (Landshut), still playing + 231: AUGIE72457 (Liverpool), still playing + 232: AVDDEVA (чебоксары), still playing + 233: Amecs (Mettlach), still playing + 234: Bkackmoon (Калач), still playing + 235: BobF333 (grove city), still playing + 236: Bowman82 (Hengelo), still playing + 237: CougarFTD (Lake of the Ozarks), still playing + 238: Danjo27 (Sottrum), still playing + 239: Deadeye10 (London), still playing + 240: Den is 85805 (Podolsk), still playing + 241: Dikra2007 (Duisburg), still playing + 242: Diogo911 (Loures), still playing + 243: Dshadowfax (Athens), still playing + 244: Durrrr_x (Wuppertal), still playing + 245: EddiBay0r (Rösrath), still playing + 246: El Raui (ede), still playing + 247: F17Kislata (Уфа), still playing + 248: FOSGA-SE (BRAGA-PT), still playing + 249: Flip My Flop (Toronto), still playing + 250: Freluye (Vva. de la Serena), still playing + 251: GIMLLER (калуга), still playing + 252: Geminichaos7 (Milwaukee), still playing + 253: Gereni (Osnabrück), still playing + 254: Guzsma6almas (Pirtó), still playing + 255: Hadde22000 (Butjadingen), still playing + 256: HairKiller (Newton), still playing + 257: Hoogland89 (Hilversum), still playing + 258: Ian Arkley (South Shields), still playing + 259: Ichcallmal (Goslar), still playing + 260: Jebiveter (Mojstrana), still playing + 261: Johnswilde88 (mcKean), still playing + 262: JudgeOfPoker (Eys), still playing + 263: KenyCasy (Lowell), still playing + 264: KranDM (Odense), still playing + 265: Lenarkin (Dzhalil), still playing + 266: Luna4444 (Grand Rapids), still playing + 267: Makena7 (Palma de Mallorca), still playing + 268: MazVegas (we), still playing + 269: s0rrow (Perth), + 270: queya (Rawdon), + 271: pistike771 (Debrecen), + 272: jolinejuli (Selb), + 273: tadco4321 (Virginia Beach), + 274: Barflies10 (Val Caron), + 275: rutsa (east boldon), + 276: ademar2 (SAO BENTO-PB), + 277: kika1950 (Austria), + 278: Jack1806 (Grub am Forst), + 279: jansen333 (Leiderdorp), + 280: DonRon66 (Berlin), + 281: fayedannii (york), + 282: samy alejo (floridablanca), + 283: rey-marmotta (baarle-hertog), + 284: Der Gök (Glattbrugg), + 285: viewsolo (Мариуполь), + 286: makss333 (Пенза), + 287: palomino1234 (Montehermoso), + 288: bartis3000 (Jelgava), + 289: Phoenix2604 (Nordenham), + 290: elpuutoamo96 (Barcelona), + 291: portillo23 (Bistra Maramures), + 292: 0palma0 (Budapest), + 293: Mr_Habi (Stuttgart), + 294: Uzamaki_NL (ALMERE), + 295: VLAD798 (Zelenogorsk), + 296: LupenBamio (Villagarcía de Arosa), + 297: foxyroxydoxy (denpasar), + 298: Lonesome_Cry (Elgin), + 299: BoxWox (Moscow), + 300: dimaz79 (liski), + 301: HeRbY924 (Beckdorf), + 302: summen8 (a coruña), + 303: Kamelion13 (Brasschaat), + 304: mihahaus (Tikhvin), + 305: fipp999 (Köln), + 306: higuita69 (santa maria da feira), + 307: papa_poke (heathmont), + 308: TheDeafPoker (Adelaide), + 309: papa_fagioli (SPRING HILL), + 310: bimbo1968 (dortmund), + 311: dannyKK10 (norman), + 312: voreios (Serres), + 313: pinnochio200 (magog), + 314: TOBI 1992 (Menden), + 315: manolo1953 (manresa), + 316: GAKler1983 (graz), + 317: liondog61962 (exeter), + 318: Andrew Gvozd (Санкт-Петербург(RUS)), + 319: goshoo20 (Монтана), + 320: Dony12345 (Saint Petersburg), + 321: herloch (Stade), + 322: Kleine45 (Holland), + 323: reyburdeo (Capital Federal), + 324: filip_315 (eeklo), + 325: famag2010 (GILLY), + 326: Zimka222 (Kazan), + 327: BigViggi (Reykjavik), + 328: RA-Lexx (Москва), + 329: claudiomasti (Athina-Kallithea), + 330: Andreev.B.G1 (Ростов-на-дону), + 331: pokerchief29 (webster), + 332: knuckler3 (dublin), + 333: Toppo5 (Cheadle), + 334: Ligia27 (Santa Maria da Feira), + 335: 2swild007 (felton), + 336: ruediger1234 (Frankfurt am Main), + 337: poppers8 (newport), + 338: baristabob (melbourne), + 339: superbrono (Ratece), + 340: Bony884 (Озерск), + 341: doitagain36 (louisville), + 342: Sailor1962 (Willich), + 343: winzy1 (Rådal), + 344: Nossovicflop (Den-Haag), + 345: riverman0007 (pickerington), + 346: vero 311 (bayamon), + 347: TH(The age) (Antwerpen), + 348: asddsa10 (Moscow), + 349: shwza (st peters), + 350: nenomfgottie (nashville), + 351: Hungry86 (Békéscsaba), + 352: tinemaus15 (hannover), + 353: Meowthz (durrrrland), + 354: tedeev (yakutsk), + 355: ddarko25 (santiago), + 356: snookumz69 (Monticello), + 357: migo1301 (Mühlhausen), + 358: laura-may_2@ (algeciras), + 359: Kakadu60 (Estenfeld), + 360: Fadeyka (Moscow), + 361: artic gnome (peabody), + 362: demiseko (OLYMPOS), + 363: hazecannabis (murcia), + 364: APT001 (brisbane), + 365: sweet1407 (Nottingham), + 366: papa wolle (Wuppertal), + 367: GingaNinja09 (Shrewsbury), + 368: leoy12 (raamsdonksveer), + 369: Puzl73 (Moscow), + 370: CrazyJesse86 (East Malvern), + 371: xfever88x (Rutherford), + 372: chelsearule5 (herne bay kent (uk)), + 373: SHRAM 11 (Н.Новгород), + 374: yeti072 (bautzen), + 375: Skorrpions (Чехов), + 376: rosoboronexp (Vidnoe), + 377: bakaba (kfar yona), + 378: michon0769 (москва), + 379: lrlem (clarington), + 380: dunkmeister2 (Brisbane), + 381: xxgcarp29 (haaksbergen), + 382: psoliogkos (Perama), + 383: tibobogek (Valkenswaard), + 384: catstone006 (Wernau), + 385: Zelenyi (Sergeevka), + 386: lady cyprus (london), + 387: Pincelin1970 (ESPAÑA), + 388: Rammerkbh (Odense Denmark), + 389: !$p3cIaLOn3! (targoviste), + 390: PiCaMaN 2788 (l´ampolla), + 391: Shrew4 (Wabash), + 392: KenHansen (Ottawa), + 393: totobwfb (Bad Wildungen), + 394: rokoti (Klaukkala), + 395: yakudza-vd (Volgodonsk), + 396: Ronaldvdl (Veendam), + 397: N33RB33K (Beek), + 398: infulgencio (castellon), + 399: vimmer147 (esbjerg), + 400: pcorr07 (V.N.FAMALICÃO), + 401: GamesOfMind (Tashkent), + 402: obelix34145 (evora), + 403: guup83 (Zottegem), + 404: CAMELIA.1999 (BARCO DE AVILA), + 405: Puma 2307 (swansea), + 406: lokito-abre1 (oion), + 407: kkopika (pécs), + 408: viv.bg (Plovdiv), + 409: old yorky (SITTINGBOURNE), + 410: Babbzan (Gislaved), + 411: tobzko (Box Hill), + 412: cucan68 (melilla), + 413: Blasstha (Schoonhoven), + 414: Olli2004 (München), + 415: Cepa863 (Nedvědice), + 416: 5valet (Kineshma), + 417: jbomann30 (marquartstein), + 418: Bestee (Rhenen No CHAT), + 419: stormfour (Sterling Hts.), + 420: kissbela69 (kecskemet), + 421: lordoming (murcia), + 422: dragoselu90 (keswick), + 423: Ma1kl13 (Lucky River), + 424: 1topshelf (Theresa), + 425: lobikcek (Kolín), + 426: noy2222 (London), + 427: MVL609 (Yekaterinburg), + 428: Rokos75 (Павловский Посад), + 429: camikatze28 (elz), + 430: briantjeeh (Spakenburg), + 431: iacommodity (okoboji), + 432: mikka510 (Koszeg), + 433: Marchx (Riga), + 434: SPFW2008 (Sao Paulo), + 435: DoNilsOn (Rangsdorf), + 436: notforsho (matamoras), + 437: prowlin-wolf (sebring), + 438: tipa_Egor (Старый Оскол), + 439: veldmuis91 (Renswoude), + 440: matze68 (harsefeld), + +You finished in 269th place (eliminated at hand #52470080319). + + From 8faeb49de2651a9cd75c8d21b3451d15f2faf192 Mon Sep 17 00:00:00 2001 From: Worros Date: Thu, 11 Nov 2010 18:22:14 +0800 Subject: [PATCH 02/17] Regression: Win2day PLO Sample --- .../PLO-EUR-0.05-0.10-Date-unknown.Sample | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample diff --git a/pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample b/pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample new file mode 100644 index 00000000..9a80bd93 --- /dev/null +++ b/pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 323b0856b6e413601d28c6c783a0378fa9ba9dfc Mon Sep 17 00:00:00 2001 From: Worros Date: Thu, 11 Nov 2010 18:25:06 +0800 Subject: [PATCH 03/17] PSS: Fix Stars summary import to deal with slightly modified format Stars now includes the currency (ie. USD) on two lines --- pyfpdb/PokerStarsSummary.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyfpdb/PokerStarsSummary.py b/pyfpdb/PokerStarsSummary.py index cfa33322..8ee68712 100644 --- a/pyfpdb/PokerStarsSummary.py +++ b/pyfpdb/PokerStarsSummary.py @@ -57,13 +57,13 @@ class PokerStarsSummary(TourneySummary): (?PNo\sLimit|Limit|LIMIT|Pot\sLimit)\s (?PHold\'em|Razz|RAZZ|7\sCard\sStud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi/Lo|Badugi|Triple\sDraw\s2\-7\sLowball|5\sCard\sDraw)\s+ (?P[ a-zA-Z]+\s+)? - (Buy-In:\s\$(?P[.0-9]+)(\/\$(?P[.0-9]+))?\s+)? + (Buy-In:\s\$(?P[.0-9]+)(\/\$(?P[.0-9]+))?(?P\s%(LEGAL_ISO)s)?\s+)? (?P[0-9]+)\splayers\s+ (\$?(?P[.\d]+)\sadded\sto\sthe\sprize\spool\sby\sPokerStars\.com\s+)? - (Total\sPrize\sPool:\s\$?(?P[.0-9]+)\s+)? + (Total\sPrize\sPool:\s\$?(?P[.0-9]+)(\s%(LEGAL_ISO)s)?\s+)? (Target\sTournament\s.*)? - Tournament\sstarted\s-\s - (?P[0-9]{4})\/(?P[0-9]{2})\/(?P[0-9]{2})[\-\s]+(?P[0-9]+):(?P[0-9]+):(?P[0-9]+)\s?\(?(?P[A-Z]+)\)\s + Tournament\sstarted\s+(-\s)? + (?P[0-9]{4})\/(?P[0-9]{2})\/(?P[0-9]{2})[\-\s]+(?P[0-9]+):(?P[0-9]+):(?P[0-9]+)\s?\(?(?P[A-Z]+)\)?\s """ % substitutions ,re.VERBOSE|re.MULTILINE|re.DOTALL) re_Currency = re.compile(u"""(?P[%(LS)s]|FPP)""" % substitutions) From adf380f22be1616e00c2cdab215a632da0390608 Mon Sep 17 00:00:00 2001 From: Worros Date: Thu, 11 Nov 2010 18:25:54 +0800 Subject: [PATCH 04/17] Regression: Win2day .hp file + rename --- ...PLO-EUR-0.05-0.10-Date-unknown.Sample.txt} | 0 ...O-EUR-0.05-0.10-Date-unknown.Sample.txt.hp | 470 ++++++++++++++++++ 2 files changed, 470 insertions(+) rename pyfpdb/regression-test-files/cash/Win2day/Flop/{PLO-EUR-0.05-0.10-Date-unknown.Sample => PLO-EUR-0.05-0.10-Date-unknown.Sample.txt} (100%) create mode 100644 pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample.txt.hp diff --git a/pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample b/pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample.txt similarity index 100% rename from pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample rename to pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample.txt 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 new file mode 100644 index 00000000..5ac2a97f --- /dev/null +++ b/pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample.txt.hp @@ -0,0 +1,470 @@ +{ 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': 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': False, + 'position': 2, + 'raiseFirstInChance': True, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': True, + 'seatNo': 3, + 'sitout': False, + 'startCards': 0, + 'startCash': 1000, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': 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': 0, + 'street4CheckCallRaiseChance': False, + 'street4CheckCallRaiseDone': False, + 'street4Raises': 0, + 'street4Seen': False, + 'totalProfit': -127, + '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': 0, + 'raiseFirstInChance': False, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 5, + 'sitout': False, + 'startCards': 0, + 'startCash': 2954, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 1, + 'street0Raises': 0, + 'street0VPI': True, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': 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, + 'totalProfit': -10, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, + u'Player3': { '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': 1, + 'sitout': False, + 'startCards': 0, + 'startCash': 1440, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 1, + 'street0Raises': 0, + 'street0VPI': True, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': 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': -15, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 0, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 0.0, + 'wonWhenSeenStreet2': 0.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}, + u'Player4': { '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': False, + 'otherRaisedStreet2': True, + 'otherRaisedStreet3': True, + 'otherRaisedStreet4': False, + 'position': 1, + 'raiseFirstInChance': False, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 4, + 'sitout': False, + 'startCards': 0, + 'startCash': 585, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 1, + 'street0Raises': 0, + 'street0VPI': True, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': 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, + 'totalProfit': -47, + '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': 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': 21, + 'sawShowdown': True, + 'seatNo': 2, + 'sitout': False, + 'startCards': 0, + 'startCash': 4587, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': 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': True, + 'street3Bets': 1, + 'street3CBChance': True, + 'street3CBDone': True, + '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': 178, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 305, + 'wonAtSD': 1.0, + 'wonWhenSeenStreet1': 1.0, + 'wonWhenSeenStreet2': 1.0, + 'wonWhenSeenStreet3': 1.0, + 'wonWhenSeenStreet4': 0.0}} From ee65248ff1c23d1561a600e9ec17ca23683b71a1 Mon Sep 17 00:00:00 2001 From: Worros Date: Thu, 11 Nov 2010 18:31:10 +0800 Subject: [PATCH 05/17] THP: Add Win2day support --- pyfpdb/TestHandsPlayers.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pyfpdb/TestHandsPlayers.py b/pyfpdb/TestHandsPlayers.py index 53a2dbd4..ee3be1e9 100755 --- a/pyfpdb/TestHandsPlayers.py +++ b/pyfpdb/TestHandsPlayers.py @@ -147,6 +147,7 @@ def main(argv=None): CarbonErrors = FpdbError('Carbon') PKRErrors = FpdbError('PKR') iPokerErrors = FpdbError('iPoker') + Win2dayErrors = FpdbError('Win2day') WinamaxErrors = FpdbError('Winamax') ErrorsList = [ @@ -154,6 +155,7 @@ def main(argv=None): BetfairErrors, OnGameErrors, AbsoluteErrors, EverleafErrors, CarbonErrors, PKRErrors, iPokerErrors, WinamaxErrors, UltimateBetErrors, + Win2dayErrors, ] sites = { @@ -168,6 +170,7 @@ def main(argv=None): 'Carbon' : True, 'PKR' : False, 'iPoker' : True, + 'Win2day' : True, 'Winamax' : True, } @@ -198,6 +201,8 @@ def main(argv=None): walk_testfiles("regression-test-files/cash/iPoker/", compare, importer, iPokerErrors, "iPoker") if sites['Winamax'] == True: walk_testfiles("regression-test-files/cash/Winamax/", compare, importer, WinamaxErrors, "Winamax") + if sites['Win2day'] == True: + walk_testfiles("regression-test-files/cash/Win2day/", compare, importer, Win2dayErrors, "Win2day") totalerrors = 0 From 61d5ffec4b9a095d900771dad94abbc2045f9ad2 Mon Sep 17 00:00:00 2001 From: Worros Date: Thu, 11 Nov 2010 18:31:24 +0800 Subject: [PATCH 06/17] Regression: Remove UB file with modified filename. File was already copied over to the original UB format --- .../NLHE-FR-USD-0.01-0.02-201011.Sample.txt | 58 -- ...NLHE-FR-USD-0.01-0.02-201011.Sample.txt.hp | 846 ------------------ 2 files changed, 904 deletions(-) delete mode 100644 pyfpdb/regression-test-files/cash/UltimateBet/Flop/NLHE-FR-USD-0.01-0.02-201011.Sample.txt delete mode 100644 pyfpdb/regression-test-files/cash/UltimateBet/Flop/NLHE-FR-USD-0.01-0.02-201011.Sample.txt.hp diff --git a/pyfpdb/regression-test-files/cash/UltimateBet/Flop/NLHE-FR-USD-0.01-0.02-201011.Sample.txt b/pyfpdb/regression-test-files/cash/UltimateBet/Flop/NLHE-FR-USD-0.01-0.02-201011.Sample.txt deleted file mode 100644 index 6310ec86..00000000 --- a/pyfpdb/regression-test-files/cash/UltimateBet/Flop/NLHE-FR-USD-0.01-0.02-201011.Sample.txt +++ /dev/null @@ -1,58 +0,0 @@ - -Stage #C241220000: Holdem No Limit $0.02 - 2010-11-06 15:00:00 (ET) -Table: BASELINE RD (Real Money) Seat #8 is the dealer -Seat 8 - PLAYER8 ($2.05 in chips) -Seat 9 - PLAYER9 ($2.01 in chips) -Seat 1 - PLAYER1 ($2.90 in chips) -Seat 2 - VILLAIN1 ($1.52 in chips) -Seat 3 - PLAYER3 ($2 in chips) -Seat 4 - VILLAIN2 ($3.58 in chips) -Seat 5 - PLAYER5 ($2 in chips) -Seat 6 - PLAYER6 ($1.07 in chips) -Seat 7 - Hero ($1 in chips) -PLAYER9 - Posts small blind $0.01 -PLAYER1 - Posts big blind $0.02 -Hero - Posts $0.02 -*** POCKET CARDS *** -Dealt to Hero [10s 3s] -VILLAIN1 - Calls $0.02 -PLAYER3 - Folds -VILLAIN2 - Calls $0.02 -PLAYER5 - Folds -PLAYER6 - Folds -Hero - Checks -PLAYER8 - Folds -PLAYER9 - Folds -PLAYER1 - Folds -*** FLOP *** [Kc Qh 8h] -VILLAIN1 - Checks -VILLAIN2 - Checks -Hero - Checks -*** TURN *** [Kc Qh 8h] [6d] -VILLAIN1 - Checks -VILLAIN2 - Checks -Hero - Checks -*** RIVER *** [Kc Qh 8h 6d] [8c] -VILLAIN1 - Checks -VILLAIN2 - Checks -Hero - Checks -*** SHOW DOWN *** -VILLAIN1 - Shows [5c Ac] (One pair, eights) -VILLAIN2 - Shows [7s 6c] (Two Pair, eights and sixes) -Hero - Mucks -VILLAIN2 Collects $0.09 from main pot -*** SUMMARY *** -Total Pot($0.09) -Board [Kc Qh 8h 6d 8c] -Seat 1: PLAYER1 (big blind) Folded on the POCKET CARDS -Seat 2: VILLAIN1 HI:lost with One pair, eights [5c Ac - B:8h,B:8c,P:Ac,B:Kc,B:Qh] -Seat 3: PLAYER3 Folded on the POCKET CARDS -Seat 4: VILLAIN2 won Total ($0.09) HI:($0.09) with Two Pair, eights and sixes [7s 6c - B:8h,B:8c,B:6d,P:6c,B:Kc] -Seat 5: PLAYER5 Folded on the POCKET CARDS -Seat 6: PLAYER6 Folded on the POCKET CARDS -Seat 7: Hero HI: [Mucked] [10s 3s] -Seat 8: PLAYER8 (dealer) Folded on the POCKET CARDS -Seat 9: PLAYER9 (small blind) Folded on the POCKET CARDS - - - diff --git a/pyfpdb/regression-test-files/cash/UltimateBet/Flop/NLHE-FR-USD-0.01-0.02-201011.Sample.txt.hp b/pyfpdb/regression-test-files/cash/UltimateBet/Flop/NLHE-FR-USD-0.01-0.02-201011.Sample.txt.hp deleted file mode 100644 index 0fd0c27d..00000000 --- a/pyfpdb/regression-test-files/cash/UltimateBet/Flop/NLHE-FR-USD-0.01-0.02-201011.Sample.txt.hp +++ /dev/null @@ -1,846 +0,0 @@ -{ u'Hero': { 'card1': 48, - 'card2': 41, - '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': True, - 'seatNo': 7, - 'sitout': False, - 'startCards': 106, - 'startCash': 100, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': 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': 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, - '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': 1, - 'sitout': False, - 'startCards': 0, - 'startCash': 290, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': 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'PLAYER3': { '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': 5, - 'raiseFirstInChance': False, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': False, - 'seatNo': 3, - 'sitout': False, - 'startCards': 0, - 'startCash': 200, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': 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, - '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': False, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': False, - 'seatNo': 5, - 'sitout': False, - 'startCards': 0, - 'startCash': 200, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': 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'PLAYER6': { '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': False, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': False, - 'seatNo': 6, - 'sitout': False, - 'startCards': 0, - 'startCash': 107, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': 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'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': False, - 'otherRaisedStreet3': False, - 'otherRaisedStreet4': False, - 'position': 0, - 'raiseFirstInChance': False, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': False, - 'seatNo': 8, - 'sitout': False, - 'startCards': 0, - 'startCash': 205, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': 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'PLAYER9': { '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': 'S', - 'raiseFirstInChance': False, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': False, - 'seatNo': 9, - 'sitout': False, - 'startCards': 0, - 'startCash': 201, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 0, - 'street0Raises': 0, - 'street0VPI': False, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': 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': -1, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 0, - 'wonAtSD': 0.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}, - u'VILLAIN1': { 'card1': 30, - 'card2': 39, - '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': 6, - 'raiseFirstInChance': True, - 'raisedFirstIn': False, - 'rake': 0, - 'sawShowdown': True, - 'seatNo': 2, - 'sitout': False, - 'startCards': 160, - 'startCash': 152, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 1, - 'street0Raises': 0, - 'street0VPI': True, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': 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': -2, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 0, - 'wonAtSD': 0.0, - 'wonWhenSeenStreet1': 0.0, - 'wonWhenSeenStreet2': 0.0, - 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}, - u'VILLAIN2': { 'card1': 45, - 'card2': 31, - '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': 4, - 'raiseFirstInChance': False, - 'raisedFirstIn': False, - 'rake': -2, - 'sawShowdown': True, - 'seatNo': 4, - 'sitout': False, - 'startCards': 58, - 'startCash': 358, - 'street0Aggr': False, - 'street0Bets': 0, - 'street0Calls': 1, - 'street0Raises': 0, - 'street0VPI': True, - 'street0_3BChance': False, - 'street0_3BDone': False, - 'street0_4BChance': False, - 'street0_4BDone': 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': 7, - 'tourneyTypeId': None, - 'tourneysPlayersIds': None, - 'winnings': 9, - 'wonAtSD': 1.0, - 'wonWhenSeenStreet1': 1.0, - 'wonWhenSeenStreet2': 1.0, - 'wonWhenSeenStreet3': 1.0, - 'wonWhenSeenStreet4': 0.0}} From 2fa08aa26353e3de65a2fdd07d58ae79a1ed164d Mon Sep 17 00:00:00 2001 From: Worros Date: Fri, 12 Nov 2010 10:41:54 +0800 Subject: [PATCH 07/17] Regression: NLHE Sample file for Win2day --- ...NLHE-USD-0.05-0.10-Date-unknown.Sample.txt | 37 +++ ...E-USD-0.05-0.10-Date-unknown.Sample.txt.hp | 282 ++++++++++++++++++ 2 files changed, 319 insertions(+) create mode 100644 pyfpdb/regression-test-files/cash/Win2day/Flop/NLHE-USD-0.05-0.10-Date-unknown.Sample.txt create mode 100644 pyfpdb/regression-test-files/cash/Win2day/Flop/NLHE-USD-0.05-0.10-Date-unknown.Sample.txt.hp diff --git a/pyfpdb/regression-test-files/cash/Win2day/Flop/NLHE-USD-0.05-0.10-Date-unknown.Sample.txt b/pyfpdb/regression-test-files/cash/Win2day/Flop/NLHE-USD-0.05-0.10-Date-unknown.Sample.txt new file mode 100644 index 00000000..fc40c75b --- /dev/null +++ b/pyfpdb/regression-test-files/cash/Win2day/Flop/NLHE-USD-0.05-0.10-Date-unknown.Sample.txt @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..0ee07b2d --- /dev/null +++ b/pyfpdb/regression-test-files/cash/Win2day/Flop/NLHE-USD-0.05-0.10-Date-unknown.Sample.txt.hp @@ -0,0 +1,282 @@ +{ u'Hero': { 'card1': 8, + 'card2': 19, + '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': 'B', + 'raiseFirstInChance': False, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 4, + 'sitout': False, + 'startCards': 73, + 'startCash': 795, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': 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': -30, + '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': 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': True, + 'raisedFirstIn': False, + 'rake': 0, + 'sawShowdown': False, + 'seatNo': 1, + 'sitout': False, + 'startCards': 0, + 'startCash': 1960, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 0, + 'street0Raises': 0, + 'street0VPI': False, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': 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'Villain': { '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': 'S', + 'raiseFirstInChance': True, + 'raisedFirstIn': False, + 'rake': 3, + 'sawShowdown': False, + 'seatNo': 2, + 'sitout': False, + 'startCards': 0, + 'startCash': 993, + 'street0Aggr': False, + 'street0Bets': 0, + 'street0Calls': 1, + 'street0Raises': 0, + 'street0VPI': True, + 'street0_3BChance': False, + 'street0_3BDone': False, + 'street0_4BChance': False, + 'street0_4BDone': False, + 'street1Aggr': True, + 'street1Bets': 1, + 'street1CBChance': False, + 'street1CBDone': False, + 'street1Calls': 0, + 'street1CheckCallRaiseChance': False, + 'street1CheckCallRaiseDone': False, + 'street1Raises': 0, + 'street1Seen': True, + 'street2Aggr': True, + 'street2Bets': 1, + 'street2CBChance': True, + 'street2CBDone': True, + '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': 27, + 'tourneyTypeId': None, + 'tourneysPlayersIds': None, + 'winnings': 57, + 'wonAtSD': 0.0, + 'wonWhenSeenStreet1': 1.0, + 'wonWhenSeenStreet2': 1.0, + 'wonWhenSeenStreet3': 0.0, + 'wonWhenSeenStreet4': 0.0}} From d895ab0d2127e3d48bb2f7de3be05aa401b2ad40 Mon Sep 17 00:00:00 2001 From: Worros Date: Fri, 12 Nov 2010 11:12:18 +0800 Subject: [PATCH 08/17] Regression: PartyPoker NLHE cash hand and .hp --- .../Flop/NLHE-USD-0.01-0.02-201008.Sample.txt | Bin 0 -> 1165 bytes .../NLHE-USD-0.01-0.02-201008.Sample.txt.hp | 565 ++++++++++++++++++ 2 files changed, 565 insertions(+) create mode 100644 pyfpdb/regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.01-0.02-201008.Sample.txt create mode 100644 pyfpdb/regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.01-0.02-201008.Sample.txt.hp diff --git a/pyfpdb/regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.01-0.02-201008.Sample.txt b/pyfpdb/regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.01-0.02-201008.Sample.txt new file mode 100644 index 0000000000000000000000000000000000000000..b55ca77262d5cb9ffc5ff971d108fe16b77c2ff3 GIT binary patch literal 1165 zcma)5QE%EX7~FHD{D+gMw60<-2@oJ}mAb8}x=NJn3H8BA46z7y6g#8r*Y9(ZLYSs% zyoI~_eD|IG;XB)N3>MRQ5KR4GI)yf@GJ51Xt}|%BCxr+-g6rJaAMTmVa4)n`)e#$2 zp<(xk4b63~0{mRv;pq`Ee`Ol?s>nX_JwD@yk{LS=aa(U|Z7}wR@WaTPN8SQo?_va= z@3~IQl7eGZa-Lz}&%(tlSm64Zv%(JG$4{=a;>;j~&@eeiQX8Wr36&v^toI48pf)HA zcI1_&G~t&8I@Kb=qtM4v?TB=ZtMO<$Yy6(ZMu=5q)Nd{`Wf{T9pIk8J5prG^%Cx8# zUZ8%2QW>$UYi)6FG`UnyB2;R>W0g!=eC}Q7XAyKQQXz#mwgkU7;0%;X8x6f@MS-Lc z)XbWW@_ak$h05#H+l)4%=WtoFQ$wWn;w<+~tUvSK&eeLJCZ=xmb@qr@! kOSG){-?D>{+FtK)+FaiaUFzmF?wOGG1>hh|j(3Os0j_>k!T Date: Sat, 13 Nov 2010 12:04:13 +0800 Subject: [PATCH 09/17] Stars: Fix re_GameInfo to parse AAMS section of .it hands MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only have the one example from a Tournament hand: PokerStars Game #52486342403: Tournament #324732603, €0.82+€0.18 EUR Hold'em No Limit - Level I (10/20) [AAMS ID: L284A006CB1E33ZO] - 2010/11/10 20:59:53 CET [2010/11/10 14:59:53 ET] Hopefully the same for cash games --- pyfpdb/PokerStarsToFpdb.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py index c86fc157..061a88fc 100644 --- a/pyfpdb/PokerStarsToFpdb.py +++ b/pyfpdb/PokerStarsToFpdb.py @@ -99,7 +99,9 @@ class PokerStars(HandHistoryConverter): (?P[.0-9]+) (?P\s-\s[%(LS)s\d\.]+\sCap\s-\s)? # Optional Cap part \s?(?P%(LEGAL_ISO)s)? - \)\s-\s # close paren of the stakes + \) # close paren of the stakes + (?P\s\[AAMS\sID:\s[A-Z0-9]+\]) # AAMS ID: in .it HH's + \s-\s (?P.*$) """ % substitutions, re.MULTILINE|re.VERBOSE) From f7f8122af84d4ad9fdfe49b2f1435ec119896014 Mon Sep 17 00:00:00 2001 From: Worros Date: Mon, 15 Nov 2010 13:39:36 +0800 Subject: [PATCH 10/17] GTI: Add utf16 file handling --- pyfpdb/GuiTourneyImport.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyfpdb/GuiTourneyImport.py b/pyfpdb/GuiTourneyImport.py index d8fe6ec5..3f24996b 100755 --- a/pyfpdb/GuiTourneyImport.py +++ b/pyfpdb/GuiTourneyImport.py @@ -238,7 +238,7 @@ class SummaryImporter: self.filelist = {} def readFile(self, tsc, filename): - codepage = ["utf8"] + codepage = ["utf8", "utf16"] whole_file = None tsc.codepage @@ -248,7 +248,8 @@ class SummaryImporter: whole_file = in_fh.read() in_fh.close() break - except: + except UnicodeDecodeError, e: + log.warn(_("GTI.readFile: '%s'") % e) pass return whole_file From bc55042ed4dd8268a0232dad1c1fb6618b27f42b Mon Sep 17 00:00:00 2001 From: Worros Date: Mon, 15 Nov 2010 13:40:10 +0800 Subject: [PATCH 11/17] Configs: Add FTP summary parsing defaults --- pyfpdb/HUD_config.test.xml | 2 +- pyfpdb/HUD_config.xml.example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyfpdb/HUD_config.test.xml b/pyfpdb/HUD_config.test.xml index 11fa1be8..556bbede 100644 --- a/pyfpdb/HUD_config.test.xml +++ b/pyfpdb/HUD_config.test.xml @@ -567,7 +567,7 @@ Left-Drag to Move" - + diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example index 8c43397f..9ac66289 100644 --- a/pyfpdb/HUD_config.xml.example +++ b/pyfpdb/HUD_config.xml.example @@ -778,7 +778,7 @@ Left-Drag to Move" - + From 9c2c18f5cacf0954afee5ec901a4f478744c5c45 Mon Sep 17 00:00:00 2001 From: Worros Date: Mon, 15 Nov 2010 13:40:57 +0800 Subject: [PATCH 12/17] TourneySummary: Add alternate lookup for FTP --- pyfpdb/TourneySummary.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/TourneySummary.py b/pyfpdb/TourneySummary.py index 9ca4c27b..4ed91b65 100644 --- a/pyfpdb/TourneySummary.py +++ b/pyfpdb/TourneySummary.py @@ -49,7 +49,7 @@ class TourneySummary(object): LCS = {'H':'h', 'D':'d', 'C':'c', 'S':'s'} # SAL- TO KEEP ?? SYMBOL = {'USD': '$', 'EUR': u'$', 'T$': '', 'play': ''} MS = {'horse' : 'HORSE', '8game' : '8-Game', 'hose' : 'HOSE', 'ha': 'HA'} - SITEIDS = {'Fulltilt':1, 'PokerStars':2, 'Everleaf':3, 'Win2day':4, 'OnGame':5, 'UltimateBet':6, 'Betfair':7, 'Absolute':8, 'PartyPoker':9 } + SITEIDS = {'Fulltilt':1, 'Full Tilt Poker':1, 'PokerStars':2, 'Everleaf':3, 'Win2day':4, 'OnGame':5, 'UltimateBet':6, 'Betfair':7, 'Absolute':8, 'PartyPoker':9 } def __init__(self, db, config, siteName, summaryText, builtFrom = "HHC"): From d69c9dc33ff0a4ea4a1ef6b6c2c1774118a0002f Mon Sep 17 00:00:00 2001 From: Worros Date: Mon, 15 Nov 2010 14:24:31 +0800 Subject: [PATCH 13/17] TSI: Add FTP support --- pyfpdb/TestSummaryImport.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pyfpdb/TestSummaryImport.py b/pyfpdb/TestSummaryImport.py index 88a2cd7e..2aa2a81b 100755 --- a/pyfpdb/TestSummaryImport.py +++ b/pyfpdb/TestSummaryImport.py @@ -128,7 +128,7 @@ def main(argv=None): importer = SummaryImporter(config, sql, None) PokerStarsErrors = FpdbError('PokerStars') - #FTPErrors = FpdbError('Full Tilt Poker') + FTPErrors = FpdbError('Full Tilt Poker') #PartyPokerErrors = FpdbError('Party Poker') #BetfairErrors = FpdbError('Betfair') #OnGameErrors = FpdbError('OnGame') @@ -142,7 +142,7 @@ def main(argv=None): ErrorsList = [ PokerStarsErrors, - #FTPErrors, PartyPokerErrors, + FTPErrors, #PartyPokerErrors, #BetfairErrors, OnGameErrors, AbsoluteErrors, #EverleafErrors, CarbonErrors, PKRErrors, #iPokerErrors, WinamaxErrors, UltimateBetErrors, @@ -150,7 +150,7 @@ def main(argv=None): sites = { 'PokerStars' : True, - #'Full Tilt Poker' : True, + 'Full Tilt Poker' : True, #'PartyPoker' : True, #'Betfair' : True, #'OnGame' : True, @@ -165,8 +165,8 @@ def main(argv=None): if sites['PokerStars'] == True: walk_testfiles("regression-test-files/summaries/Stars/", compare, importer, PokerStarsErrors, "PokerStars") - #if sites['Full Tilt Poker'] == True: - # walk_testfiles("regression-test-files/cash/FTP/", compare, importer, FTPErrors, "Full Tilt Poker") + if sites['Full Tilt Poker'] == True: + walk_testfiles("regression-test-files/summaries/FTP/", compare, importer, FTPErrors, "Full Tilt Poker") # walk_testfiles("regression-test-files/tour/FTP/", compare, importer, FTPErrors, "Full Tilt Poker") #if sites['PartyPoker'] == True: # walk_testfiles("regression-test-files/cash/PartyPoker/", compare, importer, PartyPokerErrors, "PartyPoker") From 147cc6c95035164c48e12f0e2719fce228f0c959 Mon Sep 17 00:00:00 2001 From: Worros Date: Tue, 16 Nov 2010 11:57:09 +0800 Subject: [PATCH 14/17] Absolute: Deal with ','s in blinds --- pyfpdb/AbsoluteToFpdb.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pyfpdb/AbsoluteToFpdb.py b/pyfpdb/AbsoluteToFpdb.py index e0ceed48..59f75a8f 100755 --- a/pyfpdb/AbsoluteToFpdb.py +++ b/pyfpdb/AbsoluteToFpdb.py @@ -54,7 +54,7 @@ class Absolute(HandHistoryConverter): (?P\(1\son\s1\)|Single\ Tournament|Multi\ Normal\ Tournament|)\s* (?PNo\ Limit|Pot\ Limit|Normal|)\s? (?P\$|\s€|) - (?P[.0-9]+)/?(?:\$|\s€|)(?P[.0-9]+)? + (?P[.,0-9]+)/?(?:\$|\s€|)(?P[.,0-9]+)? \s+-\s+ (?P\d\d\d\d-\d\d-\d\d\ \d\d:\d\d:\d\d)\s+ (?: \( (?P[A-Z]+) \)\s+ )? @@ -95,10 +95,10 @@ class Absolute(HandHistoryConverter): player_re = "(?P" + "|".join(map(re.escape, players)) + ")" logging.debug("player_re: "+ player_re) #(?P\$| €|)(?P[0-9]*[.0-9]+) - self.re_PostSB = re.compile(ur"^%s - Posts small blind (?:\$| €|)(?P[0-9]*[.0-9]+)" % player_re, re.MULTILINE) - self.re_PostBB = re.compile(ur"^%s - Posts big blind (?:\$| €|)(?P[0-9]*[.0-9]+)" % player_re, re.MULTILINE) + self.re_PostSB = re.compile(ur"^%s - Posts small blind (?:\$| €|)(?P[,.0-9]+)" % player_re, re.MULTILINE) + self.re_PostBB = re.compile(ur"^%s - Posts big blind (?:\$| €|)(?P[.,0-9]+)" % player_re, re.MULTILINE) # TODO: Absolute posting when coming in new: %s - Posts $0.02 .. should that be a new Post line? where do we need to add support for that? *confused* - self.re_PostBoth = re.compile(ur"^%s - Posts dead (?:\$| €|)(?P[0-9]*[.0-9]+)" % player_re, re.MULTILINE) + self.re_PostBoth = re.compile(ur"^%s - Posts dead (?:\$| €|)(?P[,.0-9]+)" % player_re, re.MULTILINE) self.re_Action = re.compile(ur"^%s - (?PBets |Raises |All-In |All-In\(Raise\) |Calls |Folds|Checks)?\$?(?P[0-9]*[.0-9]+)?" % player_re, re.MULTILINE) self.re_ShowdownAction = re.compile(ur"^%s - Shows \[(?P.*)\]" % player_re, re.MULTILINE) self.re_CollectPot = re.compile(ur"^Seat [0-9]: %s(?: \(dealer\)|)(?: \(big blind\)| \(small blind\)|) (?:won|collected) Total \((?:\$| €|)(?P[0-9]*[.0-9]+)\)" % player_re, re.MULTILINE) @@ -175,11 +175,13 @@ class Absolute(HandHistoryConverter): if info['currency'] == 'T$': info['type'] = 'tour' if 'SB' in mg: + mg['SB'] = mg['SB'].replace(',', '') info['sb'] = mg['SB'] if 'BB' in mg: info['bb'] = mg['BB'] # NB: SB, BB must be interpreted as blinds or bets depending on limit type. if info['bb'] is None: + mg['SB'] = mg['SB'].replace(',', '') info['bb'] = mg['SB'] info['sb'] = str(float(mg['SB']) * 0.5) # TODO: AP does provide Small BET for Limit .. I think? at least 1-on-1 limit they do.. sigh From 41da3e6f65a25d587f51fcab0299389148768fa5 Mon Sep 17 00:00:00 2001 From: Worros Date: Tue, 16 Nov 2010 12:07:08 +0800 Subject: [PATCH 15/17] Absolute: Deal with ','s in Action, Antes and Collect --- pyfpdb/AbsoluteToFpdb.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyfpdb/AbsoluteToFpdb.py b/pyfpdb/AbsoluteToFpdb.py index 59f75a8f..a45119d8 100755 --- a/pyfpdb/AbsoluteToFpdb.py +++ b/pyfpdb/AbsoluteToFpdb.py @@ -99,10 +99,10 @@ class Absolute(HandHistoryConverter): self.re_PostBB = re.compile(ur"^%s - Posts big blind (?:\$| €|)(?P[.,0-9]+)" % player_re, re.MULTILINE) # TODO: Absolute posting when coming in new: %s - Posts $0.02 .. should that be a new Post line? where do we need to add support for that? *confused* self.re_PostBoth = re.compile(ur"^%s - Posts dead (?:\$| €|)(?P[,.0-9]+)" % player_re, re.MULTILINE) - self.re_Action = re.compile(ur"^%s - (?PBets |Raises |All-In |All-In\(Raise\) |Calls |Folds|Checks)?\$?(?P[0-9]*[.0-9]+)?" % player_re, re.MULTILINE) + self.re_Action = re.compile(ur"^%s - (?PBets |Raises |All-In |All-In\(Raise\) |Calls |Folds|Checks)?\$?(?P[,.0-9]+)?" % player_re, re.MULTILINE) self.re_ShowdownAction = re.compile(ur"^%s - Shows \[(?P.*)\]" % player_re, re.MULTILINE) - self.re_CollectPot = re.compile(ur"^Seat [0-9]: %s(?: \(dealer\)|)(?: \(big blind\)| \(small blind\)|) (?:won|collected) Total \((?:\$| €|)(?P[0-9]*[.0-9]+)\)" % player_re, re.MULTILINE) - self.re_Antes = re.compile(ur"^%s - Ante \[(?:\$| €|)(?P[.0-9]+)" % player_re, re.MULTILINE) + self.re_CollectPot = re.compile(ur"^Seat [0-9]: %s(?: \(dealer\)|)(?: \(big blind\)| \(small blind\)|) (?:won|collected) Total \((?:\$| €|)(?P[,.0-9]+)\)" % player_re, re.MULTILINE) + self.re_Antes = re.compile(ur"^%s - Ante \[(?:\$| €|)(?P[,.0-9]+)" % player_re, re.MULTILINE) #self.re_BringIn = re.compile(ur"^%s posts bring-in (?:\$| €|)(?P[.0-9]+)\." % player_re, re.MULTILINE) self.re_HeroCards = re.compile(ur"^Dealt to %s \[(?P.*)\]" % player_re, re.MULTILINE) From 55aa2df1deb0d4ab349393aa64324c1002fbf202 Mon Sep 17 00:00:00 2001 From: Worros Date: Tue, 16 Nov 2010 12:50:36 +0800 Subject: [PATCH 16/17] Stars: Fix AAMS portion of GameInfo regex. Somewhere along the line I removed the ? making it optional. --- pyfpdb/PokerStarsToFpdb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py index 061a88fc..16c4091e 100644 --- a/pyfpdb/PokerStarsToFpdb.py +++ b/pyfpdb/PokerStarsToFpdb.py @@ -100,7 +100,7 @@ class PokerStars(HandHistoryConverter): (?P\s-\s[%(LS)s\d\.]+\sCap\s-\s)? # Optional Cap part \s?(?P%(LEGAL_ISO)s)? \) # close paren of the stakes - (?P\s\[AAMS\sID:\s[A-Z0-9]+\]) # AAMS ID: in .it HH's + (?P\s\[AAMS\sID:\s[A-Z0-9]+\])? # AAMS ID: in .it HH's \s-\s (?P.*$) """ % substitutions, re.MULTILINE|re.VERBOSE) From a33a947deec6eed8e233a8c6de3e080adbb88dc7 Mon Sep 17 00:00:00 2001 From: Worros Date: Tue, 16 Nov 2010 12:59:00 +0800 Subject: [PATCH 17/17] Absolute: Fix more ',' breakage --- pyfpdb/AbsoluteToFpdb.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pyfpdb/AbsoluteToFpdb.py b/pyfpdb/AbsoluteToFpdb.py index a45119d8..d55f4710 100755 --- a/pyfpdb/AbsoluteToFpdb.py +++ b/pyfpdb/AbsoluteToFpdb.py @@ -332,17 +332,21 @@ class Absolute(HandHistoryConverter): for action in m: logging.debug("%s %s" % (action.group('ATYPE'), action.groupdict())) if action.group('ATYPE') == 'Raises ' or action.group('ATYPE') == 'All-In(Raise) ': - hand.addCallandRaise( street, action.group('PNAME'), action.group('BET') ) + bet = action.group('BET').replace(',', '') + hand.addCallandRaise( street, action.group('PNAME'), bet) elif action.group('ATYPE') == 'Calls ': - hand.addCall( street, action.group('PNAME'), action.group('BET') ) + bet = action.group('BET').replace(',', '') + hand.addCall( street, action.group('PNAME'), bet) elif action.group('ATYPE') == 'Bets ' or action.group('ATYPE') == 'All-In ': - hand.addBet( street, action.group('PNAME'), action.group('BET') ) + bet = action.group('BET').replace(',', '') + hand.addBet( street, action.group('PNAME'), bet) elif action.group('ATYPE') == 'Folds': hand.addFold( street, action.group('PNAME')) elif action.group('ATYPE') == 'Checks': hand.addCheck( street, action.group('PNAME')) elif action.group('ATYPE') == ' complete to': # TODO: not supported yet ? - hand.addComplete( street, action.group('PNAME'), action.group('BET')) + bet = action.group('BET').replace(',', '') + hand.addComplete( street, action.group('PNAME'), bet) else: logging.debug(_("Unimplemented readAction: %s %s" %(action.group('PNAME'),action.group('ATYPE'),))) @@ -359,7 +363,8 @@ class Absolute(HandHistoryConverter): def readCollectPot(self,hand): for m in self.re_CollectPot.finditer(hand.handText): - hand.addCollectPot(player=m.group('PNAME'),pot=m.group('POT')) + pot = m.group('POT').replace(',','') + hand.addCollectPot(player=m.group('PNAME'),pot=pot) def readShownCards(self,hand): """Reads lines where hole & board cards are mixed to form a hand (summary lines)"""