acpc_poker_types 7.0.0 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78f0bab62893fa563b2b696c90844c647533403e
-  data.tar.gz: 3462780103b206dd0c9b1952bb06d5e43760c24b
+  metadata.gz: 7ca00e6a41dab80ef2f33c8f10c3ffaff6e2c0e1
+  data.tar.gz: c09333d7db8f948d5e328357a59536e70e44a68b
 SHA512:
-  metadata.gz: 4418652bec1d5c84b867e72fabd230132fa50d14b64f6a4f4bf3ed68149f68f947aad717fd533b33e2ed61e49d3a0c5cd03d59e070e15bd832ac4a08e36a186f
-  data.tar.gz: ab329609151c04988b321aeb400b2c14a8b09b64722e172ce1438e683ddc2055769614cf857e8d5114e4782117fcdaf3c1b795735b64b896cb0155f2549f8a5d
+  metadata.gz: cc1c019653c1e5671db05f44a355feb8a465052c83d2b8bd5b1930a5ece33d42b25128840de95ad717383136fd36a2a035e83670d5d3edd2e3661d729ae037ee
+  data.tar.gz: 412ac972e9c336b2dd5e6ff3b674372c799ea9f046ded2bb6f455bae1a173cf0f9a6d536feb4cbe7cd1205f311e28b14a1c062bc26785aa75c0cf51aa8961bc3

data/lib/acpc_poker_types/hand_player_group.rb

@@ -64,5 +64,23 @@ class HandPlayerGroup < DelegateClass(Array)
       next_player_position(acting_player_position)
     )
   end
+
+  # @return [Integer] The number of wagers this round
+  def num_wagers(round)
+    inject(0) do |sum, pl|
+      sum += pl.actions[round].count do |ac|
+        PokerAction::MODIFIABLE_ACTIONS.include?(ac.action)
+      end
+    end
+  end
+
+  # @return [Array<PokerAction>] The legal actions for the next player to act.
+  def legal_actions(acting_player_position, round, max_num_wagers)
+    @players[acting_player_position].legal_actions(
+      round: round,
+      amount_to_call: amount_to_call(acting_player_position),
+      wager_illegal: num_wagers(round) >= max_num_wagers
+    )
+  end
 end
 end

data/lib/acpc_poker_types/match_state.rb

@@ -1,3 +1,5 @@
+require 'delegate'
+
 require 'acpc_poker_types/board_cards'
 require 'acpc_poker_types/hand'
 require 'acpc_poker_types/rank'
@@ -35,7 +37,7 @@ using AcpcPokerTypes::Indices
 module AcpcPokerTypes
 
 # Model to parse and manage information from a given match state string.
-class MatchState
+class MatchState < DelegateClass(String)
   # @return [Integer] The position relative to the dealer of the player that
   #     received the match state string, indexed from 0, modulo the
   #     number of players.
@@ -104,6 +106,8 @@ class MatchState
       @community_cards_string = $5
     end
     @min_wager_by = nil
+
+    super to_s
   end
 
   # @return [String] The MatchState in raw text form.
@@ -319,6 +323,15 @@ class MatchState
     @min_wager_by
   end
 
+  # @return [Array<PokerAction>] The legal actions for the next player to act.
+  def legal_actions(game_def)
+    players(game_def).legal_actions(
+      next_to_act(game_def),
+      round,
+      game_def.max_number_of_wagers[round]
+    )
+  end
+
   private
 
   def walk_over_betting_sequence!(game_def)

data/lib/acpc_poker_types/poker_action.rb

@@ -1,3 +1,4 @@
+require 'delegate'
 require 'set'
 
 require 'acpc_poker_types/chip_stack'
@@ -30,115 +31,119 @@ module BlankRefinement
 end
 using BlankRefinement
 
+
 module AcpcPokerTypes
-  class PokerAction
-    exceptions :illegal_action, :illegal_modification
 
-    BET = 'b'
-    CALL = 'c'
-    CHECK = 'k'
-    FOLD = 'f'
-    RAISE = 'r'
+class PokerAction < DelegateClass(String)
+  exceptions :illegal_action, :illegal_modification
 
-    ACTIONS = Set.new [BET, CALL, CHECK, FOLD, RAISE]
+  BET = 'b'
+  CALL = 'c'
+  CHECK = 'k'
+  FOLD = 'f'
+  RAISE = 'r'
 
-    # @return [Set<String>] The set of legal ACPC action characters.
-    CANONICAL_ACTIONS = Set.new [CALL, FOLD, RAISE]
+  ACTIONS = Set.new [BET, CALL, CHECK, FOLD, RAISE]
 
-    MODIFIABLE_ACTIONS = Set.new [BET, RAISE]
+  # @return [Set<String>] The set of legal ACPC action characters.
+  CANONICAL_ACTIONS = Set.new [CALL, FOLD, RAISE]
 
-    CONCATONATED_ACTIONS = ACTIONS.to_a.join
+  MODIFIABLE_ACTIONS = Set.new [BET, RAISE]
 
-    # @return [Rational] The amount that the player taking this action needs to put in the pot.
-    #  Could be negative to imply the acting player takes chips from the pot.
-    attr_reader :cost
+  CONCATONATED_ACTIONS = ACTIONS.to_a.join
 
-    # @return [String] A modifier for the action (i.e. a bet or raise size).
-    attr_reader :modifier
+  # @return [Rational] The amount that the player taking this action needs to put in the pot.
+  #  Could be negative to imply the acting player takes chips from the pot.
+  attr_reader :cost
 
-    # @return [String] Action character
-    attr_reader :action
-    alias_method :to_acpc_character, :action
+  # @return [String] A modifier for the action (i.e. a bet or raise size).
+  attr_reader :modifier
 
-    # @return [Boolean] Whether or not the pot has been added to this round before this action.
-    attr_reader :pot_gained_chips
+  # @return [String] Action character
+  attr_reader :action
+  alias_method :to_acpc_character, :action
 
-    # @param [Symbol, String] action A representation of this action.
-    # @param modifier [String] A modifier to attach to this action such as a wager size.
-    # @param cost [#to_f] The amount this action costs to the acting player.
-    # @raise IllegalAction
-    def initialize(action, modifier: nil, cost: 0)
-      validate_action!(action, modifier.strip)
-      @cost = cost.to_f
-    end
+  # @return [Boolean] Whether or not the pot has been added to this round before this action.
+  attr_reader :pot_gained_chips
 
-    def ==(other_action)
-      0 == (self <=> other_action)
-    end
+  # @param [Symbol, String] action A representation of this action.
+  # @param modifier [String] A modifier to attach to this action such as a wager size.
+  # @param cost [#to_f] The amount this action costs to the acting player.
+  # @raise IllegalAction
+  def initialize(action, modifier: nil, cost: 0)
+    validate_action!(action, modifier.strip)
+    @cost = cost.to_f
 
-    def <=>(other_action)
-      to_s <=> other_action.to_s
-    end
+    super to_s
+  end
 
-    # @return [String] String representation of this action.
-    # @param pot_gained_chips [Boolean] Whether or not the pot had gained chips before this action. Defaults to true.
-    # @param player_sees_wager [Boolean] Whether or not the player is reacting to a wager.
-    #   Defaults to the value of +pot_gained_chips+.
-    def to_s(pot_gained_chips: true, player_sees_wager: pot_gained_chips)
-      combine_action_and_modifier(
-        if @action == FOLD
-          @action
-        elsif @action == BET || @action == RAISE
-          if pot_gained_chips then RAISE else BET end
-        elsif @action == CALL || @action == CHECK
-          if player_sees_wager then CALL else CHECK end
-        end
-      )
-    end
+  # def ==(other_action)
+  #   0 == (self <=> other_action)
+  # end
+
+  # def <=>(other_action)
+  #   to_s <=> other_action.to_s
+  # end
+
+  # @return [String] String representation of this action.
+  # @param pot_gained_chips [Boolean] Whether or not the pot had gained chips before this action. Defaults to true.
+  # @param player_sees_wager [Boolean] Whether or not the player is reacting to a wager.
+  #   Defaults to the value of +pot_gained_chips+.
+  def to_s(pot_gained_chips: true, player_sees_wager: pot_gained_chips)
+    combine_action_and_modifier(
+      if @action == FOLD
+        @action
+      elsif @action == BET || @action == RAISE
+        if pot_gained_chips then RAISE else BET end
+      elsif @action == CALL || @action == CHECK
+        if player_sees_wager then CALL else CHECK end
+      end
+    )
+  end
 
-    alias_method :to_acpc, :to_s
-    alias_method :to_str, :to_s
+  alias_method :to_acpc, :to_s
+  alias_method :to_str, :to_s
 
-    # @return [Boolean] +true+ if this action has a modifier, +false+ otherwise.
-    def has_modifier?
-      !@modifier.blank?
-    end
+  # @return [Boolean] +true+ if this action has a modifier, +false+ otherwise.
+  def has_modifier?
+    !@modifier.blank?
+  end
 
-    private
+  private
 
-    def combine_action_and_modifier(action=@action, modifier=@modifier)
-      "#{action}#{modifier}"
-    end
+  def combine_action_and_modifier(action=@action, modifier=@modifier)
+    "#{action}#{modifier}"
+  end
 
-    def validate_action!(action, given_modifier)
-      action_string = action.to_s
-      raise IllegalAction if action_string.empty?
-      @action = action_string[0]
-      raise IllegalAction unless ACTIONS.include?(@action)
-      @modifier = action_string[1..-1].strip unless action_string.length < 2
-
-      if !given_modifier.blank? && !@modifier.blank?
-        raise(
-          IllegalModification,
-          "in-place modifier: #{@modifier}, explicit modifier: #{given_modifier}"
-        )
-      end
+  def validate_action!(action, given_modifier)
+    action_string = action.to_s
+    raise IllegalAction if action_string.empty?
+    @action = action_string[0]
+    raise IllegalAction unless ACTIONS.include?(@action)
+    @modifier = action_string[1..-1].strip unless action_string.length < 2
+
+    if !given_modifier.blank? && !@modifier.blank?
+      raise(
+        IllegalModification,
+        "in-place modifier: #{@modifier}, explicit modifier: #{given_modifier}"
+      )
+    end
 
-      @modifier = if !@modifier.blank?
-        @modifier
-      elsif !given_modifier.blank?
-        given_modifier
-      end
+    @modifier = if !@modifier.blank?
+      @modifier
+    elsif !given_modifier.blank?
+      given_modifier
+    end
 
-      validate_modifier
+    validate_modifier
 
-      self
-    end
+    self
+  end
 
-    def validate_modifier
-      unless @modifier.blank? || MODIFIABLE_ACTIONS.include?(@action)
-        raise(IllegalModification, "Illegal modifier: #{@modifier}")
-      end
+  def validate_modifier
+    unless @modifier.blank? || MODIFIABLE_ACTIONS.include?(@action)
+      raise(IllegalModification, "Illegal modifier: #{@modifier}")
     end
   end
+end
 end

data/lib/acpc_poker_types/version.rb

@@ -1,3 +1,3 @@
 module AcpcPokerTypes
-  VERSION = '7.0.0'
+  VERSION = '7.1.0'
 end

data/spec/match_state_spec.rb

@@ -222,7 +222,7 @@ describe MatchState do
           log_description.results_file_path,
           log_description.player_names,
           AcpcDealer::DEALER_DIRECTORY,
-          20
+          10
         )
         match.for_every_seat! do |seat|
           match.for_every_hand! do
@@ -878,6 +878,17 @@ describe MatchState do
       end
     end
   end
+  describe 'players legal actions' do
+    it 'should work properly when facing a wager' do
+      game_definition = GameDefinition.parse_file(AcpcDealer::GAME_DEFINITION_FILE_PATHS[2][:limit])
+      MatchState.parse("MATCHSTATE:0:3:crc/rrrr:Qh9s|/KdQc7c").legal_actions(
+        game_definition
+      ).must_equal [
+        PokerAction.new(PokerAction::CALL, cost: game_definition.min_wagers[2]),
+        PokerAction.new(PokerAction::FOLD)
+      ]
+    end
+  end
 end
 
 def for_every_card

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acpc_poker_types
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.0
 platform: ruby
 authors:
 - Dustin Morrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: process_runner