Commit Graph
100 Commits
Author SHA1 Message Date
Worros 085f46d3da Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-28 12:28:58 +08:00
Worros 9505cdc497 Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo 2010-02-27 15:45:56 +08:00
Worros 2fb151fdc8 Merge branch 'master' of git://git.assembla.com/free_poker_tools 2010-02-27 15:45:42 +08:00
Worros 8c08a6fcc5 Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo 2010-02-23 09:41:37 +08:00
Worros 773ba71499 Change blind semantics slightly to improve accounting.
This should improve the case where a second small blind is added.

The player committing the second sb still has a 1xsb accouting error
2010-02-17 19:57:26 +08:00
Worros 44d994303c Add comment regarding accounting error 2010-02-16 00:42:13 +08:00
Worros fcd0ba3dd1 PokerStarsToFpdb: allow a second small blind to be posted
If a player sits out a sb in a cash game they can post it after the button

There is still an accounting error in the way we calculate the returned bet.
2010-02-16 00:34:18 +08:00
Worros c0e0c3e596 Add comment to Bulk import
Too lazy to stash
2010-02-15 23:26:23 +08:00
Worros d37f301b10 Revert "a wtsd fix, but figures looks further out if anything now. see riterman in FLHE_6max_sawflop_wrong.txt for an example where street1seen is still not set"
This reverts commit 6814538594.
2010-02-15 00:01:36 +08:00
Worros 857c7f524d PokerStarsToFpdb - regex fix for actions
sqlcoder had a hh file containing

"playername: folds " - ie with a space on the end.
2010-02-14 23:54:19 +08:00
Worros 9f27ddabad Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2010-02-08 11:17:56 +08:00
Worros 4e64ec7abc Merge branch 'master' of git://git.assembla.com/free_poker_tools 2010-02-08 11:17:24 +08:00
Worros 55cb03b4f2 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-07 19:56:46 +08:00
Worros b996a884de PokerStarsTo? Fpdb: Fix subtle bug in re_Action
The bet action could become multiline greedy if there was a playername starting with 'card' in the next line.

"""
danny purse: bets $0.50
cardjunkie25: calls $0.50
"""

Would match "danny purse: bets $0.50\ncard", and the rest of that line would be ignored.

Added '$' to the end of the regex to make sure that it is limited to 1 line
2010-02-07 19:21:32 +08:00
Worros ee66abfecc Revert "PokerStarsTo Fpdb: Fix subtle bug in re_Action"
This reverts commit ac51876200.
2010-02-07 19:19:00 +08:00
Worros ac51876200 PokerStarsTo Fpdb: Fix subtle bug in re_Action
The bet action could become multiline greedy if there was a playername starting with 'card' in the next line.

"""
danny purse: bets $0.50
cardjunkie25: calls $0.50
"""

Would match "danny purse: bets $0.50\ncard", and the rest of that line would be ignored.

Added '$' to the end of the regex to make sure that it is limited to 1 line, and wrap 'cards' as a group.
2010-02-07 19:08:23 +08:00
Worros ac458386da Add config path to test2.py display 2010-02-05 21:29:07 +08:00
Worros e0a125faf0 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-05 17:32:05 +08:00
Worros ab693e3b3c test_PokerStars.py - Fix calls to HHC.
sqlcoder added config as a parameter to HHC and Hand
2010-02-05 11:51:12 +08:00
Worros fde72003f7 test2.py - Add more tests
Added most imports, and printed some formatted output for assiting diagnosis of new user installs
2010-02-05 11:44:27 +08:00
Worros afde406cc9 Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-02-05 11:01:52 +08:00
Worros b2e409ae00 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-04 00:36:51 +08:00
Worros 1cefb2e857 Fix playername siteid insert
From Gerko on mailing list:
> I just did a trial. Use bulkimport for a single Pokerstars file
> switch setting and bulkimport a single Full tilt file.
> When screening the db all players in the database show the same siteId
> (2 for pokerstars)
> Or the other way if the first site was Full Tilt.

The Lambda function wasn't initialising the lambda function correctly.
2010-02-03 23:48:39 +08:00
Worros 33455cb1ac PokerStars: Fix tablename regex to allow a #
Occasionally Stars throws up a cash table that looks like

PokerStars Game #22920951206:  Triple Draw 2-7 Lowball Limit ($0.10/$0.20) - 2008/12/14 17:44:00 ET
Table 'T #252691988' 6-max Seat #2 is the button

a # was previously excluded from the regex.
2010-02-03 21:52:44 +08:00
Worros 12a9cd2e3e Fix case-sensitive MySQL tables on Linux 2010-02-01 16:06:09 +08:00
Worros c46c4b05d4 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-02-01 16:04:17 +08:00
Worros 6179823d92 Fix test harness after fpdb_db removal 2010-02-01 14:47:04 +08:00
Worros 23e0611978 Merge branch 'master' of git://git.assembla.com/fpdb-sql 2010-01-29 17:20:57 +08:00
Worros a23d96e85d Add Carbon back in as default data.
Also add PKR
2010-01-29 17:00:37 +08:00
Worros 17bc9af88e Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo
Conflicts:
	run_fpdb.py
2010-01-29 13:01:38 +08:00
Worros 50f5acbf5c Merge branch 'master' of git://git.assembla.com/fpdb-eric 2010-01-29 12:21:01 +08:00
Worros df0d019a6d Merge branch 'master' of git://git.assembla.com/free_poker_tools 2010-01-29 12:12:24 +08:00
Worros 28a7d1e353 Hopefully fully fix the FTP playername parsing.
Split hand text for FTP, as the regex matches the player names incorrectly, and differentiating the lines is non-trivial.

The split should ensure that only the first version is available
2010-01-28 23:38:52 +08:00
Worros cee610d401 Add Carbon bits to example config file 2010-01-28 22:11:04 +08:00
Worros ad75bedbf1 CarbonToFpdb.py - Converter for Carbon poker
Currently only supports NLHE cash games. Further hand hstories required.

Plugin contributed by Matthew Boss.
2010-01-28 21:36:02 +08:00
Worros 7c90102677 Preliminary Carbon functions.
- Add the SITEID for Carbon

- Add function addAllIn():
"For sites which record "all in" as a special action, which can mean either "calls and is all in" or "raises all in".
"
2010-01-28 15:13:49 +08:00
Worros a9f2a261d4 Regex fix for Fulltilt player names
"Seat 7: moletrapper collected ($2.50)"
vs
"Seat 7: moletrapper ($2.50)"

The regex update should match the second and not the first.
2010-01-28 01:44:14 +08:00
Worros cd05c1da48 Remove unused variable 2010-01-28 01:36:42 +08:00
Worros 929e182a28 FulltiltToFpdb: Fix tourney player matching for players sitting out 2010-01-27 18:20:48 +08:00
Worros 8dea509245 FulltiltToFpdb: partially fix player ids
_mysql_exceptions.IntegrityError: (1062, "Duplicate entry 'romatrifon (small blind) showed -1' for key 'name'")

Previous regex was matching past the name.
2010-01-27 18:02:30 +08:00
Worros fb7aae9186 clean-up code to get playerId in gui-stats and gui-graphs
Conflicts:

	pyfpdb/GuiGraphViewer.py
2010-01-27 13:04:13 +08:00
Worros 896de37d0d Fix hudCache update semantics 2010-01-26 01:00:22 +08:00
Worros dbaad2d430 Remove NEWIMPORT variable.
No going back now :)
2010-01-24 13:36:21 +01:00
Worros fde2f1f710 Fix Charset import got Grapher 2010-01-24 13:30:02 +01:00
Worros 9d6707f18f Fix Charset import got Grapher 2010-01-23 15:30:48 +08:00
Worros 2538f61906 Remove erronous comment 2010-01-23 15:22:22 +08:00
Worros 74115dcd47 Fix comment layout - had a \t 2010-01-23 15:20:17 +08:00
Worros 6b38976edc Add left-2click option to hide stat windows.
Gerko, so I assume others don't have a middle mouse button.
2010-01-23 14:38:53 +08:00
Worros 29e705f337 Remove NEWIMPORT variable.
No going back now :)
2010-01-23 13:37:41 +08:00
Worros 98e4b598ed Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2010-01-23 02:18:42 +08:00
Worros c88ccd1140 Remove unused convert_cards() 2010-01-23 02:18:20 +08:00
Worros 4187561e66 Whitespace fixes to Card.py 2010-01-21 14:12:17 +08:00
Worros bd3e14e6de Merge branch 'stats'
Conflicts:
	pyfpdb/DerivedStats.py
	pyfpdb/test_PokerStars.py
2010-01-19 23:56:52 +08:00
Worros 3f0dfd2b26 Fix enumerate() 2010-01-16 13:55:01 +08:00
Worros 776405982b Quick fix for hud 2010-01-15 21:24:37 +08:00
Worros 5c0d695055 [NEWIMPORT] Almost all remaining stats
All conversions from Grigorij

street0_3BChance
street0_3BDone
street0_4BChance
street0_4BDone
stealAttemptChance
stealAttempted
foldBbToStealChance
foldBbToStealChance
foldSbToStealChance
foldedSbToSteal
foldedBbToSteal

3Bet, 4Bet in Stud does appear to work.

Unable to test steal in Stud games, all example hands in micros do not have a chance (I believe)
2010-01-15 20:07:50 +08:00
Worros 150b1891d6 [NEWIMPORT] setPositions(), fix aggr function
PFR now actually works
2010-01-15 20:04:59 +08:00
Worros 95aa993903 [NEWIMPORT] setPositions(), fix aggr function
PFR now actually works
2010-01-15 20:03:26 +08:00
Worros ecf1c6b878 [NEWIMPORT] Almost all remaining stats
All conversions from Grigorij

street0_3BChance
street0_3BDone
street0_4BChance
street0_4BDone
stealAttemptChance
stealAttempted
foldBbToStealChance
foldBbToStealChance
foldSbToStealChance
foldedSbToSteal
foldedBbToSteal

3Bet, 4Bet in Stud does appear to work.

Unable to test steal in Stud games, all example hands in micros do not have a chance (I believe)
2010-01-15 19:42:24 +08:00
Worros 700a68bcc8 [NEWIMPORT] calcCheckCallRaise()
Modify function from Grigorij to calculate check/call
2010-01-15 18:29:16 +08:00
Worros bad744fd80 [NEWIMPORT] setPositions(), fix aggr function
PFR now actually works
2010-01-15 13:50:46 +08:00
Worros cd88de7c7e [NEWIMPORT] Copy in Alchemy files from Grigorij's alchemy branch 2009-12-30 15:44:48 +08:00
Worros 4800f2515f Update HUD_config.xml
- Change default Holdem stat window layout to 3x3, add some more colouring
- Fix tab breakage from Gerko.
2009-12-28 22:09:06 +08:00
Worros c7aca0a32e Update HUD_config.xml
- Change default Holdem stat window layout to 3x3, add some more colouring
- Fix tab breakage from Gerko.
2009-12-28 22:03:26 +08:00
Worros 3f3d8ac54a Fix tab spacing from Gerkos recent patch 2009-12-28 10:22:44 +08:00
Worros 805d35c3fd Fix tab spacing from Gerkos recent patch 2009-12-28 10:21:31 +08:00
Worros 0e318e6d9f [NEWIMPORT] Commit currnetly failing test - sawShowdown
It would appear that all-in pre-flop doesn't flag sawShowdown.

Also modified the query to select street0Aggr, as that appears to be wrong at the moment
2009-12-26 17:18:05 +08:00
Worros 9f2f015fd0 New test for all-in preflop.
Test still fails - need to sort out an issue with database placement
2009-12-26 12:25:05 +08:00
Worros 1245a0cab3 New test file - All-in pre flop 2009-12-26 12:24:41 +08:00
Worros 624ab07f85 New test for all-in preflop.
Test still fails - need to sort out an issue with database placement
2009-12-26 12:23:20 +08:00
Worros 1bcb6736eb New test file - All-in pre flop 2009-12-26 10:07:33 +08:00
Worros 46e91e1a0f [NEWIMPORT] Remove a couple of unused functions 2009-12-25 18:55:13 +08:00
Worros 0adf0a7b18 [NEWIMPORT] updateHudCache update.
Fix a couple of bugs:
    position != 2 its = 'M'
    actually commit changes to hud
2009-12-24 01:12:39 +08:00
Worros a0475aa4db [NEWIMPORT] Add function to update hudcache for Hand 2009-12-23 23:14:34 +08:00
Worros a2d0657b3a [NEWIMPORT] Remove unused functions
Move old HudCache update over in preparation for fixing
2009-12-23 13:56:18 +08:00
Worros 6e9153c25c [NEWIMPORT] Copy Grigorij's code from Alchemy
Copied some of Grigorij's code verbatim for calculating additional stats, still needs adapting.

Also reorder some functions so the corresponding files are more mergeable in future.
2009-12-23 13:30:12 +08:00
Worros 355225fc25 [NEWIMPORT] Remove test_fpdb_simple 2009-12-22 23:03:05 +08:00
Worros d8a87b92d4 [NEWIMPORT] Make hudcache rebuild only happen no call to hud 2009-12-22 22:15:27 +08:00
Worros 284693e95e [NEWIMPORT] Rebuild hudcache after hand is committed 2009-12-22 22:02:36 +08:00
Worros 4d8d678d64 [NEWIMPORT] Make seek into autoimport function
Now that the legacy import path is gone, enable the index for HHC
2009-12-22 21:40:37 +08:00
Worros ae55a89d7f Remove reference to fpdb_simple 2009-12-22 20:22:05 +08:00
Worros 0898ddf8a1 [NEWIMPORT] HandsPlayers.startCards
Dodgy function just to get things kinda working again.
2009-12-22 17:30:49 +08:00
Worros a3be99bcf6 [NEWIMPORT] HandsPlayers.startCards
Dodgy function just to get things kinda working again.
2009-12-22 17:20:07 +08:00
Worros 1b82f20411 [NEWIMPORT] Remove legacy code. 2009-12-22 14:44:35 +08:00
Worros 262eb5200d Add LOCALE static to Configuration 2009-12-22 13:49:22 +08:00
Worros 02453ce3c0 Move locale variable to Configuration 2009-12-22 13:47:33 +08:00
Worros af1b516b23 Merge branch 'master' into stats
Conflicts:
	pyfpdb/DerivedStats.py
	pyfpdb/fpdb_import.py
2009-12-22 13:47:26 +08:00
Worros b71e485252 PokerStarsToFpdb - Add comment on parsing tourney buy-in 2009-12-21 16:10:44 +08:00
Worros 7b7865e794 Merge branch 'master' of git://git.assembla.com/fpdb 2009-12-21 11:16:25 +08:00
Worros babf0a039a PartyPoker - No Disconnect fix
Fix from Neko on 2+2

http://forumserver.twoplustwo.com/showpost.php?p=15495528&postcount=2374

"Finally got around to checking this out. Seems great so far. I had issues with some of my party hands that were on No Disconnect protect tables but adding the No DP regex in the PartyToFpdb hand converter seems to have fixed it for me."
2009-12-21 09:21:41 +08:00
Worros d5de93da28 [NEWIMPORT] Syntax fix 2009-12-19 10:07:53 +08:00
Worros 9012c74db7 [NEWIMPORT] Fix syntax to be 2.5 compatible.
Python 2.6 enumerate() function contains a useful 'start' paramater,
apparently this did not exist in 2.5.

Patch frim Mika Bostrom
2009-12-18 13:33:56 +08:00
Worros 2b7d34c484 [NEWIMPORT] Fix syntax to be 2.5 compatible.
Python 2.6 enumerate() function contains a useful 'start' paramater,
apparently this did not exist in 2.5.

Patch frim Mika Bostrom
2009-12-18 13:32:09 +08:00
Worros a2947c8707 [NEWIMPORT] Add stubbed variable to insert 2009-12-18 10:28:28 +08:00
Worros 975eb360ef [NEWIMPORT] Add stubbed variable to insert 2009-12-18 10:27:43 +08:00
Worros 1093b1e43c Remove dead code 2009-12-18 10:27:09 +08:00
Worros ba8f61d14a Add ability to import Stars archive files.
PokerStars support can provide a HH archive. The format is similar but not the same as a a standard hh format as it contains an additional line "Hand #X" between each hand.

Patch adds an option -s to GuiBulkImport, which when specified will strip these lines out and continue parsing.
2009-12-17 18:50:40 +08:00
Worros 26fc0b5928 Add ability to import Stars archive files.
PokerStars support can provide a HH archive. The format is similar but not the same as a a standard hh format as it contains an additional line "Hand #X" between each hand.

Patch adds an option -s to GuiBulkImport, which when specified will strip these lines out and continue parsing.
2009-12-17 18:42:50 +08:00
Worros 22f98ab1c5 Add some code to kinda detect hand cancellation
hhc.readHandInfo(self)
hhc.readPlayerStacks(self)
hhc.compilePlayerRegexs(self)
hhc.markStreets(self)

Is the order, the first correctly failing regex is markStreets
2009-12-17 16:00:24 +08:00
Worros 1fb99e4595 Add test hand - Hand cancelled 2009-12-17 15:59:29 +08:00