acpc_poker_types 7.8.4 → 7.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f65e8fcf52a3c9280f80307b209669634c6878b
-  data.tar.gz: 67f3e30a2f017c388d0521e815a28288d5c12056
+  metadata.gz: 7084a475af9591c14e3acbb9c4e6175f5c7bdeb9
+  data.tar.gz: 8278322d9a1df82e20e61c2594f8d89f63afbf6d
 SHA512:
-  metadata.gz: bb777bea0545f0c9e5bf8013578c321aad5001ddbf318a4f5c1df36b6c25474ce77ad141bf16145a44067842f519472f7e3ddbd9fb50ac2799ac42e2b606a0fc
-  data.tar.gz: 3593d8dbdd272ae4482230a1a62c78d1683bd2904fd0d5c7339410f2e6f8b70e5fe7efa5c15f242960c3fa3df2a34a41d83e7f65bec428889525897e27b3078c
+  metadata.gz: 1afae92e4aaef2ebca49f077fa51eadda232272d363458683242d21d5929263b2e3eb8c8dfddd0d735d175e75febee5fc18b20a0131193e73033a1c11ef652f4
+  data.tar.gz: ace19dcb18b1fe1dccb30c217ade1b9104f93e79171e06299733993c9563c4ca3224e1a95d9648cf8af707ac5b0b277f9d8d824219e7d3e06671648202a11f56

data/lib/acpc_poker_types/match_state.rb

@@ -404,7 +404,9 @@ class MatchState < DelegateClass(String)
   end
 
   def pot(game_def)
-    @pot ||= players(game_def).map { |player| player.contributions }.flatten.inject(:+)
+    @pot ||= players(game_def).map do |player|
+      player.contributions
+    end.flatten.inject(:+)
   end
 
   # @return [ChipStack] Minimum wager by.
@@ -427,6 +429,20 @@ class MatchState < DelegateClass(String)
     )
   end
 
+  def hand_strengths(game_def)
+    @hand_strengths ||= players(game_def).map do |player|
+      if player.folded?
+        -1
+      else
+        PileOfCards.new(community_cards.flatten + player.hand).to_poker_hand_strength
+      end
+    end
+  end
+
+  def winning_players(game_def)
+    @winning_players ||= compute_winning_players!(game_def)
+  end
+
   private
 
   def finish_update!(game_def)
@@ -437,14 +453,9 @@ class MatchState < DelegateClass(String)
   end
 
   def compute_winning_players!(game_def)
-    hand_strengths = players(game_def).map do |player|
-      if player.folded?
-        -1
-      else
-        PileOfCards.new(community_cards.flatten + player.hand).to_poker_hand_strength
-      end
-    end
-    @winning_players = hand_strengths.indices hand_strengths.max
+    @winning_players = hand_strengths(game_def).indices(
+      hand_strengths(game_def).max
+    )
   end
 
   def walk_over_betting_sequence!(game_def)
@@ -490,6 +501,7 @@ class MatchState < DelegateClass(String)
       action,
       @min_wager_by
     )
+    raise %Q{Action "#{action}" cannot cost more than the stack size of the acting player: Acting player position: #{@next_to_act}, stack size: #{@players[@next_to_act].stack.to_f}, action cost: #{cost.to_f}, match state: #{to_s}.} if cost > @players[@next_to_act].stack
 
     @precise_betting_sequence[current_round] << PokerAction.new(
       action.to_s(
@@ -520,17 +532,35 @@ class MatchState < DelegateClass(String)
 
   # Distribute chips to all winning players
   def distribute_chips!(game_def)
-    return self if pot(game_def) <= 0
-
-    compute_winning_players!(game_def) unless @winning_players
+    return self unless pot(game_def) > 0
 
-    # @todo This only works for Doyle's game where there are no side-pots.
-    amount_each_player_wins = pot(game_def)/@winning_players.length.to_r
+    best_hs = hand_strengths(game_def).max
 
-    @winning_players.each do |player_index|
-      @players[player_index].winnings = amount_each_player_wins
+    contributions = players(game_def).map do |player|
+      player.total_contribution
     end
 
+    # @todo This only works for Doyle's game where there are no non-trivial side-pots.
+    winnings = contributions.dup
+    players(game_def).each_with_index do |player, i|
+      next if hand_strengths(game_def)[i] < best_hs
+
+      contributions.each_with_index do |c, j|
+        next if i == j
+
+        num_chips = (
+          [c, player.total_contribution].min /
+          winning_players(game_def).length.to_r
+        )
+        winnings[i] += num_chips
+        winnings[j] -= num_chips
+
+        raise %Q{The winnings for player in position #{j} is negative (#{winnings[j]}) in match state "#{to_s}"} if winnings[j] < 0
+      end
+    end
+    players(game_def).each_with_index do |player, i|
+      player.winnings = winnings[i]
+    end
     self
   end
 

data/lib/acpc_poker_types/version.rb

@@ -1,3 +1,3 @@
 module AcpcPokerTypes
-  VERSION = '7.8.4'
+  VERSION = '7.8.5'
 end

data/spec/match_state_spec.rb

@@ -783,6 +783,77 @@ describe MatchState do
         end
       end
     end
+    describe 'correctly tracks player contributions to the pot and winnings when players begin with different stack sizes and both go all-in' do
+      let(:game_def) do
+        GameDefinition.new(
+          :betting_type=>"nolimit",
+          :chip_stacks=>[20000, 20000],
+          :number_of_players=>2,
+          :blinds=>[100, 50],
+          :raise_sizes=>nil,
+          :number_of_rounds=>4,
+          :first_player_positions=>[1, 0, 0, 0],
+          :number_of_suits=>4,
+          :number_of_ranks=>13,
+          :number_of_hole_cards=>2,
+          :number_of_board_cards=>[0, 3, 1, 1]
+        )
+      end
+      let(:x_actions) do
+        [
+          [
+            [
+              PokerAction.new(PokerAction::RAISE, cost: 20050),
+            ],
+            [
+              PokerAction.new(PokerAction::CALL, cost: 19800)
+            ],
+          ]
+        ]
+      end
+      let(:patient) { MatchState.new(match_state).players(game_def) }
+
+      it 'when the winner has fewer chips' do
+        def match_state
+          "#{MatchState::LABEL}:0:0:19900|20100:r20100c///:AhKs|2h7d"
+        end
+        patient.map do |player, pos|
+          player.initial_stack
+        end.must_equal [19900, 20100]
+
+        patient.map do |player, pos|
+          player.total_contribution
+        end.must_equal [19900, 20100]
+
+        patient.map { |player, pos| player.winnings }.must_equal(
+          [2 * 19900, 200]
+        )
+
+        patient.map do |player, pos|
+          player.stack
+        end.must_equal [19900 + 19900, 200]
+      end
+
+      it 'when the winner has more chips' do
+        def match_state
+          "#{MatchState::LABEL}:0:0:19900|20100:r20100c///:2h7d|AhKs"
+        end
+
+        patient.map do |player, pos|
+          player.initial_stack
+        end.must_equal [19900, 20100]
+
+        patient.map do |player, pos|
+          player.total_contribution
+        end.must_equal [19900, 20100]
+
+        patient.map { |player, pos| player.winnings }.must_equal(
+          [0, 19900 + 20100]
+        )
+
+        patient.map { |player, pos| player.stack }.must_equal [0, 40000]
+      end
+    end
     describe 'distributes chips properly' do
       it 'when there is a showdown and one winner' do
         wager_size = 10
@@ -842,8 +913,9 @@ describe MatchState do
             hand_string << "#{hand}#{MatchState::HAND_SEPARATOR}"
           end[0..-2]
 
-          match_state =
+          match_state = (
             "#{MatchState::LABEL}:#{position}:0:crcc/ccc/rrfc/crc:#{hand_string_}"
+          )
 
           MatchState.new(match_state).players(x_game_def).each_with_index do |player, i|
             player.winnings.must_equal x_winnings[i]
@@ -900,9 +972,11 @@ describe MatchState do
           :number_of_hole_cards=>2,
           :number_of_board_cards=>[0, 3, 1, 1]
         )
-        MatchState.parse(
+        patient = MatchState.parse(
           'MATCHSTATE:0:2:cr20000c///:8h8s|5s5c/KdTcKh/9h/Jh'
-        ).players(game_def).map { |pl| pl.winnings }.must_equal [40000, 0]
+        )
+        patient.winning_players(game_def).must_equal [0]
+        patient.players(game_def).map { |pl| pl.winnings }.must_equal [40000, 0]
       end
     end
   end
@@ -966,7 +1040,7 @@ describe MatchState do
       wager_size = 10
       x_game_def = GameDefinition.new(
         first_player_positions: [3, 2, 2, 2],
-        chip_stacks: [100, 200, 150],
+        chip_stacks: [200, 200, 150],
         blinds: [0, 10, 5],
         raise_sizes: [wager_size]*4,
         number_of_ranks: 3
@@ -1068,7 +1142,7 @@ describe MatchState do
       wager_size = 10
       x_game_def = GameDefinition.new(
         first_player_positions: [3, 2, 2, 2],
-        chip_stacks: [100, 200, 150],
+        chip_stacks: [200, 200, 150],
         blinds: [0, 10, 5],
         raise_sizes: [wager_size]*4,
         number_of_ranks: 3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acpc_poker_types
 version: !ruby/object:Gem::Version
-  version: 7.8.4
+  version: 7.8.5
 platform: ruby
 authors:
 - Dustin Morrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: process_runner