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

pyfpdb/DerivedStats.py

@@ -264,6 +264,10 @@ class DerivedStats():
         if self.hands['playersAtShowdown'] > 1:
             for player in pas:
                 self.handsplayers[player]['sawShowdown'] = True
+                # streetXseenFix: streetXseen values miss out streets that were checked through,
+                # make sure all are set if showdown is seen
+                for i in xrange(1, len(hand.actionStreets)-1):
+                    self.handsplayers[player]['street%sSeen' % i] = True
 
     def streetXRaises(self, hand):
         # self.actions[street] is a list of all actions in a tuple, contining the action as the second element
@@ -375,7 +379,10 @@ class DerivedStats():
 
         for player in hand.players:
             if player[1] in pas:
-                self.handsplayers[player[1]]['street%sSeen' % i] = True
+                # streetXseenFix: streetXseen values miss out streets that were checked through,
+                # make sure earlier ones are set if action on later street
+                for j in xrange(1,i+1):
+                    self.handsplayers[player[1]]['street%sSeen' % j] = True
             else:
                 self.handsplayers[player[1]]['street%sSeen' % i] = False
 

pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_mult_calls.txt

@@ -0,0 +1,49 @@
+
+
+PokerStars Game #39691143951:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:39:47 ET
+Table 'Triton IV' 6-max Seat #6 is the button
+Seat 1: vit-ivanov ($12.60 in chips) 
+Seat 2: Sub_Se7enxxx ($7 in chips) 
+Seat 3: OK @ PB ($17.70 in chips) 
+Seat 4: riterman ($7.90 in chips) 
+Seat 5: Slaviyaka ($13.85 in chips) 
+Seat 6: surething ($9.65 in chips) 
+vit-ivanov: posts small blind $0.10
+Sub_Se7enxxx: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [3s 7c]
+OK @ PB: calls $0.25
+riterman: raises $0.25 to $0.50
+Slaviyaka: folds 
+surething: folds 
+vit-ivanov: folds 
+Sub_Se7enxxx: calls $0.25
+OK @ PB: calls $0.25
+*** FLOP *** [9d 8h 3d]
+Sub_Se7enxxx: bets $0.25
+OK @ PB: calls $0.25
+riterman: raises $0.25 to $0.50
+Sub_Se7enxxx: folds 
+OK @ PB: calls $0.25
+*** TURN *** [9d 8h 3d] [7d]
+OK @ PB: checks 
+riterman: bets $0.50
+OK @ PB: raises $0.50 to $1
+riterman: calls $0.50
+*** RIVER *** [9d 8h 3d 7d] [Kh]
+OK @ PB: bets $0.50
+riterman: calls $0.50
+*** SHOW DOWN ***
+OK @ PB: shows [9c 8d] (two pair, Nines and Eights)
+riterman: shows [Kd Kc] (three of a kind, Kings)
+riterman collected $5.60 from pot
+*** SUMMARY ***
+Total pot $5.85 | Rake $0.25 
+Board [9d 8h 3d 7d Kh]
+Seat 1: vit-ivanov (small blind) folded before Flop
+Seat 2: Sub_Se7enxxx (big blind) folded on the Flop
+Seat 3: OK @ PB showed [9c 8d] and lost with two pair, Nines and Eights
+Seat 4: riterman showed [Kd Kc] and won ($5.60) with three of a kind, Kings
+Seat 5: Slaviyaka folded before Flop (didn't bet)
+Seat 6: surething (button) folded before Flop (didn't bet)
+

pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong.txt

@@ -0,0 +1,41 @@
+
+
+PokerStars Game #39691607275:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:49:45 ET
+Table 'Triton IV' 6-max Seat #2 is the button
+Seat 1: vit-ivanov ($16.25 in chips) 
+Seat 2: SONAG777 ($1.25 in chips) 
+Seat 4: riterman ($11.40 in chips) 
+Seat 5: Slaviyaka ($13.60 in chips) 
+Seat 6: surething ($9.50 in chips) 
+riterman: posts small blind $0.10
+Slaviyaka: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [6d 9c]
+surething: folds 
+vit-ivanov: folds 
+SONAG777: folds 
+riterman: calls $0.15
+Slaviyaka: checks 
+*** FLOP *** [Ks 5d Ah]
+riterman: checks 
+Slaviyaka: checks 
+*** TURN *** [Ks 5d Ah] [6s]
+riterman: bets $0.50
+Slaviyaka: calls $0.50
+*** RIVER *** [Ks 5d Ah 6s] [Kd]
+riterman: checks 
+Slaviyaka: bets $0.50
+riterman: calls $0.50
+*** SHOW DOWN ***
+Slaviyaka: shows [8s Qs] (a pair of Kings)
+riterman: shows [9s 6c] (two pair, Kings and Sixes)
+riterman collected $2.40 from pot
+*** SUMMARY ***
+Total pot $2.50 | Rake $0.10 
+Board [Ks 5d Ah 6s Kd]
+Seat 1: vit-ivanov folded before Flop (didn't bet)
+Seat 2: SONAG777 (button) folded before Flop (didn't bet)
+Seat 4: riterman (small blind) showed [9s 6c] and won ($2.40) with two pair, Kings and Sixes
+Seat 5: Slaviyaka (big blind) showed [8s Qs] and lost with a pair of Kings
+Seat 6: surething folded before Flop (didn't bet)
+

pyfpdb/regression-test-files/cash/Stars/Flop/FLHE_6max_sawflop_wrong2.txt

@@ -0,0 +1,38 @@
+
+
+PokerStars Game #39691211280:  Hold'em Limit ($0.25/$0.50 USD) - 2010/02/13 12:41:15 ET
+Table 'Triton IV' 6-max Seat #2 is the button
+Seat 1: vit-ivanov ($12.50 in chips) 
+Seat 2: Sub_Se7enxxx ($7.20 in chips) 
+Seat 3: OK @ PB ($14.95 in chips) 
+Seat 4: riterman ($10.25 in chips) 
+Seat 5: Slaviyaka ($13.85 in chips) 
+Seat 6: surething ($9.65 in chips) 
+OK @ PB: posts small blind $0.10
+riterman: posts big blind $0.25
+*** HOLE CARDS ***
+Dealt to surething [6h 7s]
+Slaviyaka: folds 
+surething: folds 
+vit-ivanov: raises $0.25 to $0.50
+Sub_Se7enxxx: folds 
+Sub_Se7enxxx leaves the table
+OK @ PB: folds 
+riterman: calls $0.25
+*** FLOP *** [Ac Kh 2d]
+riterman: checks 
+vit-ivanov: bets $0.25
+riterman: folds 
+Uncalled bet ($0.25) returned to vit-ivanov
+vit-ivanov collected $1.05 from pot
+vit-ivanov: doesn't show hand 
+*** SUMMARY ***
+Total pot $1.10 | Rake $0.05 
+Board [Ac Kh 2d]
+Seat 1: vit-ivanov collected ($1.05)
+Seat 2: Sub_Se7enxxx (button) folded before Flop (didn't bet)
+Seat 3: OK @ PB (small blind) folded before Flop
+Seat 4: riterman (big blind) folded on the Flop
+Seat 5: Slaviyaka folded before Flop (didn't bet)
+Seat 6: surething folded before Flop (didn't bet)
+