acpc_poker_types 7.2.1 → 7.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e7db77dcac1bb6a8abf691890b233c4989f3a3e
-  data.tar.gz: 7c5962907fc4347379e80c716207efb468db404c
+  metadata.gz: d88ee4899d3a352a88bc92a6add13b04bcff7c4e
+  data.tar.gz: 03d3de874c31a5c45e6d53bcd025d889d061ace9
 SHA512:
-  metadata.gz: cbf955f892695ed3ef36e87b61cb374e01869429decd6b0c78611269f21c5a6a12e668ef91542460a185668edea981ad81da7b8c86bf77add96f77322ebba389
-  data.tar.gz: d284cf1b711a6ea1d4100a9903cf949a6f62a85b9121d701b0d43935dbe3a187b336636ff060fd10b44d60bfcaa02999037d98e10d1fe8802a7faa59636933a4
+  metadata.gz: 309d18632e6b28b1d850dac0e88809c98bc8c1c1d004a97bd091026c1ec4830759ff7b72b545a425e9b8478273cbb86cfd258852c885ee910b6a19bc057ca6b8
+  data.tar.gz: 7a33b1e92659f5b660670c267f6ad5250d752af4da132a5c2231bef6938aa2eb6c010cb4aac06bfa25346c2e58be0ab31b1823dfb325d4949b87c848e0805712

data/lib/acpc_poker_types/game_definition.rb

@@ -97,6 +97,14 @@ module AcpcPokerTypes
       :@number_of_board_cards => 'numBoardCards'
     }
 
+    ALL_PLAYER_ALL_ROUND_DEFS = [
+      DEFINITIONS[:@number_of_players],
+      DEFINITIONS[:@number_of_rounds],
+      DEFINITIONS[:@number_of_suits],
+      DEFINITIONS[:@number_of_ranks],
+      DEFINITIONS[:@number_of_hole_cards]
+    ]
+
     def self.default_first_player_positions(number_of_rounds)
       number_of_rounds.to_i.times.inject([]) do |list, i|
         list << 0
@@ -118,12 +126,6 @@ module AcpcPokerTypes
       end
     end
 
-    # @param [Array] array The array to flatten into a single element.
-    # @return +array+ if +array+ has more than one element, the single element in +array+ otherwise.
-    def self.flatten_if_single_element_array(array)
-      if 1 == array.length then array[0] else array end
-    end
-
     # Checks if the given line is a comment beginning with '#' or ';', or empty.
     #
     # @param [String] line
@@ -132,7 +134,7 @@ module AcpcPokerTypes
       line.nil? || line.match(/^\s*[#;]/) || line.empty?
     end
 
-    # Checks a given line from a game definition file for a game
+    # Checks a given line frcom a game definition file for a game
     # definition name and returns the given default value unless there is a match.
     #
     # @param [String, #match] line A line from a game definition file.
@@ -142,11 +144,12 @@ module AcpcPokerTypes
     #     referred to by +definition_name+, +nil+ otherwise.
     def self.check_game_def_line_for_definition(line, definition_name)
       if line.match(/^\s*#{definition_name}\s*=\s*([\d\s]+)/i)
-        values = $1.chomp.split(/\s+/)
-        (0..values.length-1).each do |i|
-          values[i] = values[i].to_i
+        value = $1.chomp.split(/\s+/).map{ |elem| elem.to_i }
+        if ALL_PLAYER_ALL_ROUND_DEFS.include? definition_name
+          value.shift
+        else
+          value
         end
-        flatten_if_single_element_array values
       end
     end
 

data/lib/acpc_poker_types/match_state.rb

@@ -143,8 +143,16 @@ class MatchState < DelegateClass(String)
     end.call
   end
 
+  # @param game_def [GameDefinition] A game definition by which the actions can be interpreted
+  # and made more precise (bets marked by 'r' are converted into 'b' and checks marked by 'c'
+  # are converted to 'k').
   # @return [Array<Array<PokerAction>>] The sequence of betting actions.
-  def betting_sequence
+  def betting_sequence(game_def=nil)
+    if game_def
+      every_action(game_def) unless @precise_betting_sequence
+      return @precise_betting_sequence
+    end
+
     @betting_sequence ||= if @betting_sequence_string.empty?
       [[]]
     else
@@ -270,6 +278,7 @@ class MatchState < DelegateClass(String)
 
     @next_to_act = game_def.first_player_positions.first
     @player_acting_sequence = []
+    @precise_betting_sequence = []
     @min_wager_by = game_def.min_wagers.first
 
     walk_over_betting_sequence!(game_def)
@@ -344,6 +353,7 @@ class MatchState < DelegateClass(String)
         game_def.first_player_positions[current_round]
       )
       @player_acting_sequence << []
+      @precise_betting_sequence << []
       last_round = current_round
 
       walk_over_actions!(actions_per_round, game_def, last_round, current_round)
@@ -365,7 +375,7 @@ class MatchState < DelegateClass(String)
         game_def.min_wagers[current_round]
       )
 
-      action = PokerAction.new(
+      @precise_betting_sequence.last << PokerAction.new(
         action.to_s(
           pot_gained_chips: @players.inject(0) { |sum, player| sum += player.contributions[current_round].to_i } > 0,
           player_sees_wager: @players.amount_to_call(acting_player_position) > 0
@@ -373,11 +383,11 @@ class MatchState < DelegateClass(String)
         cost: cost
       )
 
-      adjust_min_wager!(action, acting_player_position)
+      adjust_min_wager!(@precise_betting_sequence.last.last, acting_player_position)
 
-      @players[acting_player_position].append_action!(action, current_round)
+      @players[acting_player_position].append_action!(@precise_betting_sequence.last.last, current_round)
 
-      yield action, current_round, acting_player_position if block_given?
+      yield @precise_betting_sequence.last.last, current_round, acting_player_position if block_given?
     end
 
     self

data/lib/acpc_poker_types/version.rb

@@ -1,3 +1,3 @@
 module AcpcPokerTypes
-  VERSION = '7.2.1'
+  VERSION = '7.2.2'
 end

data/spec/match_state_spec.rb

@@ -295,6 +295,42 @@ describe MatchState do
         )
       end
     end
+    it 'works with a game definition and provides more a precise result' do
+      MatchState.parse(
+        "#{MatchState::LABEL}:0:0:ccr20cc/r50fr100c/cc/cc:AhKs||"
+      ).betting_sequence(
+        GameDefinition.new(
+          first_player_positions: [3, 2, 2, 2],
+          chip_stacks: [200, 200, 200],
+          blinds: [10, 0, 5],
+          raise_sizes: [10]*4,
+          number_of_ranks: 3
+        )
+      ).must_equal [
+        [
+          PokerAction.new(PokerAction::CALL),
+          PokerAction.new(PokerAction::CHECK),
+          PokerAction.new("#{PokerAction::RAISE}20"),
+          PokerAction.new(PokerAction::CALL),
+          PokerAction.new(PokerAction::CALL)
+        ],
+        [
+          PokerAction.new("#{PokerAction::BET}50"),
+          PokerAction.new(PokerAction::FOLD),
+          PokerAction.new("#{PokerAction::RAISE}100"),
+          PokerAction.new(PokerAction::CALL)
+
+        ],
+        [
+          PokerAction.new(PokerAction::CHECK),
+          PokerAction.new(PokerAction::CHECK)
+        ],
+        [
+          PokerAction.new(PokerAction::CHECK),
+          PokerAction.new(PokerAction::CHECK)
+        ]
+      ]
+    end
   end
   describe '#players_at_hand_start' do
     it 'returns HandPlayers with states set at the beginning of the hand' do

metadata

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