acpc_poker_types 6.2.3 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 165a5b649ef7d57225688b8a01f008915a316c81
-  data.tar.gz: 0f817fe61d191d802eaba88c97edd957a9d6075c
+  metadata.gz: 78f0bab62893fa563b2b696c90844c647533403e
+  data.tar.gz: 3462780103b206dd0c9b1952bb06d5e43760c24b
 SHA512:
-  metadata.gz: 8ea2b48f921dbfb58f18e3cf38b963f2f0e7f164d28e3f3b6272428fe88063a6491152714a057bb83702421d3dd43cdb9d730c8c04999fdbd47a39aee8f88986
-  data.tar.gz: dc253a22ef1eb28b23919134e565ccb4c06dcac52cdc3905646096fd921f28c374f8b54cfda9aa026714c7d69c98425172fcb471678d70612dfdc24bec8d4a4d
+  metadata.gz: 4418652bec1d5c84b867e72fabd230132fa50d14b64f6a4f4bf3ed68149f68f947aad717fd533b33e2ed61e49d3a0c5cd03d59e070e15bd832ac4a08e36a186f
+  data.tar.gz: ab329609151c04988b321aeb400b2c14a8b09b64722e172ce1438e683ddc2055769614cf857e8d5114e4782117fcdaf3c1b795735b64b896cb0155f2549f8a5d

data/lib/acpc_poker_types.rb

@@ -5,12 +5,12 @@ require "acpc_poker_types/card"
 require "acpc_poker_types/chip_stack"
 require "acpc_poker_types/game_definition"
 require "acpc_poker_types/hand"
-require 'acpc_poker_types/player_group'
+require 'acpc_poker_types/hand_player_group'
 require "acpc_poker_types/match_state"
 require "acpc_poker_types/pile_of_cards"
 require "acpc_poker_types/rank"
 require "acpc_poker_types/suit"
-require "acpc_poker_types/acpc_dealer_data"
+require "acpc_poker_types/dealer_data"
 require 'acpc_poker_types/seat'
 
 module AcpcPokerTypes

data/lib/acpc_poker_types/dealer_data.rb

@@ -0,0 +1,9 @@
+require 'acpc_poker_types/dealer_data/action_messages'
+require 'acpc_poker_types/dealer_data/hand_data'
+require 'acpc_poker_types/dealer_data/hand_results'
+require 'acpc_poker_types/dealer_data/poker_match_data'
+require 'acpc_poker_types/dealer_data/match_definition'
+require 'acpc_poker_types/dealer_data/log_file'
+
+module AcpcPokerTypes::DealerData
+end

data/lib/acpc_poker_types/{acpc_dealer_data → dealer_data}/action_messages.rb

@@ -1,10 +1,10 @@
 require 'acpc_poker_types/match_state'
 require 'acpc_poker_types/poker_action'
 
-require 'acpc_poker_types/acpc_dealer_data/match_definition'
-require 'acpc_poker_types/acpc_dealer_data/log_file'
+require 'acpc_poker_types/dealer_data/match_definition'
+require 'acpc_poker_types/dealer_data/log_file'
 
-module AcpcPokerTypes::AcpcDealerData
+module AcpcPokerTypes::DealerData
   class ActionMessages
     attr_reader(
       :data, :final_score, :match_def
@@ -73,9 +73,9 @@ module AcpcPokerTypes::AcpcDealerData
     end
 
     def self.parse_to_or_from_message(message)
-      parsed_message =  AcpcPokerTypes::AcpcDealerData::ActionMessages.parse_to_message(message)
+      parsed_message =  AcpcPokerTypes::DealerData::ActionMessages.parse_to_message(message)
       if parsed_message.nil?
-         AcpcPokerTypes::AcpcDealerData::ActionMessages.parse_from_message(message)
+         AcpcPokerTypes::DealerData::ActionMessages.parse_from_message(message)
       else
         parsed_message
       end
@@ -87,8 +87,8 @@ module AcpcPokerTypes::AcpcDealerData
       game_def_directory,
       num_hands=nil
     )
-       AcpcPokerTypes::AcpcDealerData::LogFile.open(acpc_log_file_path, 'r') do |file|
-         AcpcPokerTypes::AcpcDealerData::ActionMessages.parse file, player_names, game_def_directory, num_hands
+       AcpcPokerTypes::DealerData::LogFile.open(acpc_log_file_path, 'r') do |file|
+         AcpcPokerTypes::DealerData::ActionMessages.parse file, player_names, game_def_directory, num_hands
       end
     end
 
@@ -104,9 +104,9 @@ module AcpcPokerTypes::AcpcDealerData
       @match_def = nil
       @data = acpc_log_statements.inject([]) do |accumulating_data, log_line|
         if @match_def.nil?
-          @match_def =  AcpcPokerTypes::AcpcDealerData::MatchDefinition.parse(log_line, player_names, game_def_directory)
+          @match_def =  AcpcPokerTypes::DealerData::MatchDefinition.parse(log_line, player_names, game_def_directory)
         else
-          parsed_message =  AcpcPokerTypes::AcpcDealerData::ActionMessages.parse_to_or_from_message(log_line)
+          parsed_message =  AcpcPokerTypes::DealerData::ActionMessages.parse_to_or_from_message(log_line)
           if parsed_message
             if (
               accumulating_data.empty? ||
@@ -120,7 +120,7 @@ module AcpcPokerTypes::AcpcDealerData
             end
             accumulating_data.last << parsed_message
           else
-            @final_score =  AcpcPokerTypes::AcpcDealerData::ActionMessages.parse_score(log_line) unless @final_score
+            @final_score =  AcpcPokerTypes::DealerData::ActionMessages.parse_score(log_line) unless @final_score
           end
         end
 

data/lib/acpc_poker_types/{acpc_dealer_data → dealer_data}/hand_data.rb

@@ -1,10 +1,10 @@
-require 'acpc_poker_types/acpc_dealer_data/match_definition'
+require 'acpc_poker_types/dealer_data/match_definition'
 
 require 'contextual_exceptions'
 using ContextualExceptions::ClassRefinement
 
 # Refinement for easy boundary checking
-module AcpcPokerTypes::AcpcDealerData
+module AcpcPokerTypes::DealerData
   module BoundaryCheckingRefinement
     refine Array do
       def in_bounds?(i)
@@ -13,9 +13,9 @@ module AcpcPokerTypes::AcpcDealerData
     end
   end
 end
-using AcpcPokerTypes::AcpcDealerData::BoundaryCheckingRefinement
+using AcpcPokerTypes::DealerData::BoundaryCheckingRefinement
 
-module AcpcPokerTypes::AcpcDealerData
+module AcpcPokerTypes::DealerData
   class HandData
     exceptions :invalid_data, :names_do_not_match
 

data/lib/acpc_poker_types/{acpc_dealer_data → dealer_data}/hand_results.rb

@@ -1,7 +1,7 @@
-require 'acpc_poker_types/acpc_dealer_data/match_definition'
-require 'acpc_poker_types/acpc_dealer_data/log_file'
+require 'acpc_poker_types/dealer_data/match_definition'
+require 'acpc_poker_types/dealer_data/log_file'
 
-module AcpcPokerTypes::AcpcDealerData
+module AcpcPokerTypes::DealerData
   class  HandResults
     attr_reader :data, :final_score, :match_def
 
@@ -45,8 +45,8 @@ module AcpcPokerTypes::AcpcDealerData
       game_def_directory,
       num_hands=nil
     )
-       AcpcPokerTypes::AcpcDealerData::LogFile.open(acpc_log_file_path, 'r') do |file|
-         AcpcPokerTypes::AcpcDealerData::HandResults.parse file, player_names, game_def_directory, num_hands
+       AcpcPokerTypes::DealerData::LogFile.open(acpc_log_file_path, 'r') do |file|
+         AcpcPokerTypes::DealerData::HandResults.parse file, player_names, game_def_directory, num_hands
       end
     end
 
@@ -58,9 +58,9 @@ module AcpcPokerTypes::AcpcDealerData
 
       @data = acpc_log_statements.inject([]) do |accumulating_data, log_line|
         if @match_def.nil?
-          @match_def = AcpcPokerTypes::AcpcDealerData::MatchDefinition.parse(log_line, player_names, game_def_directory)
+          @match_def = AcpcPokerTypes::DealerData::MatchDefinition.parse(log_line, player_names, game_def_directory)
         else
-          parsed_message = AcpcPokerTypes::AcpcDealerData::HandResults.parse_state(log_line)
+          parsed_message = AcpcPokerTypes::DealerData::HandResults.parse_state(log_line)
           if parsed_message
             # Yes, this causes one more result to be parsed than is saved as long as
             # the number of hands is less than the total number in the log, but this
@@ -68,7 +68,7 @@ module AcpcPokerTypes::AcpcDealerData
             break accumulating_data if accumulating_data.length == num_hands
             accumulating_data << parsed_message
           else
-            @final_score = AcpcPokerTypes::AcpcDealerData::HandResults.parse_score(log_line) unless @final_score
+            @final_score = AcpcPokerTypes::DealerData::HandResults.parse_score(log_line) unless @final_score
           end
         end
 

data/lib/acpc_poker_types/{acpc_dealer_data → dealer_data}/log_file.rb

@@ -1,5 +1,5 @@
 # Wrapper class to enable mocking log files in tests
-module AcpcPokerTypes::AcpcDealerData
+module AcpcPokerTypes::DealerData
   class  LogFile < File
   end
 end

data/lib/acpc_poker_types/{acpc_dealer_data → dealer_data}/match_definition.rb

@@ -5,7 +5,7 @@ require 'acpc_poker_types/game_definition'
 require 'contextual_exceptions'
 using ContextualExceptions::ClassRefinement
 
-module AcpcPokerTypes::AcpcDealerData
+module AcpcPokerTypes::DealerData
   class MatchDefinition
 
     exceptions :incorrect_number_of_player_names

data/lib/acpc_poker_types/{acpc_dealer_data → dealer_data}/poker_match_data.rb

@@ -1,15 +1,15 @@
 require 'celluloid/autostart'
 
-require 'acpc_poker_types/acpc_dealer_data/action_messages'
-require 'acpc_poker_types/acpc_dealer_data/hand_data'
-require 'acpc_poker_types/acpc_dealer_data/hand_results'
-require 'acpc_poker_types/acpc_dealer_data/match_definition'
+require 'acpc_poker_types/dealer_data/action_messages'
+require 'acpc_poker_types/dealer_data/hand_data'
+require 'acpc_poker_types/dealer_data/hand_results'
+require 'acpc_poker_types/dealer_data/match_definition'
 
 require 'contextual_exceptions'
 using ContextualExceptions::ClassRefinement
 
 module AcpcPokerTypes
-module AcpcDealerData
+module DealerData
 
 class PokerMatchData
   exceptions :match_definitions_do_not_match, :final_scores_do_not_match, :data_inconsistent, :names_do_not_match
@@ -23,15 +23,15 @@ class PokerMatchData
     :match_def,
     # @returns [Integer] Zero-index turn number within the hand
     :hand_number,
-    # @returns [AcpcDealerData::HandData] Data from each hand
+    # @returns [DealerData::HandData] Data from each hand
     :data,
-    # @returns [Array<AcpcDealerData::PokerMatchData::Player>]
+    # @returns [Array<DealerData::PokerMatchData::Player>]
     :players,
     # @returns [Integer] Seat of the active player
     :seat
   )
 
-  # @returns [AcpcDealerData::PokerMatchData]
+  # @returns [DealerData::PokerMatchData]
   def self.parse_files(
     action_messages_file,
     result_messages_file,
@@ -40,7 +40,7 @@ class PokerMatchData
     num_hands=nil
   )
     parsed_action_messages = Celluloid::Future.new do
-       AcpcDealerData::ActionMessages.parse_file(
+       DealerData::ActionMessages.parse_file(
         action_messages_file,
         player_names,
         dealer_directory,
@@ -48,7 +48,7 @@ class PokerMatchData
       )
     end
     parsed_hand_results = Celluloid::Future.new do
-       AcpcDealerData::HandResults.parse_file(
+       DealerData::HandResults.parse_file(
         result_messages_file,
         player_names,
         dealer_directory,
@@ -64,7 +64,7 @@ class PokerMatchData
     )
   end
 
-  # @returns [AcpcDealerData::PokerMatchData]
+  # @returns [DealerData::PokerMatchData]
   def self.parse(
     action_messages,
     result_messages,
@@ -73,7 +73,7 @@ class PokerMatchData
     num_hands=nil
   )
     parsed_action_messages = Celluloid::Future.new do
-       AcpcDealerData::ActionMessages.parse(
+       DealerData::ActionMessages.parse(
         action_messages,
         player_names,
         dealer_directory,
@@ -81,7 +81,7 @@ class PokerMatchData
       )
     end
     parsed_hand_results = Celluloid::Future.new do
-       AcpcDealerData::HandResults.parse(
+       DealerData::HandResults.parse(
         result_messages,
         player_names,
         dealer_directory,
@@ -150,10 +150,15 @@ class PokerMatchData
     self
   end
 
-  def end_hand!
+  def distribute_chips!
     @players.each do |plyr|
       plyr.balance += hand_player(plyr).balance
     end
+
+    self
+  end
+
+  def end_hand!
     current_hand.end_hand!
 
     self
@@ -199,6 +204,8 @@ class PokerMatchData
       match_state = current_hand.current_match_state(seat)
     end
 
+    distribute_chips! if current_hand.final_turn?
+
     self
   end
 
@@ -211,11 +218,6 @@ class PokerMatchData
     self
   end
 
-  def match_has_another_round?(current_round, turn_index, turns_taken)
-    new_round?(current_round, turn_index) ||
-    players_all_in?(current_round, turn_index, turns_taken)
-  end
-
   def hand_started?
     @hand_number &&
     current_hand.turn_number &&
@@ -223,22 +225,7 @@ class PokerMatchData
   end
 
   def player_acting_sequence
-    sequence = []
-
-    return sequence unless hand_started?
-
-    turns_taken = current_hand.data[0..current_hand.turn_number-1]
-    turns_taken.each_with_index do |turn, turn_index|
-      next unless turn.action_message
-
-      sequence[turn.action_message.state.round] ||= []
-      sequence[turn.action_message.state.round] << turn.action_message.seat
-      if match_has_another_round?(sequence.length - 1, turn_index, turns_taken)
-         sequence << []
-       end
-    end
-
-    sequence
+    sequence_from_action_messages(:seat)
   end
 
   def current_hand
@@ -273,7 +260,6 @@ class PokerMatchData
     current_hand.current_match_state(plyr.seat).position_relative_to_dealer
   end
 
-  # @todo Untested
   # @return [String] player acting sequence as a string.
   def player_acting_sequence_string
     (player_acting_sequence.map { |per_round| per_round.join('') }).join('/')
@@ -283,39 +269,40 @@ class PokerMatchData
     current_hand.next_action.seat == @seat
   end
   def betting_sequence
+    sequence_from_action_messages(:action)
+  end
+  def betting_sequence_string
+    (betting_sequence.map do |per_round|
+       (per_round.map{|action| action.to_acpc}).join('')
+    end).join('/')
+  end
+
+  protected
+
+  def sequence_from_action_messages(attribute)
     sequence = [[]]
 
-    if (
-      @hand_number.nil? ||
-      current_hand.turn_number.nil? ||
-      current_hand.turn_number < 1
-    )
-      return sequence
-    end
+    return sequence unless hand_started?
 
     turns_taken = current_hand.data[0..current_hand.turn_number-1]
     turns_taken.each_with_index do |turn, turn_index|
       next unless turn.action_message
 
-      sequence[turn.action_message.state.round] << turn.action_message.action
+      sequence[turn.action_message.state.round] ||= []
+      sequence[turn.action_message.state.round] << turn.action_message[attribute]
 
-      if (
-        new_round?(sequence.length - 1 , turn_index) ||
-        players_all_in?(sequence.length - 1, turn_index, turns_taken)
-      )
+      if new_round?(sequence.length - 1, turn_index)
         sequence << []
       end
+      if players_all_in?(sequence.length - 1, turn_index, turns_taken)
+        while sequence.length < @match_def.game_def.number_of_rounds
+          sequence << []
+        end
+      end
     end
 
     sequence
   end
-  def betting_sequence_string
-    (betting_sequence.map do |per_round|
-       (per_round.map{|action| action.to_acpc}).join('')
-    end).join('/')
-  end
-
-  protected
 
   def initialize_players!
     @players = @match_def.player_names.length.times.map do |seat|
@@ -346,7 +333,7 @@ class PokerMatchData
   def set_data!(parsed_action_messages, parsed_hand_results)
     @data = []
     parsed_action_messages.data.zip(parsed_hand_results.data).each do |action_messages_by_hand, hand_result|
-      @data << AcpcDealerData::HandData.new(
+      @data << DealerData::HandData.new(
         @match_def,
         action_messages_by_hand,
         hand_result
@@ -365,6 +352,7 @@ class PokerMatchData
     end) != @players.length - 1
   end
   def new_round?(current_round, turn_index)
+    current_hand &&
     current_hand.data.length > turn_index + 1 &&
     current_hand.data[turn_index + 1].action_message &&
     current_hand.data[turn_index + 1].action_message.state.round > current_round

data/lib/acpc_poker_types/{player_group.rb → hand_player_group.rb}

@@ -6,7 +6,7 @@ require 'acpc_poker_types/hand_player'
 # Model to parse and manage information from a given match state string.
 module AcpcPokerTypes
 
-class PlayerGroup < DelegateClass(Array)
+class HandPlayerGroup < DelegateClass(Array)
   attr_reader :players
 
   def initialize(all_hands, stacks, blinds)

data/lib/acpc_poker_types/match_state.rb

@@ -4,7 +4,7 @@ require 'acpc_poker_types/rank'
 require 'acpc_poker_types/suit'
 require 'acpc_poker_types/poker_action'
 require 'acpc_poker_types/hand_player'
-require 'acpc_poker_types/player_group'
+require 'acpc_poker_types/hand_player_group'
 
 module AcpcPokerTypes
 module Indices
@@ -144,7 +144,7 @@ class MatchState
     @betting_sequence ||= if @betting_sequence_string.empty?
       [[]]
     else
-      lcl_betting_sequence = @betting_sequence_string.split(
+      sequence = @betting_sequence_string.split(
         BETTING_SEQUENCE_SEPARATOR
       ).map do |betting_string_per_round|
         actions_from_acpc_characters(betting_string_per_round).map do |action|
@@ -153,8 +153,10 @@ class MatchState
       end
 
       # Adjust the number of rounds if the last action was the last action in the round
-      lcl_betting_sequence << [] if first_state_of_round?
-      lcl_betting_sequence
+      while sequence.length <= round
+        sequence << []
+      end
+      sequence
     end
   end
 
@@ -251,14 +253,14 @@ class MatchState
 
   # @param stacks [Array<#to_f>]
   # @param blinds [Array<#to_f>]
-  # @return [PlayerGroup] The state of the players in this hand at the
+  # @return [HandPlayerGroup] The state of the players in this hand at the
   # when the hand began.
   def players_at_hand_start(stacks, blinds)
-    PlayerGroup.new all_hands, stacks, blinds
+    HandPlayerGroup.new all_hands, stacks, blinds
   end
 
   # @param game_def [GameDefinition]
-  # @return [PlayerGroup] The current state of the players.
+  # @return [HandPlayerGroup] The current state of the players.
   def every_action(game_def)
     @players = players_at_hand_start game_def.chip_stacks, game_def.blinds
 
@@ -293,7 +295,7 @@ class MatchState
   def hand_ended?(game_def)
     return @hand_ended unless @hand_ended.nil?
 
-    @hand_ended = reached_showdown? || players(game_def).count { |player| player.inactive? } >= number_of_players - 1
+    @hand_ended = reached_showdown? || players(game_def).count { |player| player.folded? } >= number_of_players - 1
   end
 
   def reached_showdown?
@@ -321,6 +323,7 @@ class MatchState
 
   def walk_over_betting_sequence!(game_def)
     last_round = -1
+
     betting_sequence.each_with_index do |actions_per_round, current_round|
       @min_wager_by = game_def.min_wagers[current_round]
       @next_to_act = @players.position_of_first_active_player(