acpc_poker_types 7.1.5 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f33148cb5695cca1690278ba5acc735404dc15f
-  data.tar.gz: 7007a378e311daa494788d1c5d2355b965ec00b9
+  metadata.gz: 6f24714536d94582ffb4a4928f906807a9f25d78
+  data.tar.gz: 2982a1f06ee0b343448a8983d0c1a9bf6c083ad6
 SHA512:
-  metadata.gz: 39b67ec1ac2532478e08cf4c26c8e51e990302b22b6c2826d428b4776ff0d6237b25463b11972044c566c108f449994cc0c447d6b4889809d7ca46ce0228c144
-  data.tar.gz: 2c2ccfc8eaba441ef3bc615005dd3f5c2d30cd69680eda6f0b071582706b6bec9be3aa572b5015e3951b2cdc2d1dd37a5f77327a1a715fb3d07511a30ca42be3
+  metadata.gz: 70a557cd1d3932d9dee54c9184dce445b701e3ac46633f7f9d48cd3d1424c4ee8c8acf8ee5dffa3a6b37ea54e1859ed90de534b18884df33571bfa28bc0b7ee5
+  data.tar.gz: dd2ca29159f8330e67a9bbbed5a4bc4ad1a0ac731116b1bca7793b885db1e638d16ae8b1f7ff92c7483d04f894f6cbc2aa8e1ba6992901c5d9607849f6045416

data/lib/acpc_poker_types/game_definition.rb

@@ -74,10 +74,13 @@ module AcpcPokerTypes
       :@number_of_ranks => AcpcPokerTypes::Rank::DOMAIN.length
     }
 
+    LIMIT = 'limit'
+    NO_LIMIT = 'nolimit'
+
     # @return [Hash] Betting types understood by this class.
     BETTING_TYPES = {
-      :limit => 'limit',
-      :nolimit => 'nolimit'
+      :limit => LIMIT,
+      :nolimit => NO_LIMIT
     }
 
     DEFINITIONS = {
@@ -198,7 +201,7 @@ module AcpcPokerTypes
     def to_a
       @array ||= -> do
         list_of_lines = []
-        list_of_lines << BETTING_TYPES[@betting_type] if @betting_type
+        list_of_lines << @betting_type if @betting_type
         list_of_lines << "stack = #{@chip_stacks.join(' ')}" unless @chip_stacks.empty?
         list_of_lines << "numPlayers = #{@number_of_players}" if @number_of_players
         list_of_lines << "blind = #{@blinds.join(' ')}" unless @blinds.empty?
@@ -272,7 +275,7 @@ module AcpcPokerTypes
             type = type_and_name.first
             name = type_and_name[1]
             if line.match(/\b#{name}\b/i)
-              @betting_type = type
+              @betting_type = name
               true
             else
               false

data/lib/acpc_poker_types/hand_player.rb

@@ -1,6 +1,7 @@
 require 'acpc_poker_types/chip_stack'
 require 'acpc_poker_types/hand'
 require 'acpc_poker_types/poker_action'
+require 'acpc_poker_types/game_definition'
 
 require 'contextual_exceptions'
 using ContextualExceptions::ClassRefinement
@@ -69,11 +70,13 @@ class HandPlayer
   # @param amount_to_call [#to_r] The amount to call for this player
   # @param wager_illegal [Boolean]
   # @return [Array<PokerAction>] The list of legal actions for this player. If a wager is legal,
-  # the largest possible wager will be returned in the list.
+  # the smallest and largest possible wagers will be returned in the list.
   def legal_actions(
     in_round: round,
     amount_to_call: ChipStack.new(0),
-    wager_illegal: false
+    wager_illegal: false,
+    betting_type: GameDefinition::BETTING_TYPES[:limit],
+    min_wager_by: ChipStack.new(1)
   )
     l_actions = []
     return l_actions if inactive?
@@ -85,16 +88,25 @@ class HandPlayer
       l_actions << PokerAction.new(PokerAction::CHECK)
     end
     if !wager_illegal && stack > amount_to_call.to_r
-      l_actions << if (
-        (contributions.length > in_round) &&
+      max_wager_by = stack - amount_to_call.to_r
+      min_wager_by_adjusted = [min_wager_by + amount_to_call.to_r, max_wager_by].min
+
+      if (
+        amount_to_call.to_r > 0 ||
         (
-          contributions[in_round] > 0 ||
-          amount_to_call.to_r > 0
+          contributions.length > in_round &&
+          contributions[in_round] > 0
         )
       )
-        PokerAction.new(PokerAction::RAISE, cost: stack - amount_to_call.to_r)
+        l_actions << PokerAction.new(PokerAction::RAISE, cost: min_wager_by_adjusted)
+        unless betting_type == GameDefinition::BETTING_TYPES[:limit] || min_wager_by_adjusted == max_wager_by
+          l_actions << PokerAction.new(PokerAction::RAISE, cost: max_wager_by)
+        end
       else
-        PokerAction.new(PokerAction::BET, cost: stack - amount_to_call.to_r)
+        l_actions << PokerAction.new(PokerAction::BET, cost: min_wager_by_adjusted)
+        unless betting_type == GameDefinition::BETTING_TYPES[:limit] || min_wager_by_adjusted == max_wager_by
+          l_actions << PokerAction.new(PokerAction::BET, cost: max_wager_by)
+        end
       end
     end
 

data/lib/acpc_poker_types/hand_player_group.rb

@@ -77,11 +77,13 @@ class HandPlayerGroup < DelegateClass(Array)
   end
 
   # @return [Array<PokerAction>] The legal actions for the next player to act.
-  def legal_actions(acting_player_position, round, max_num_wagers)
+  def legal_actions(acting_player_position, round, game_def, min_wager_by)
     @players[acting_player_position].legal_actions(
       in_round: round,
       amount_to_call: amount_to_call(acting_player_position),
-      wager_illegal: num_wagers(round) >= max_num_wagers
+      wager_illegal: num_wagers(round) >= game_def.max_number_of_wagers[round],
+      betting_type: game_def.betting_type,
+      min_wager_by: min_wager_by
     )
   end
 end

data/lib/acpc_poker_types/match_state.rb

@@ -328,7 +328,8 @@ class MatchState < DelegateClass(String)
     players(game_def).legal_actions(
       next_to_act(game_def),
       round,
-      game_def.max_number_of_wagers[round]
+      game_def,
+      min_wager_by(game_def)
     )
   end
 

data/lib/acpc_poker_types/version.rb

@@ -1,3 +1,3 @@
 module AcpcPokerTypes
-  VERSION = '7.1.5'
+  VERSION = '7.2.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,
-          10
+          5
         )
         match.for_every_seat! do |seat|
           match.for_every_hand! do
@@ -883,31 +883,68 @@ describe MatchState do
   describe '#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(
+
+      patient = MatchState.parse("MATCHSTATE:0:3:crc/rrrr:Qh9s|/KdQc7c").legal_actions(
         game_definition
-      ).must_equal [
+      )
+
+      x_actions = [
         PokerAction.new(PokerAction::CALL, cost: game_definition.min_wagers[1]),
         PokerAction.new(PokerAction::FOLD)
       ]
+
+      patient.must_equal x_actions
+
+      patient.map { |action| action.cost }.must_equal x_actions.map { |action| action.cost }
     end
     it 'should work properly when a new round begins' do
       game_definition = GameDefinition.parse_file(AcpcDealer::GAME_DEFINITION_FILE_PATHS[2][:limit])
-      MatchState.parse("MATCHSTATE:0:1:rrc/:Qh3c|/Js4c9d").legal_actions(
+
+      patient = MatchState.parse("MATCHSTATE:0:1:rrc/:Qh3c|/Js4c9d").legal_actions(
         game_definition
-      ).must_equal [
+      )
+
+      x_actions = [
         PokerAction.new(PokerAction::CHECK, cost: 0),
         PokerAction.new(PokerAction::BET, cost: game_definition.min_wagers[1])
       ]
+
+      patient.must_equal x_actions
+
+      patient.map { |action| action.cost }.must_equal x_actions.map { |action| action.cost }
     end
     it 'should work properly when a new round begins and the other players check' do
       game_definition = GameDefinition.parse_file(AcpcDealer::GAME_DEFINITION_FILE_PATHS[2][:limit])
 
-      MatchState.parse("MATCHSTATE:1:0:cc/rrrrc/rrc/c:|2hQc/QhQsJs/2s/Kh").legal_actions(
+      patient = MatchState.parse("MATCHSTATE:1:0:cc/rrrrc/rrc/c:|2hQc/QhQsJs/2s/Kh").legal_actions(
         game_definition
-      ).must_equal [
+      )
+
+      x_actions = [
         PokerAction.new(PokerAction::CHECK, cost: 0),
         PokerAction.new(PokerAction::BET, cost: game_definition.min_wagers[3])
       ]
+
+      patient.must_equal x_actions
+
+      patient.map { |action| action.cost }.must_equal x_actions.map { |action| action.cost }
+    end
+    it 'should work properly after an opponent has bet in a new round' do
+      game_definition = GameDefinition.parse_file(AcpcDealer::GAME_DEFINITION_FILE_PATHS[2][:limit])
+
+      patient = MatchState.parse("MATCHSTATE:1:0:cc/crrrc/r:|2hQc/QhQsJs/2s").legal_actions(
+        game_definition
+      )
+
+      x_actions = [
+        PokerAction.new(PokerAction::CALL, cost: game_definition.min_wagers[2]),
+        PokerAction.new(PokerAction::FOLD, cost: 0),
+        PokerAction.new(PokerAction::RAISE, cost: 2 * game_definition.min_wagers[2])
+      ]
+
+      patient.must_equal x_actions
+
+      patient.map { |action| action.cost }.must_equal x_actions.map { |action| action.cost }
     end
   end
 end

data/spec/players_at_the_table_spec.rb

@@ -17,7 +17,7 @@ describe PlayersAtTheTable do
       # Careful though, even 10 hands takes about three seconds,
       # and it scales slightly less than linearly. 120 takes
       # about 30 seconds.
-      num_hands = 10
+      num_hands = 5
       MatchLog.all.each do |log_description|
         @match = DealerData::PokerMatchData.parse_files(
           log_description.actions_file_path,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acpc_poker_types
 version: !ruby/object:Gem::Version
-  version: 7.1.5
+  version: 7.2.0
 platform: ruby
 authors:
 - Dustin Morrill