bioshogi 0.0.17 → 0.0.18

data/lib/bioshogi/board/reader_methods.rb

@@ -13,7 +13,7 @@ module Bioshogi
         lookup(place) or raise PieceNotFoundOnBoard, "#{place}に何もありません\n#{self}"
       end
 
-      def empty_cell?(place)
+      def cell_empty?(place)
         !lookup(place)
       end
 

data/lib/bioshogi/board_parser/compare_board_parser.rb

@@ -38,7 +38,7 @@ module Bioshogi
               soldiers << soldier
             end
           when something != "・"
-            other_objects << {place: place, prefix_char: prefix_char, something: something}
+            other_objects << { place: place, prefix_char: prefix_char, something: something }
           end
         end
       end

data/lib/bioshogi/board_parser/kakinoki_board_parser.rb

@@ -59,20 +59,20 @@ module Bioshogi
 
       def place_validate(x, y, something)
         unless @h_units[x] && @v_units[y]
-          raise SyntaxDefact, "盤面の情報が読み取れません。#{something.inspect} が盤面からはみ出ているかもしれません。左上の升目を (0, 0) としたときの (#{x}, #{y}) の地点です\n#{@source}"
+          raise SyntaxDefact, "盤面の情報が読み取れません。おそらく #{something.inspect} が盤面からはみ出ています。#{coordinate_message(x, y)}\n#{@source}"
         end
       end
 
       def prefix_char_validate(x, y, prefix_char)
         unless prefix_char.match?(/[[:ascii:]]/)
-          raise SyntaxDefact, "盤面がずれているかもしれません。prefix_char=#{prefix_char.inspect}。左上の升目を (0, 0) としたときの (#{x}, #{y}) の地点です\n#{@source}"
+          raise SyntaxDefact, "盤面がずれています。#{prefix_char.inspect} は想定外の文字です。#{coordinate_message(x, y)}\n#{@source}"
         end
       end
 
       def cell_walker
         h_units_read
 
-        mds = shape_lines.collect { |v| v.match(/\|(?<inline>.*)\|(?<y>.)?/) }.compact
+        mds = shape_lines.collect { |v| v.match(/\|(?<inline>.*?)\s*\|(?<y>.)?/) }.compact
         @v_units = mds.collect.with_index { |v, i| v[:y] || Dimension::Row.char_infos[i] }
         inlines = mds.collect { |v| v[:inline] }
 
@@ -90,6 +90,10 @@ module Bioshogi
       def build(place, piece, location_key)
         Soldier.new_with_promoted(piece, place: place, location: Location.fetch(location_key))
       end
+
+      def coordinate_message(x, y)
+        "左上を原点としたときとしたときの#{y.next}行目の#{x.next}列目の地点です。"
+      end
     end
   end
 end

data/lib/bioshogi/board_parser.rb

@@ -18,7 +18,7 @@ module Bioshogi
       private
 
       def parser_class_find(source)
-        support_parsers.find {|e| e.accept?(source) }
+        support_parsers.find { |e| e.accept?(source) }
       end
 
       def support_parsers

data/lib/bioshogi/column_soldier_counter.rb

@@ -0,0 +1,47 @@
+# frozen-string-literal: true
+
+#
+# 列の駒数をなるべく高速に判定する
+#
+module Bioshogi
+  class ColumnSoldierCounter
+    attr_reader :counts
+
+    def initialize
+      reset
+    end
+
+    def reset
+      @counts = Array.new(Dimension::Column.dimension_size, 0)
+    end
+
+    def set(place)
+      update(place, 1)
+    end
+
+    def remove(place)
+      update(place, -1)
+    end
+
+    def filled?(column)
+      @counts[column.value] >= Dimension::Row.dimension_size
+    end
+
+    private
+
+    def update(place, sign)
+      key = place.column.value
+      count = @counts[key] + sign
+      validate!(place, count)
+      @counts[key] = count
+    end
+
+    def validate!(place, count)
+      if count > Dimension::Row.dimension_size
+        raise MustNotHappen, "#{place.column.hankaku_number}の列に#{count}個目の駒を配置しようとしています。棋譜を二重に読ませようとしていませんか？"
+      elsif count.negative?
+        raise MustNotHappen, "#{place.column.hankaku_number}の列の駒の数がマイナスになろうとしている"
+      end
+    end
+  end
+end

data/lib/bioshogi/container/core_methods.rb

@@ -4,20 +4,32 @@ module Bioshogi
   module Container
     concern :CoreMethods do
       attr_writer :board
+      attr_accessor :initial_preset_info
 
-      def before_run_process
+      def initialize(params = {})
+        self.params.update(params)
       end
 
-      def params
-        @params ||= {
-          :analysis_feature           => false,
-          :analysis_technique_feature => false,
-          :ki2_function               => true,
-          :validate_feature                => true,
-          :board_class                    => Board,
+      def after_setup
+        initial_preset_info_set
+      end
+
+      def default_params
+        {
+          :analysis_feature        => false,
+          :ki2_function            => true,
+          :validate_feature        => true,
+          :double_pawn_detect      => true, # 二歩を検出するか？
+          :warp_detect             => true, # 角ワープを検出するか？
+          :board_class             => Board,
+          :last_action_info1        => LastActionInfo[:TORYO],
         }
       end
 
+      def params
+        @params ||= default_params
+      end
+
       def deep_dup
         Marshal.load(Marshal.dump(self))
       end
@@ -34,6 +46,14 @@ module Bioshogi
         @board ||= params[:board_class].new
       end
 
+      def initial_preset_info_set
+        unless defined?(@initial_preset_info)
+          @initial_preset_info = board.preset_info
+        end
+
+        nil
+      end
+
       def placement_from_bod(str)
         str = str.lines.collect(&:strip).join("\n")
         if md = str.match(/(?<board>^\+\-.*\-\+$)/m)
@@ -94,6 +114,14 @@ module Bioshogi
       def load_from_sfen(sfen_info)
         SfenImporter.new(self, sfen_info).import_all
       end
+
+      ################################################################################
+
+      def to_header_h
+        {}.merge(*players.collect(&:to_header_h), to_header_shared_h)
+      end
+
+      ################################################################################
     end
   end
 end

data/lib/bioshogi/container/execute_methods.rb

@@ -9,10 +9,18 @@ module Bioshogi
           delegate :to_kif_a, :to_ki2_a, :to_kif_oneline, to: :hand_logs
         end
 
-        attr_writer :kill_count      # 駒を取った回数
+        attr_accessor :kill_count      # 総キル数
         attr_accessor :critical_turn # 最初の駒が取られる直前の手数           (avg: 22.6328)
         attr_accessor :outbreak_turn # 「歩と角」を除く駒が取られる直前の手数 (avg: 41.8402)
 
+        def tyuuban_ikou
+          outbreak_turn
+        end
+
+        def joban
+          !outbreak_turn
+        end
+
         def kill_count
           @kill_count ||= 0
         end
@@ -22,6 +30,9 @@ module Bioshogi
         end
       end
 
+      def before_execute_all
+      end
+
       def execute(str, options = {})
         options = {
           executor_class: executor_class,
@@ -32,9 +43,29 @@ module Bioshogi
         end
       end
 
+      def after_execute_all
+        if params[:analysis_feature]
+          Analysis::Atsumeruyo.new(self).call
+          Analysis::FinalizeTagDetector.new(self).call
+        end
+      end
+
       def executor_class
         PlayerExecutor::Human
       end
+
+      def to_header_shared_h
+        if params[:analysis_feature]
+          {
+            "接触"     => critical_turn.try { "#{self}手目" },
+            "開戦"     => outbreak_turn.try { "#{self}手目" },
+            "総手数"   => "#{turn_info.display_turn}手",
+            "総キル数" => "#{kill_count}キル",
+          }
+        else
+          {}
+        end
+      end
     end
   end
 end

data/lib/bioshogi/container/players_methods.rb

@@ -4,22 +4,25 @@ module Bioshogi
   module Container
     concern :PlayersMethods do
       class_methods do
-        def start
-          new.tap do |e|
+        def start(...)
+          new(...).tap do |e|
             e.placement_from_preset("平手")
+            e.after_setup
           end
         end
       end
 
-      attr_reader :players
-
       def players
         @players ||= Location.collect do |e|
           Player.new(container: self, location: e)
         end
       end
 
-      # player_at(-1) でも後手を取得できる
+      # player_at(-2) → 先手
+      # player_at(-1) → 後手
+      # player_at(+0) → 先手
+      # player_at(+1) → 後手
+      # player_at(+2) → 先手
       def player_at(location)
         players[Location.fetch(location).code]
       end
@@ -58,13 +61,9 @@ module Bioshogi
       # 両者の(別名を含む)スキル名のリストを合わせてユニークにしたもの
       # つまりその対局に関連するすべてのタグに相当する
       def normalized_names_with_alias
-        players.flat_map { |e| e.skill_set.normalized_names_with_alias }.uniq
+        players.flat_map { |e| e.tag_bundle.normalized_names_with_alias }.uniq
       end
 
-      # def basic_score
-      #   evaluator.basic_score
-      # end
-
       # 互いに王手されている局面か？ (ありえない)
       def position_invalid?
         players.all?(&:mate_advantage?)
@@ -80,8 +79,6 @@ module Bioshogi
       end
 
       concerning :TurnMethods do
-        attr_writer :turn_info
-
         def turn_info
           @turn_info ||= TurnInfo.new
         end

data/lib/bioshogi/container/serialize_methods.rb

@@ -33,7 +33,7 @@ module Bioshogi
         s = []
         s << board.to_s
         s << players.collect { |player|
-          "#{player.call_name}の持駒:#{player.piece_box.to_s}"
+          "#{player.call_name}の持駒:#{player.piece_box}"
         }.join("\n") + "\n"
         s.join
       end
@@ -108,12 +108,13 @@ module Bioshogi
         attr_reader :initial_state_board_sfen
         attr_reader :initial_state_turn_info
 
-        def initialize(*)
-          super
-          before_run_process            # FIXME
-        end
+        # def initialize(*)
+        #   super
+        #   after_setup            # FIXME
+        # end
 
-        def before_run_process
+        def after_setup
+          super
           # turn_info_auto_set
           @initial_state_board_sfen = to_short_sfen # FIXME: これはイケてない
           @initial_state_turn_info = turn_info.clone

data/lib/bioshogi/container.rb

@@ -1,9 +1,13 @@
 module Bioshogi
   module Container
-    class << self
-      def create(...)
-        Basic.new(...)
-      end
+    extend self
+
+    def create(...)
+      Basic.new(...)
+    end
+
+    def new(...)
+      Basic.new(...)
     end
   end
 end

data/lib/bioshogi/counter_hash.rb

@@ -1,4 +1,5 @@
 # frozen-string-literal: true
+
 #
 # h = CounterHash.new
 # h[:x]                           # => 0

data/lib/bioshogi/csa_header_info.rb

@@ -1,4 +1,5 @@
 # frozen-string-literal: true
+
 module Bioshogi
   # CSA標準棋譜ファイル形式
   # http://www.computer-shogi.org/protocol/record_v22.html
@@ -67,7 +68,7 @@ module Bioshogi
       private
 
       def invert_table
-        @invert_table ||= inject({}) {|a, e| a.merge(e.kif_side_key => e) }
+        @invert_table ||= inject({}) { |a, e| a.merge(e.kif_side_key => e) }
       end
     end
 

data/lib/bioshogi/dimension/base.rb

@@ -11,16 +11,22 @@ module Bioshogi
       attr_reader :value
 
       class << self
-        def default_size?
-          dimension_size == DEFAULT
+        ################################################################################
+
+        def first
+          fetch(0)
         end
 
-        def fetch(value)
-          lookup(value) or raise SyntaxDefact, "座標が読み取れません : #{value.inspect}"
+        def last
+          fetch(dimension_size.pred)
         end
 
-        def lookup(value)
-          table[value]
+        def half
+          fetch(dimension_size / 2)
+        end
+
+        def default_size?
+          dimension_size == DEFAULT
         end
 
         def size_reset(v)
@@ -28,10 +34,16 @@ module Bioshogi
           cache_clear
         end
 
-        def cache_clear
-          @char_infos  = nil
-          @table       = nil
-          @value_range = nil
+        ################################################################################
+
+        def fetch(value)
+          table.fetch(value) do
+            raise SyntaxDefact, "座標が読み取れません : #{value.inspect}"
+          end
+        end
+
+        def lookup(value)
+          table[value]
         end
 
         def table
@@ -47,10 +59,18 @@ module Bioshogi
           }.freeze
         end
 
-        # # 幅
+        ################################################################################
+
+        # 幅
         def value_range
           @value_range ||= 0...char_infos.size
         end
+
+        def cache_clear
+          @char_infos  = nil
+          @table       = nil
+          @value_range = nil
+        end
       end
 
       private_class_method :new
@@ -83,6 +103,8 @@ module Bioshogi
         Yomiage::NumberInfo.fetch(key).yomiage
       end
 
+      ################################################################################
+
       def flip
         @cache[:flip] ||= self.class.fetch(dimension_size.pred - value)
       end
@@ -107,12 +129,30 @@ module Bioshogi
         end
       end
 
+      ################################################################################
+
+      def distance(other)
+        if self.class != other.class
+          raise ArgumentError, "同じクラスはありません : #{other}"
+        end
+
+        (value - other.value).abs
+      end
+
+      def distance_from_half
+        distance(self.class.half)
+      end
+
+      ################################################################################
+
       def ==(other)
         self.class == other.class && value == other.value
       end
 
       def <=>(other)
-        value <=> other.value
+        if self.class == other.class
+          value <=> other.value
+        end
       end
 
       def eql?(other)
@@ -126,6 +166,8 @@ module Bioshogi
       def inspect
         "#<#{self.class.name}:#{object_id} #{name.inspect} #{value}>"
       end
+
+      ################################################################################
     end
   end
 end