acpc_poker_types 6.1.2 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bceefd96ab22bcbccd8ed8f9ddee93eb1808462
-  data.tar.gz: c0811aafbf5f500fffa97e431c51a30240e04a80
+  metadata.gz: fbed7f982f75101fa5ea0655986ed7e2d39ea77e
+  data.tar.gz: bdc7f86c7351298a819751e1cb9cda56ad9746ff
 SHA512:
-  metadata.gz: 4009749b1e934b1c4d8d9248e1fe0f495bb8a52378c1c9d8f04e213cab0c244f0d8b37298e9e612ae24ad7180ff1ae3013406573ef16f25f8111d1ca271091a5
-  data.tar.gz: bb713825016560c9cbd079b2f2290154d741250e4e02bdb47747a48fa53b1532fb8c5050321f28aefdb6e3692ebd740a94f605e04abe005756dbeabd036fc1b2
+  metadata.gz: b8feecf734cd9636bed880b3a8be93bbbb6c8e21c4b77212c127d80f130098287691b326343b7b3ce2e6d3afc5cf0fef6edd4f414e4a9c103e5a4b39caf11600
+  data.tar.gz: aad719143fe546905d0ff49207f2ae4f284c7c83f3a38a50c49a8caf1f71ab54ca4033f4231553f079106a8d3dd73584332c2fcb7ce205af5c5566f804325d5d

data/lib/acpc_poker_types/hand_player.rb

@@ -87,17 +87,13 @@ class HandPlayer
     l_actions
   end
 
-  # @param round [Integer] The round in which the largest wager by size is desired.
-  # defaults to +nil+.
-  # @return [ChipStack] The largest wager by size this player has made.
-  # Checks only in the specified +round+ or over the entire hand if round is +nil+.
-  # def largest_wager_by(round=nil)
-    # @todo
-  # end
-
   def append_action!(action, round_num = round)
     raise Inactive if inactive?
 
+    while @actions.length <= round_num
+      @actions << []
+    end
+
     @actions[round_num] ||= []
     @actions[round_num] << action
 

data/lib/acpc_poker_types/match_state.rb

@@ -51,12 +51,8 @@ class MatchState
   # @return [String] The ACPC string created by the given betting sequence.
   attr_reader :betting_sequence_string
 
-  # @todo Move this @return [Array<Hand>] The list of visible hole card sets for each player.
-
   attr_reader :hands_string
 
-  # @todo Move this @return [BoardCards] All visible community cards on the board.
-
   attr_reader :community_cards_string
 
   # @return [String] Label for match state strings.
@@ -107,6 +103,7 @@ class MatchState
       @hands_string = $4
       @community_cards_string = $5
     end
+    @min_wager_by = nil
   end
 
   # @return [String] The MatchState in raw text form.
@@ -129,6 +126,7 @@ class MatchState
     another_match_state.to_s == to_s
   end
 
+  # @return [Array<Hand>] The list of hole card hands for each player.
   def all_hands
     @all_hands ||= -> do
       lcl_hole_card_hands = all_string_hands(@hands_string).map do |string_hand|
@@ -160,6 +158,7 @@ class MatchState
     end
   end
 
+  # @return [BoardCards] All visible community cards on the board.
   def community_cards
     @community_cards ||= -> do
       lcl_community_cards = BoardCards.new(
@@ -264,20 +263,23 @@ class MatchState
     @players = players_at_hand_start game_def.chip_stacks, game_def.blinds
 
     last_round = -1
-    acting_player_position = nil
+    @next_to_act = nil
     @player_acting_sequence = []
+    @min_wager_by = game_def.min_wagers.first
     every_action_token do |action, round|
       if round != last_round
-        acting_player_position = game_def.first_player_positions[round]
+        @min_wager_by = game_def.min_wagers[round]
+        @next_to_act = @players.position_of_first_active_player(
+          game_def.first_player_positions[round]
+        )
         @player_acting_sequence << []
         last_round = round
       end
 
-      acting_player_position = @players.position_of_first_active_player(
-        acting_player_position
-      )
+      @player_acting_sequence.last << @next_to_act
+      acting_player_position = @player_acting_sequence.last.last
 
-      @player_acting_sequence.last << acting_player_position
+      @next_to_act = @players.next_to_act(@next_to_act)
 
       cost = @players.action_cost(
         acting_player_position,
@@ -285,20 +287,13 @@ class MatchState
         game_def.min_wagers[round]
       )
 
-      @players[acting_player_position].append_action!(
-        if cost > 0
-          action = PokerAction.new(action.to_s, cost: cost)
-        else
-          action
-        end,
-        round
-      )
+      action = PokerAction.new(action.to_s, cost: cost) if cost > 0
 
-      yield action, round, acting_player_position, @players if block_given?
+      adjust_min_wager!(action, acting_player_position)
 
-      acting_player_position = @players.next_player_position(
-        acting_player_position
-      )
+      @players[acting_player_position].append_action!(action, round)
+
+      yield action, round, acting_player_position, @players if block_given?
     end
 
     distribute_chips!(game_def) if hand_ended?(game_def)
@@ -306,6 +301,12 @@ class MatchState
     @players
   end
 
+  def next_to_act(game_def)
+    every_action(game_def) unless @next_to_act
+
+    @next_to_act
+  end
+
   def players(game_def)
     @players ||= every_action(game_def)
   end
@@ -337,6 +338,13 @@ class MatchState
     @pot ||= players(game_def).map { |player| player.contributions }.flatten.inject(:+)
   end
 
+  # @return [ChipStack] Minimum wager by.
+  def min_wager_by(game_def)
+    every_action(game_def) unless @min_wager_by
+
+    @min_wager_by
+  end
+
   private
 
   # Distribute chips to all winning players
@@ -388,5 +396,19 @@ class MatchState
   def actions_from_acpc_characters(action_sequence)
     action_sequence.scan(/[^#{BETTING_SEQUENCE_SEPARATOR}\d]\d*/)
   end
+
+  def adjust_min_wager!(action, acting_player_position)
+    return self unless PokerAction::MODIFIABLE_ACTIONS.include?(action.action)
+
+    wager_size = ChipStack.new(
+      action.cost.to_f - @players.amount_to_call(acting_player_position)
+    )
+
+    return self unless wager_size > @min_wager_by
+
+    @min_wager_by = wager_size
+
+    self
+  end
 end
 end

data/lib/acpc_poker_types/player_group.rb

@@ -58,5 +58,11 @@ class PlayerGroup < DelegateClass(Array)
       ].min
     )
   end
+
+  def next_to_act(acting_player_position=-1)
+    position_of_first_active_player(
+      next_player_position(acting_player_position)
+    )
+  end
 end
 end

data/lib/acpc_poker_types/seat.rb

@@ -1,42 +1,46 @@
 require 'delegate'
 
 module AcpcPokerTypes
-  class Seat < DelegateClass(Integer)
-    attr_reader :seat, :table_size
 
-    # @return [Bool] Reports whether or not +seat+ represents an out of
-    #   bounds seat for the number of seats, +num_seats+.
-    def self.in_bounds?(seat, num_seats)
-      seat < num_seats && seat >= 0
-    end
+class Seat < DelegateClass(Integer)
+  attr_reader :seat, :table_size
 
-    def initialize(seat, num_seats_at_table)
-      @seat = seat.to_i
-      @table_size = num_seats_at_table.to_i
+  # @return [Bool] Reports whether or not +seat+ represents an out of
+  #   bounds seat for the number of seats, +num_seats+.
+  def self.in_bounds?(seat, num_seats)
+    seat < num_seats && seat >= 0
+  end
 
-      unless in_bounds?
-        raise "Seat #{@seat} out of bounds for #{num_seats_at_table} players"
-      end
+  def initialize(seat, num_seats_at_table)
+    @seat = (seat_number(seat) % num_seats_at_table).to_i
+    @table_size = num_seats_at_table
 
-      super @seat
-    end
-    def seats_to(other_seat_number)
-      other_seat = self.class.new(other_seat_number, @table_size)
-
-      if @seat > other_seat
-        other_seat + @table_size
-      else
-        other_seat
-      end - @seat
-    end
-    def seats_from(other_seat_number)
-      Seat.new(other_seat_number, @table_size).seats_to(@seat)
-    end
-    def n_seats_away(n)
-      Seat.new((n + @seat) % @table_size, @table_size)
-    end
-    def in_bounds?
-      self.class.in_bounds?(@seat, @table_size)
+    super @seat
+  end
+  def seats_to(other_player)
+    other_seat = self.class.new(other_player, @table_size)
+
+    if @seat > other_seat
+      other_seat + @table_size
+    else
+      other_seat
+    end - @seat
+  end
+  def seats_from(other_player)
+    self.class.new(other_player, @table_size).seats_to(@seat)
+  end
+  def n_seats_away(n)
+    Seat.new((n + @seat) % @table_size, @table_size)
+  end
+
+  private
+
+  def seat_number(player_or_seat)
+    if player_or_seat.respond_to?(:seat)
+      player_or_seat.seat
+    else
+      player_or_seat
     end
   end
+end
 end

data/lib/acpc_poker_types/version.rb

@@ -1,3 +1,3 @@
 module AcpcPokerTypes
-  VERSION = '6.1.2'
+  VERSION = '6.2.0'
 end

data/spec/match_state_spec.rb

@@ -9,6 +9,7 @@ require_relative "../lib/acpc_poker_types/suit"
 require_relative "../lib/acpc_poker_types/hand"
 require_relative "../lib/acpc_poker_types/card"
 require_relative "../lib/acpc_poker_types/game_definition"
+require_relative "../lib/acpc_poker_types/acpc_dealer_data/poker_match_data"
 
 module MapWithIndex
   refine Array do
@@ -269,7 +270,7 @@ describe MatchState do
         end[0..-2]
 
         match_state =
-"#{MatchState::LABEL}:#{position}:0:crcc/ccc/rrfc:#{hand_string}"
+          "#{MatchState::LABEL}:#{position}:0:crcc/ccc/rrfc:#{hand_string}"
 
         MatchState.new(
           match_state
@@ -377,7 +378,7 @@ describe MatchState do
         end[0..-2]
 
         match_state =
-"#{MatchState::LABEL}:#{position}:0:crcc/ccc/rrfc/crc:#{hand_string}"
+          "#{MatchState::LABEL}:#{position}:0:crcc/ccc/rrfc/crc:#{hand_string}"
 
         MatchState.new(match_state).every_action(x_game_def) do |action, round, acting_player_position|
           x_yields = x_actions.shift
@@ -390,7 +391,7 @@ describe MatchState do
     end
   end
   describe '#players' do
-    it 'return proper player states' do
+    it 'returns proper player states' do
       wager_size = 10
       x_game_def = GameDefinition.new(
         first_player_positions: [3, 2, 2],
@@ -574,37 +575,37 @@ describe MatchState do
         end
       end
     end
-    describe '#pot' do
-      it 'works without side pots' do
-        wager_size = 10
-        x_game_def = GameDefinition.new(
-          first_player_positions: [3, 2, 2, 2],
-          chip_stacks: [100, 200, 150],
-          blinds: [0, 10, 5],
-          raise_sizes: [wager_size]*4,
-          number_of_ranks: 3
-        )
-        x_total_contributions = [2 * 10, 5 * 10, 5 * 10]
+  end
+  describe '#pot' do
+    it 'works without side pots' do
+      wager_size = 10
+      x_game_def = GameDefinition.new(
+        first_player_positions: [3, 2, 2, 2],
+        chip_stacks: [100, 200, 150],
+        blinds: [0, 10, 5],
+        raise_sizes: [wager_size]*4,
+        number_of_ranks: 3
+      )
+      x_total_contributions = [2 * 10, 5 * 10, 5 * 10]
 
-        (0..x_game_def.number_of_players-1).each do |position|
-          hands = x_game_def.number_of_players.times.map do |i|
-            Hand.from_acpc "Ac2#{['s', 'h', 'd', 'c'][i%4]}"
-          end
+      (0..x_game_def.number_of_players-1).each do |position|
+        hands = x_game_def.number_of_players.times.map do |i|
+          Hand.from_acpc "Ac2#{['s', 'h', 'd', 'c'][i%4]}"
+        end
 
-          hand_string = hands.inject('') do |hand_string, hand|
-            hand_string << "#{hand}#{MatchState::HAND_SEPARATOR}"
-          end[0..-2]
+        hand_string = hands.inject('') do |hand_string, hand|
+          hand_string << "#{hand}#{MatchState::HAND_SEPARATOR}"
+        end[0..-2]
 
-          match_state =
-            "#{MatchState::LABEL}:#{position}:0:crcc/ccc/rrfc/crc:#{hand_string}"
+        match_state =
+          "#{MatchState::LABEL}:#{position}:0:crcc/ccc/rrfc/crc:#{hand_string}"
 
-          MatchState.new(match_state).pot(x_game_def).must_equal x_total_contributions.inject(:+)
-        end
+        MatchState.new(match_state).pot(x_game_def).must_equal x_total_contributions.inject(:+)
       end
     end
   end
-  describe '#every_action' do
-    it 'yields every action, plus the round number, and the acting player position relative to the dealer' do
+  describe '#player_acting_sequence' do
+    it 'works' do
       wager_size = 10
       x_game_def = GameDefinition.new(
         first_player_positions: [3, 2, 2, 2],
@@ -704,7 +705,7 @@ describe MatchState do
       end
     end
   end
-  describe 'hand_ended?' do
+  describe '#hand_ended?' do
     it 'works when there is a showdown' do
       wager_size = 10
       x_game_def = GameDefinition.new(
@@ -781,6 +782,40 @@ describe MatchState do
       end
     end
   end
+  describe '#min_wager_by' do
+    it 'return proper player states' do
+      wager_size = 10
+      x_game_def = GameDefinition.new(
+        first_player_positions: [0, 0, 0],
+        chip_stacks: [100, 200, 150],
+        blinds: [0, 10, 5],
+        raise_sizes: [wager_size]*3,
+        number_of_ranks: 3
+      )
+
+      x_min_wagers = [[wager_size], [wager_size, 20, 70, 70, 70], [wager_size, wager_size, wager_size], [wager_size, wager_size, 20, 30, 30]]
+
+      (0..x_game_def.number_of_players-1).each do |position|
+        actions = ''
+        [[''], ['c', 'r30', 'r100', 'c', 'c'], ['c', 'c', 'c'], ['c', 'r110', 'r130', 'r160', 'c']].each_with_index do |actions_per_round, i|
+          actions_per_round.each_with_index do |action, j|
+            actions << action
+
+            hands = x_game_def.number_of_players.times.map { |i| "Ac#{i+2}h" }
+
+            hand_string = hands.inject('') do |string, hand|
+              string << "#{hand}#{MatchState::HAND_SEPARATOR}"
+            end[0..-2]
+
+            match_state = "#{MatchState::LABEL}:#{position}:0:#{actions}:#{hand_string}"
+
+            MatchState.new(match_state).min_wager_by(x_game_def).must_equal x_min_wagers[i][j]
+          end
+          actions << '/' unless actions_per_round.first.empty?
+        end
+      end
+    end
+  end
 end
 
 def for_every_card
@@ -797,9 +832,6 @@ def for_every_hand
     end
   end
 end
-def test_match_state_initialization_error(incomplete_match_state)
-  ->{MatchState.parse incomplete_match_state}.must_raise(MatchState::IncompleteMatchState)
-end
 def test_match_state_success(match_state)
   patient = MatchState.parse match_state
   patient.to_s.must_equal match_state
@@ -828,14 +860,6 @@ def arbitrary_roll_out(rounds)
   community_cards
 end
 
-# Construct an arbitrary hole card hand.
-#
-# @return [Hand] An arbitrary hole card hand.
 def arbitrary_hole_card_hand
-  Hand.from_acpc(
-    Rank::DOMAIN[:two][:acpc_character] +
-    Suit::DOMAIN[:spades][:acpc_character] +
-    Rank::DOMAIN[:three][:acpc_character] +
-    Suit::DOMAIN[:hearts][:acpc_character]
-  )
+  Hand.from_acpc('2s3h')
 end

data/spec/seat_spec.rb

@@ -0,0 +1,59 @@
+require_relative 'support/spec_helper'
+
+require 'acpc_poker_types/seat'
+
+include AcpcPokerTypes
+
+describe Seat do
+  it 'acts like an integer' do
+    x_int = 2
+    patient = Seat.new x_int, 4
+
+    patient.must_equal x_int
+    (patient + x_int).must_equal x_int * 2
+  end
+  it 'accepts players as well as seats' do
+    Struct.new 'Player', :seat
+
+    x_player = Struct::Player.new(1)
+    Seat.new(x_player, 4).must_equal x_player.seat
+  end
+  it 'accepts seats that are larger than the table size by wrapping' do
+    x_seat = 2
+
+    Seat.new(5, 3).must_equal x_seat
+  end
+  describe '#seats_to' do
+    it 'works for seats on the left' do
+      Seat.new(2, 5).seats_to(4).must_equal 2
+    end
+    it 'works for seats on the right' do
+      Seat.new(2, 5).seats_to(0).must_equal 3
+    end
+    it 'works for its own seat' do
+      Seat.new(1, 2).seats_to(1).must_equal 0
+    end
+  end
+  describe '#seats_from' do
+    it 'works for seats on the left' do
+      Seat.new(2, 5).seats_from(4).must_equal 3
+    end
+    it 'works for seats on the right' do
+      Seat.new(2, 5).seats_from(0).must_equal 2
+    end
+    it 'works for its own seat' do
+      Seat.new(1, 2).seats_from(1).must_equal 0
+    end
+  end
+  describe '#n_seats_away' do
+    it 'works for positive n' do
+      Seat.new(2, 5).n_seats_away(2).must_equal 4
+    end
+    it 'works for negative n' do
+      Seat.new(2, 5).n_seats_away(-2).must_equal 0
+    end
+    it 'works for n larger than the size of the table' do
+      Seat.new(1, 5).n_seats_away(8).must_equal 4
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acpc_poker_types
 version: !ruby/object:Gem::Version
-  version: 6.1.2
+  version: 6.2.0
 platform: ruby
 authors:
 - Dustin Morrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: process_runner
@@ -206,6 +206,7 @@ files:
 - spec/suit_spec.rb
 - spec/hand_results_spec.rb
 - spec/hand_spec.rb
+- spec/seat_spec.rb
 - spec/poker_match_data_spec.rb
 - spec/coverage/index.html
 - spec/coverage/assets/0.7.1/application.js
@@ -298,6 +299,7 @@ test_files:
 - spec/suit_spec.rb
 - spec/hand_results_spec.rb
 - spec/hand_spec.rb
+- spec/seat_spec.rb
 - spec/poker_match_data_spec.rb
 - spec/coverage/index.html
 - spec/coverage/assets/0.7.1/application.js