pokerstats 2.0.16 → 2.0.17

data/VERSION

@@ -1 +1 @@
-2.0.16
+2.0.17

data/bin/checkps

@@ -76,19 +76,27 @@ def dopsfile(file, players_shown)
   STDOUT.sync = false
   puts "=" * file.size
   reports = statistics.reports
-  printf "%-20s %3s %4s %4s %5s %5s %5s %5s %s\n", "Screen Name", "Num", "VP$%", "PFR%", "Pre/Pos", "BAtt%", "BDef%", "CBet%", "Poker-Edge Description"
-  printf "%-20s %-39s %s\n", "-"*20, "-"*39, "-"*47
+  printf "%-20s|%3s %4s %4s %5s %5s %5s|%5s %5s %5s|%5s %5s %5s | %s\n", "Screen Name", "Num", "VP$%", "PFR%", "Pre/Pos", "BAtt%", "BDef%", 
+    "CBet%", "Call", "Fold", "3Bet%", "Call", "Fold", "Poker-Edge Description"
+  puts "--------------------|---------------------------------|-----------------|------------------|--------------------------------------------"
   players.each do |each|
     report = reports[each]
     # puts report.to_yaml
     t_hands = report[:t_hands]
     vpi_p = display_ratio report[:t_vpip], report[:t_hands]
     pfr_p = display_ratio report[:t_pfr_opportunity_taken], report[:t_pfr_opportunity]
-    prefa = report[:t_preflop_passive]. zero? ? 0.0 : 1.0 * report[:t_preflop_aggressive] / report[:t_preflop_passive]
-    posfa = report[:t_postflop_passive]. zero? ? 0.0 : 1.0 * report[:t_postflop_aggressive] / report[:t_postflop_passive]
+    prefa = report[:t_preflop_passive].zero? ? 0.0 : [1.0 * report[:t_preflop_aggressive] / report[:t_preflop_passive],9.9].min
+    posfa = report[:t_postflop_passive].zero? ? 0.0 : [1.0 * report[:t_postflop_aggressive] / report[:t_postflop_passive],9.9].min
     batt_p = display_ratio report[:t_blind_attack_opportunity_taken], report[:t_blind_attack_opportunity]
     bdef_p = display_ratio report[:t_blind_defense_opportunity_taken], report[:t_blind_defense_opportunity]
-    cbet_p = display_ratio report[:t_cbet_opportunity_taken], report[:t_cbet_opportunity]
+    cbet_flop_p = display_ratio report[:t_cbet_flop_opportunity_taken], report[:t_cbet_flop_opportunity]
+    call_cbet_flop_p = display_ratio report[:t_call_cbet_flop_opportunity_taken], report[:t_call_cbet_flop_opportunity]
+    fold_to_cbet_flop_p = display_ratio report[:t_fold_to_cbet_flop_opportunity_taken], report[:t_fold_to_cbet_flop_opportunity]
+    preflop_3bet_p = display_ratio report[:t_preflop_3bet_opportunity_taken], report[:t_preflop_3bet_opportunity]
+    call_preflop_3bet_p = display_ratio report[:t_call_preflop_3bet_opportunity_taken], report[:t_call_preflop_3bet_opportunity]
+    fold_to_preflop_3bet_p = display_ratio report[:t_fold_to_preflop_3bet_opportunity_taken], report[:t_fold_to_preflop_3bet_opportunity]
+
+    
     description = players_shown[each][/\(.*\)/]
     description ||= ""
     description.gsub!("Passive", "P")
@@ -96,41 +104,15 @@ def dopsfile(file, players_shown)
     description.gsub!("Tight", "T")
     description.gsub!("Loose", "L")
     players_shown[each].gsub!(/\(.*\)/, description)
-    printf "%-20s %3d %4s %4s %2.1f/%2.1f %5s %5s %5s %s\n", each, t_hands, vpi_p, pfr_p, prefa, posfa, batt_p, bdef_p, cbet_p, players_shown[each]
+    printf "%-20s|%3d %4s %4s %2.1f/%2.1f %5s %5s|%5s %5s %5s|%5s %5s %5s | %s\n", 
+        each, t_hands, vpi_p, pfr_p, prefa, posfa, batt_p, bdef_p, 
+        cbet_flop_p, call_cbet_flop_p, fold_to_cbet_flop_p, 
+        preflop_3bet_p, call_preflop_3bet_p,fold_to_preflop_3bet_p,
+        players_shown[each]
+# puts report.to_yaml
   end
   puts "=" * file.size
   GC.start  
-#   puts last.reports.keys.inspect
-#   puts
-#   # puts
-#   # puts "=" * 90
-#   # puts last.path
-#   # players.each {|each| display(each, players_shown)}
-#   # puts
-#   # puts "=" * 90
-#   # puts "PLAYERS NOW AT THIS TABLE"
-#   # puts "=" * 90
-#   # printf "%-20s %3s %4s %4s %5s %s\n", "Screen Name", "Num", "VP$%", "PFR%", "Pre/Pos", "Poker-Edge Description"
-#   # printf "%-20s %-14s %s\n", "-"*20, "-"*21, "-"*47
-#   # players.each do |each|
-#   #   description = players_shown[each][/\(.*\)/]
-#   #   description ||= ""
-#   #   description.gsub!("Passive", "P")
-#   #   description.gsub!("Aggressive", "A")
-#   #   description.gsub!("Tight", "T")
-#   #   description.gsub!("Loose", "L")
-#   #   players_shown[each].gsub!(/\(.*\)/, description)
-#   #   printf "%-20s %3d %3d%% %3d%% %2.1f/%2.1f %s\n", each, 
-#   #     hands[each], (100.0 * vpip[each])/hands[each], (100.0 * pfr[each])/hands[each],
-#   #     preflop_passive[each].zero? ? 0.0 : (1.0 * preflop_aggressive[each]) / preflop_passive[each],
-#   #     postflop_passive[each].zero? ? 0.0 : (1.0 * postflop_aggressive[each]) / postflop_passive[each],
-#   #     players_shown[each]
-#   # end
-#   # puts "=" * 90
-#   # puts "information on #{hands.size} players collected"
-#   # hands = vpip = pfr = sawflop = preflop_aggressive = preflop_passive = nil
-
-#   # puts
 end
 
 def newpsfiles(user, time)

data/lib/pokerstats/player_statistics.rb

@@ -18,6 +18,17 @@ module Pokerstats
       @aggregate_statistics[each_player][aggregate_stat] ||= 0
       @aggregate_statistics[each_player][aggregate_stat] += 1 if reports[each_player][hand_stat]
     end
+    
+    def aggregate_three_part_statistic each_player, reports, aggregate_stat, hand_stat
+        # puts "a3ps(#{each_player},reports,#{aggregate_stat.inspect},#{hand_stat.inspect}) where reports[][]=#{reports[each_player][hand_stat].inspect}" if each_player == "wizardwerdna"
+        raise "diddledoo#{hand_stat}" unless reports[each_player].keys.include?(hand_stat)
+        t_stat_opportunity = ((aggregate_stat.to_s) + "_opportunity").to_sym
+        t_stat_opportunity_taken = ((aggregate_stat.to_s) + "_opportunity_taken").to_sym
+        @aggregate_statistics[each_player][t_stat_opportunity] ||=0
+        @aggregate_statistics[each_player][t_stat_opportunity_taken] ||=0
+        @aggregate_statistics[each_player][t_stat_opportunity] += 1 unless reports[each_player][hand_stat].nil?
+        @aggregate_statistics[each_player][t_stat_opportunity_taken] += 1 if reports[each_player][hand_stat]
+    end
   
     def aggregate_statistic each_player, reports, aggregate_stat, hand_stat
       @aggregate_statistics[each_player][aggregate_stat] ||= 0
@@ -30,7 +41,10 @@ module Pokerstats
   
     def record hand_statistics
       reports = hand_statistics.reports
+# puts reports.to_yaml
       reports.keys.each do |each_player|
+        raise "cbet_flop for #{each_player} inconsistent" if reports[:call_cbet_flop].nil? ^ reports[:fold_to_cbet_flop].nil?
+        raise "preflop_3bet for #{each_player} inconsistent" if reports[:call_preflop_3bet].nil? ^ reports[:fold_to_preflop_3bet].nil?
         @aggregate_statistics[each_player] ||= {}
       
         @aggregate_statistics[each_player][:t_hands] ||= 0
@@ -52,6 +66,14 @@ module Pokerstats
         aggregate_boolean_statistic each_player, reports, :t_pfr_opportunity_taken, :is_pfr_opportunity_taken
         aggregate_boolean_statistic each_player, reports, :t_cbet_opportunity, :is_cbet_opportunity
         aggregate_boolean_statistic each_player, reports, :t_cbet_opportunity_taken, :is_cbet_opportunity_taken
+        aggregate_three_part_statistic each_player, reports, :t_cbet_flop, :cbet_flop
+        aggregate_three_part_statistic each_player, reports, :t_fold_to_cbet_flop, :fold_to_cbet_flop
+        aggregate_three_part_statistic each_player, reports, :t_call_cbet_flop, :call_cbet_flop
+        aggregate_three_part_statistic each_player, reports, :t_preflop_3bet, :preflop_3bet
+        aggregate_three_part_statistic each_player, reports, :t_fold_to_preflop_3bet, :fold_to_preflop_3bet
+        aggregate_three_part_statistic each_player, reports, :t_call_preflop_3bet, :call_preflop_3bet
+        raise "messed up cbet_flop for #{each_player}" unless @aggregate_statistics[each_player][:t_call_cbet_flop_opportunity] == @aggregate_statistics[each_player][:t_fold_to_cbet_flop_opportunity]
+        raise "messed up preflop_3bet for #{each_player}" unless @aggregate_statistics[each_player][:t_call_preflop_3bet_opportunity] == @aggregate_statistics[each_player][:t_fold_to_preflop_3bet_opportunity]
       end
     end
   end

data/lib/pokerstats/plugins/street_bet_statistics.rb

@@ -60,6 +60,9 @@ module Pokerstats
                 [:cbet_flop,	        'boolean',	:cbet_flop],
                 [:cbet_turn,	        'boolean',	:cbet_turn],
                 [:cbet_river,	        'boolean',	:cbet_river],
+                [:call_cbet_flop,	    'boolean',	:call_cbet_flop],
+                [:call_cbet_turn,	    'boolean',	:call_cbet_turn],
+                [:call_cbet_river,	    'boolean',	:call_cbet_river],
                 [:fold_to_cbet_flop,	'boolean',	:fold_to_cbet_flop],
                 [:fold_to_cbet_turn,	'boolean',	:fold_to_cbet_turn],
                 [:fold_to_cbet_river,	'boolean',	:fold_to_cbet_river],
@@ -67,6 +70,9 @@ module Pokerstats
                 [:dbet_flop,	        'boolean',	:dbet_flop],
                 [:dbet_turn,	        'boolean',	:dbet_turn],
                 [:dbet_river,	        'boolean',	:dbet_river],
+                [:call_dbet_flop,	    'boolean',	:call_dbet_flop],
+                [:call_dbet_turn,	    'boolean',	:call_dbet_turn],
+                [:call_dbet_river,	    'boolean',	:call_dbet_river],
                 [:fold_to_dbet_flop,	'boolean',	:fold_to_dbet_flop],
                 [:fold_to_dbet_turn,	'boolean',	:fold_to_dbet_turn],
                 [:fold_to_dbet_river,	'boolean',	:fold_to_dbet_river]
@@ -147,7 +153,6 @@ module Pokerstats
             end
             def fold_to_cbet_#{street}(player)
                 @first_aggr_player[:#{street}] && cbet_#{street}(@first_aggr_player[:#{street}]) && fold_to_#{street}_1bet(player)
-                # fold_to_#{street}_1bet(player) && @last_aggr_player[:#{last_street}] && cbet_#{street}(@last_aggr_player[:#{last_street}])
             end
             def call_cbet_#{street}(player)
                 @first_aggr_player[:#{street}] && cbet_#{street}(@first_aggr_player[:#{street}]) && call_#{street}_1bet(player)

data/lib/pokerstats/pokerstars_hand_history_parser.rb

@@ -121,12 +121,18 @@ module Pokerstats
         #         :played_at=> PokerstarsTimeStringConverter.new($8).as_utc_datetime,
         #         :street => :prelude, :board => "", :max_players => 0, :number_players => 0, :table_name => "",
         #         :game_type => "Hold'em", :limit_type => "No Limit", :stakes_type => cash_to_d($3)            
-        when /PokerStars Game #([0-9]+): Tournament #([0-9]+), (Freeroll|(#{CASH})\+(#{CASH}) *(USD)?) +Hold'em No Limit - Level ([IVXL]+) \((#{CASH})\/(#{CASH})\) - (.*)$/
-            @stats.update_hand :name => "PS#{$1}", :description=> "#{$2}, #{$3} Hold'em No Limit", :tournament=> $2, 
-                :sb=> $8.to_d, :bb=> $9.to_d, :ante => "0.0".to_d, 
-                :played_at=> PokerstarsTimeStringConverter.new($10).as_utc_datetime,
-                :street => :prelude, :board => "", :max_players => 0, :number_players => 0, :table_name => "",
-                :game_type => "Hold'em", :limit_type => "No Limit", :stakes_type => cash_to_d($4)            
+      when /PokerStars Game #([0-9]+): Tournament #([0-9]+), (Freeroll|(#{CASH})\+(#{CASH}) *(USD)?) +Hold'em No Limit -.*Level ([IVXL]+) \((#{CASH})\/(#{CASH})\) - (.*)$/
+        @stats.update_hand :name => "PS#{$1}", :description=> "#{$2}, #{$3} Hold'em No Limit", :tournament=> $2, 
+            :sb=> $8.to_d, :bb=> $9.to_d, :ante => "0.0".to_d, 
+            :played_at=> PokerstarsTimeStringConverter.new($10).as_utc_datetime,
+            :street => :prelude, :board => "", :max_players => 0, :number_players => 0, :table_name => "",
+            :game_type => "Hold'em", :limit_type => "No Limit", :stakes_type => cash_to_d($4)            
+      when /PokerStars Game #([0-9]+): Tournament #([0-9]+), (Freeroll|(#{CASH}).*(FPP)) *(USD)? +Hold'em No Limit -.*Level ([IVXL]+) \((#{CASH})\/(#{CASH})\) - (.*)$/
+        @stats.update_hand :name => "PS#{$1}", :description=> "#{$2}, #{$3} Hold'em No Limit", :tournament=> $2, 
+            :sb=> $8.to_d, :bb=> $9.to_d, :ante => "0.0".to_d, 
+            :played_at=> PokerstarsTimeStringConverter.new($10).as_utc_datetime,
+            :street => :prelude, :board => "", :max_players => 0, :number_players => 0, :table_name => "",
+            :game_type => "Hold'em", :limit_type => "No Limit", :stakes_type => "0".to_d
       when /PokerStars Game #([0-9]+): +([^(]*)Hold'em No Limit \((#{CASH})\/(#{CASH})\) - (.*)$/
         @stats.update_hand :name => "PS#{$1}", :description=> "#{$2}Hold'em No Limit (#{$3}/#{$4})", :tournament=> nil, 
             :sb=> cash_to_d($3), :bb=> cash_to_d($4), :ante => "0.0".to_d, 

data/pokerstats.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pokerstats}
-  s.version = "2.0.16"
+  s.version = "2.0.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew C. Greenberg"]
-  s.date = %q{2009-11-20}
+  s.date = %q{2009-11-21}
   s.default_executable = %q{checkps}
   s.description = %q{a library for extracting, computing and reporting statistics of poker hands parsed from hand history files}
   s.email = %q{wizardwerdna@gmail.com}

data/spec/hand_statistics_spec.rb

@@ -127,6 +127,52 @@ Spec::Matchers.define :have_street_bet_statistics_specified_by do |street_hash,
     end
 end
 
+Spec::Matchers.define :have_consistent_street_bet_statistics do
+    match do |hand_statistics|
+        @errors = []
+        for street in [:flop, :turn, :river]
+            for player in hand_statistics.players
+                fs = "fold_to_cbet_#{street}".to_sym
+                cs = "call_cbet_#{street}".to_sym
+                if hand_statistics.send(fs, player).nil? ^ hand_statistics.send(cs, player).nil?
+                    @errors << {:fold_symbol => fs, :call_symbol => cs, :player => player}
+                end
+                fs = "fold_to_dbet_#{street}".to_sym
+                cs = "call_dbet_#{street}".to_sym
+                if hand_statistics.send(fs, player).nil? ^ hand_statistics.send(cs, player).nil?
+                    @errors << {:fold_symbol => fs, :call_symbol => cs, :player => player}
+                end
+            end
+            for bet in 1..4
+                for player in hand_statistics.players
+                    fs = bet_statistics_proc_symbol(street, bet, "fold_to_")
+                    cs = bet_statistics_proc_symbol(street, bet, "call_")
+                    if hand_statistics.send(fs, player).nil? ^ hand_statistics.send(cs, player).nil?
+                        @errors << {:fold_symbol => fs, :call_symbol => cs, :player => player}
+                    end
+                end
+            end
+        end
+        @errors.empty?
+    end
+
+    failure_message_for_should do |hand_statistics|
+        @errors.collect do |each|
+            "inconsistent results: #{each[:fold_symbol]}(#{each[:player]}) = #{hand_statistics.send(each[:fold_symbol], each[:player]).inspect}," +
+            " but #{each[:call_symbol]}(#{each[:player]}) = #{hand_statistics.send(each[:call_symbol], each[:player]).inspect}"
+        end.join("; \n")
+    end
+
+    failure_message_for_should_not do |hand_statistics|
+        "the statistics were consistent"
+    end
+
+    description do
+        "have consistent call_* and fold_to_* statistics for each player"
+    end
+end
+
+
 Spec::Matchers.define :have_last_aggr do |street, screen_name|
     match do |hand_statistics|
         @errors = []
@@ -1257,6 +1303,7 @@ describe HandStatistics do
                 it {@stats.should have_street_bet_statistics_specified_by @bet_specification, ""}
                 it {@stats.should have_street_bet_statistics_specified_by @call_bet_specification, "call_"}
                 it {@stats.should have_street_bet_statistics_specified_by @fold_to_bet_specification, "fold_to_"}
+                it {@stats.should have_consistent_street_bet_statistics}
             end
             
             context "after 1 raise" do
@@ -1287,6 +1334,7 @@ describe HandStatistics do
                     it {@stats.should have_street_bet_statistics_specified_by @bet_specification, ""}
                     it {@stats.should have_street_bet_statistics_specified_by @call_bet_specification, "call_"}
                     it {@stats.should have_street_bet_statistics_specified_by @fold_to_bet_specification, "fold_to_"}
+                    it {@stats.should have_consistent_street_bet_statistics}
                 end
                 context "other streets" do
                     before(:each) do
@@ -1316,6 +1364,7 @@ describe HandStatistics do
                     it {@stats.should have_street_bet_statistics_specified_by @bet_specification, ""}
                     it {@stats.should have_street_bet_statistics_specified_by @call_bet_specification, "call_"}
                     it {@stats.should have_street_bet_statistics_specified_by @fold_to_bet_specification, "fold_to_"}
+                    it {@stats.should have_consistent_street_bet_statistics}
                 end
             end
             
@@ -1347,6 +1396,7 @@ describe HandStatistics do
                     it {@stats.should have_street_bet_statistics_specified_by @bet_specification, ""}
                     it {@stats.should have_street_bet_statistics_specified_by @call_bet_specification, "call_"}
                     it {@stats.should have_street_bet_statistics_specified_by @fold_to_bet_specification, "fold_to_"}
+                    it {@stats.should have_consistent_street_bet_statistics}
                 end
                 context "other streets" do
                     before(:each) do
@@ -1380,6 +1430,7 @@ describe HandStatistics do
                     it {@stats.should have_street_bet_statistics_specified_by @bet_specification, ""}
                     it {@stats.should have_street_bet_statistics_specified_by @call_bet_specification, "call_"}
                     it {@stats.should have_street_bet_statistics_specified_by @fold_to_bet_specification, "fold_to_"}
+                    it {@stats.should have_consistent_street_bet_statistics}
                 end
             end
             
@@ -1412,6 +1463,7 @@ describe HandStatistics do
                     it {@stats.should have_street_bet_statistics_specified_by @bet_specification, ""}
                     it {@stats.should have_street_bet_statistics_specified_by @call_bet_specification, "call_"}
                     it {@stats.should have_street_bet_statistics_specified_by @fold_to_bet_specification, "fold_to_"}
+                    it {@stats.should have_consistent_street_bet_statistics}
                 end
                 context "other streets" do
                     before(:each) do
@@ -1446,6 +1498,7 @@ describe HandStatistics do
                     it {@stats.should have_street_bet_statistics_specified_by @bet_specification, ""}
                     it {@stats.should have_street_bet_statistics_specified_by @call_bet_specification, "call_"}
                     it {@stats.should have_street_bet_statistics_specified_by @fold_to_bet_specification, "fold_to_"}
+                    it {@stats.should have_consistent_street_bet_statistics}
                 end
             end
             
@@ -1475,6 +1528,7 @@ describe HandStatistics do
                     it {@stats.should have_street_bet_statistics_specified_by @bet_specification, ""}
                     it {@stats.should have_street_bet_statistics_specified_by @call_bet_specification, "call_"}
                     it {@stats.should have_street_bet_statistics_specified_by @fold_to_bet_specification, "fold_to_"}
+                    it {@stats.should have_consistent_street_bet_statistics}
                 end
                 context "other streets" do
                     before(:each) do
@@ -1506,6 +1560,7 @@ describe HandStatistics do
                     it {@stats.should have_street_bet_statistics_specified_by @bet_specification, ""}
                     it {@stats.should have_street_bet_statistics_specified_by @call_bet_specification, "call_"}
                     it {@stats.should have_street_bet_statistics_specified_by @fold_to_bet_specification, "fold_to_"}
+                    it {@stats.should have_consistent_street_bet_statistics}
                 end
             end            
         end
@@ -1539,6 +1594,7 @@ describe HandStatistics do
                     @stats.call_dbet_flop(player).should be_nil
                     @stats.fold_to_dbet_flop(player).should be_nil
                 end
+                @stats.should have_consistent_street_bet_statistics
             end
 
             context "when button last bets each street and bets first in on the next" do
@@ -1575,6 +1631,7 @@ describe HandStatistics do
                             @stats.send("call_dbet_#{street}", "sb").should be_nil
                             @stats.send("fold_to_dbet_#{street}", "bb").should be_nil
                         end
+                        @stats.should have_consistent_street_bet_statistics
                     end
                 end
             end
@@ -1611,6 +1668,7 @@ describe HandStatistics do
                         @stats.send("fold_to_dbet_#{street}", "sb").should be_nil
                         @stats.send("fold_to_dbet_#{street}", "bb").should be_nil
                         @stats.send("fold_to_dbet_#{street}", "button").should be_false
+                        @stats.should have_consistent_street_bet_statistics
                     end
                 end
             end
@@ -1650,6 +1708,7 @@ describe HandStatistics do
                             @stats.send("call_dbet_#{street}", "sb").should be_nil
                             @stats.send("fold_to_dbet_#{street}", "bb").should be_nil
                         end
+                        @stats.should have_consistent_street_bet_statistics
                     end
                 end
             end
@@ -1679,6 +1738,7 @@ describe HandStatistics do
                     [:sb, :bb, :button].each do |player|
                         @stats.dbet_flop(player).should be_nil
                     end
+                    @stats.should have_consistent_street_bet_statistics
                 end
             end
             
@@ -1710,6 +1770,7 @@ describe HandStatistics do
                     [:sb, :bb, :button].each do |player|
                         @stats.dbet_turn(player).should be_nil
                     end
+                    @stats.should have_consistent_street_bet_statistics
                 end
             end
             
@@ -1741,6 +1802,7 @@ describe HandStatistics do
                     [:sb, :bb, :button].each do |player|
                         @stats.dbet_river(player).should be_nil
                     end
+                    @stats.should have_consistent_street_bet_statistics
                 end
             end
         end
@@ -1843,8 +1905,10 @@ describe HandStatistics do
             :fold_to_river_1bet, :fold_to_river_2bet, :fold_to_river_3bet, :fold_to_river_4bet,
             :last_aggr_preflop, :last_aggr_flop, :last_aggr_turn, :last_aggr_river,
             :cbet_flop, :cbet_turn, :cbet_river,
+            :call_cbet_flop, :call_cbet_turn, :call_cbet_river,
             :fold_to_cbet_flop, :fold_to_cbet_turn, :fold_to_cbet_river,
             :dbet_flop, :dbet_turn, :dbet_river,
+            :call_dbet_flop, :call_dbet_turn, :call_dbet_river,
             :fold_to_dbet_flop, :fold_to_dbet_turn, :fold_to_dbet_river
         ]
         report_items.each{|report_item| @street_bet_plugin.should_receive(report_item).exactly(@stats.players.size)}

data/spec/player_statistics_spec.rb

@@ -22,7 +22,9 @@ TEST = [
       :postflop_passive => 3, 
       :postflop_aggressive => 4, 
       :is_pfr_opportunity => true, 
-      :is_pfr_opportunity_taken => true
+      :is_pfr_opportunity_taken => true,
+      :flop_cbet => true,
+      :flop_2bet => true
     },
   "judi" => {
       :is_blind_attack_opportunity => true, 
@@ -40,7 +42,9 @@ TEST = [
       :postflop_passive => 30, 
       :postflop_aggressive => 40,
       :is_pfr_opportunity => true, 
-      :is_pfr_opportunity_taken => false
+      :is_pfr_opportunity_taken => false,
+      :flop_cbet => false,
+      :flop_2bet => false
     }
   },
   {"andy" => {
@@ -59,7 +63,9 @@ TEST = [
       :postflop_passive => 6, 
       :postflop_aggressive => 8,
       :is_pfr_opportunity => true, 
-      :is_pfr_opportunity_taken => true
+      :is_pfr_opportunity_taken => true,
+      :flop_cbet => false,
+      :flop_2bet => true
     },
   "judi" => {
       :is_blind_attack_opportunity => true, 
@@ -77,7 +83,9 @@ TEST = [
       :postflop_passive => 60, 
       :postflop_aggressive => 80,
       :is_pfr_opportunity => true, 
-      :is_pfr_opportunity_taken => false
+      :is_pfr_opportunity_taken => false,
+      :flop_cbet => nil,
+      :flop_2bet => false
     }
   },
   {"andy" => {
@@ -96,7 +104,9 @@ TEST = [
       :postflop_passive => 9, 
       :postflop_aggressive => 12,
       :is_pfr_opportunity => true, 
-      :is_pfr_opportunity_taken => true
+      :is_pfr_opportunity_taken => true,
+      :flop_cbet => nil,
+      :flop_2bet => true
     },    
   "judi" => {
       :is_blind_attack_opportunity => true, 
@@ -114,7 +124,9 @@ TEST = [
       :postflop_passive => 90, 
       :postflop_aggressive => 120,
       :is_pfr_opportunity => true, 
-      :is_pfr_opportunity_taken => false
+      :is_pfr_opportunity_taken => false,
+      :flop_cbet => nil,
+      :flop_2bet => false
     }
   }
 ]
@@ -137,7 +149,11 @@ PS_RESULT = {
     :t_postflop_passive => 18, 
     :t_postflop_aggressive => 24,
     :t_pfr_opportunity => 3, 
-    :t_pfr_opportunity_taken => 3
+    :t_pfr_opportunity_taken => 3,
+    :t_flop_2bet_opportunity => 3,
+    :t_flop_2bet_opportunity_taken => 3,
+    :t_flop_cbet_opportunity => 2,
+    :t_flop_cbet_opportunity_taken => 1
   },
   "judi" => {
     :t_hands => 3,
@@ -156,7 +172,11 @@ PS_RESULT = {
     :t_postflop_passive => 180, 
     :t_postflop_aggressive => 240,
     :t_pfr_opportunity => 3, 
-    :t_pfr_opportunity_taken => 0
+    :t_pfr_opportunity_taken => 0,
+    :t_flop_2bet_opportunity => 3,
+    :t_flop_2bet_opportunity_taken => 0,
+    :t_cbet_opportunity => 1,
+    :t_cbet_opportunity_taken => 0
   }
 }
 
@@ -227,4 +247,7 @@ describe PlayerStatistics, "when aggregating statistics" do
   it 'should correctly aggregate preflop raise statistics' do
     should_correctly_aggregate @reports, [:t_pfr_opportunity, :t_pfr_opportunity_taken]
   end
+  it 'should correctly aggregate ternary statistics' do
+    should_correctly_aggregate @reports, [:t_flop_2bet, :t_flop_cbet]
+  end
 end

data/spec/pokerstars_hand_history_parser_spec.rb

@@ -137,6 +137,27 @@ describe PokerstarsHandHistoryParser, "when parsing structural matter" do
     )
     @parser.parse("PokerStars Game #24703545200: Tournament #137653257, Freeroll  Hold'em No Limit - Level I (10/20) - 2009/02/07 19:24:12 ET")
   end
+ 
+  it "should recognize a freeroll tournament hand history" do
+    @stats.should_receive(:update_hand).with(
+        :name => "PS27572086902",
+        :description => "158153393, 5125FPP Hold'em No Limit",
+        :ante => "0.0".to_d,
+        :table_name => "",
+        :max_players => 0,
+        :number_players => 0,
+        :sb => "10".to_d,
+        :bb => "20".to_d,
+        :played_at => DateTime.parse("2009/04/27 22:19:46 EDT"),
+        :tournament => "158153393",
+        :street => :prelude,
+        :board => "",
+        :game_type => "Hold'em",
+        :stakes_type => "0".to_d,
+        :limit_type => "No Limit"
+    )  
+    @parser.parse("PokerStars Game #27572086902: Tournament #158153393, 5125FPP Hold'em No Limit - Level I (10/20) - 2009/04/27 22:19:46 ET")
+  end
   
   it "should recognize a tournament header" do
     PokerstarsHandHistoryParser.should have_valid_header("PokerStars Game #21650436825: Tournament #117620218, $10+$1 Hold'em No Limit - Level I (10/20) - 2008/10/31 17:25:42 ET\nsnuggles\n")
@@ -157,7 +178,7 @@ describe PokerstarsHandHistoryParser, "when parsing structural matter" do
       :street => :prelude,
       :board => "", # due to pokerstars hand history bug
       :game_type => "Hold'em",
-      :stakes_type => "0.50".to_d,
+      :stakes_type => "0.5".to_d,
       :limit_type => "No Limit"
     )
     @parser.parse("PokerStars Game #21650146783:  Hold'em No Limit ($0.25/$0.50) - 2008/10/31 17:14:44 ET")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pokerstats
 version: !ruby/object:Gem::Version 
-  version: 2.0.16
+  version: 2.0.17
 platform: ruby
 authors: 
 - Andrew C. Greenberg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-20 00:00:00 -08:00
+date: 2009-11-21 00:00:00 -08:00
 default_executable: checkps
 dependencies: 
 - !ruby/object:Gem::Dependency