bioshogi 0.0.17 → 0.0.18

data/lib/bioshogi/parser/pi.rb

@@ -1,5 +1,9 @@
 # frozen-string-literal: true
 
+# 設計がおかしくなっていた原因は、このクラスを DTO として扱っていたことにある。
+# last_action_key が「なんでもハッシュ」になっているのも問題である。
+# 読み込んだ情報へのアクセスメソッドは、このクラス内に積極的に定義すべき。
+
 module Bioshogi
   module Parser
     class Pi
@@ -7,7 +11,11 @@ module Bioshogi
       attr_accessor :move_infos
       attr_accessor :first_comments
       attr_accessor :board_source
-      attr_accessor :last_action_params
+
+      attr_accessor :last_action_unknown_str
+      attr_accessor :last_action_info1
+      attr_accessor :last_used_seconds
+
       attr_accessor :header
       attr_accessor :force_preset_info
       attr_accessor :force_location
@@ -15,14 +23,17 @@ module Bioshogi
       attr_accessor :player_piece_boxes
       attr_accessor :sfen_info
 
-      # 変換時に必要なもの
       attr_accessor :error_message
 
       def initialize
         @move_infos         = []
         @first_comments     = []
         @board_source       = nil
-        @last_action_params = nil
+
+        @last_action_info1       = nil # LastActionInfo[:TORYO]
+        @last_action_unknown_str = nil
+        @last_used_seconds       = nil
+
         @header             = Header.new
         @force_preset_info  = nil
         @force_location     = nil
@@ -32,34 +43,60 @@ module Bioshogi
         @sfen_info          = nil
       end
 
+      ################################################################################ 以下すべて読み取りメソッド
+
+      def to_h
+        instance_variables.inject({}) do |a, e|
+          a.merge(e => instance_variable_get(e))
+        end
+      end
+
+      def used_seconds_at(index)
+        @move_infos.dig(index, :used_seconds).to_i
+      end
+
       def clock_exist?
-        return @clock_exist if instance_variable_defined?(:@clock_exist)
-        @clock_exist ||= @move_infos.any? { |e| e[:used_seconds].to_i.nonzero? }
+        unless defined?(@clock_exist_p)
+          @clock_exist_p = @move_infos.any? { |e| e[:used_seconds].to_i.nonzero? }
+        end
+
+        @clock_exist_p
       end
 
       def clock_nothing?
         !clock_exist?
       end
 
-      # 勝ち負けがついた一般的な終わり方をしたか？
-      def win_player_collect_p
-        if last_action_params
-          if last_action_key = last_action_params[:last_action_key]
-            if last_action_info = Formatter::LastActionInfo[last_action_key]
-              last_action_info.win_player_collect_p
-            end
-          end
+      def input_last_action_info
+        last_action_info1 || header.last_action_info2 || LastActionInfo[:TORYO]
+      end
+
+      # 出力するときの結末
+      # nil を返す場合もある
+      def output_last_action_info
+        @output_last_action_info ||= illegal_move_last_action_info || input_last_action_info
+      end
+
+      def illegal_move_last_action_info
+        if error_message
+          LastActionInfo.fetch(:ILLEGAL_MOVE)
+        end
+      end
+      private :illegal_move_last_action_info
+
+      def error_message_part(comment_mark = "*")
+        if v = error_message
+          v = v.strip + "\n"
+          s = "-" * 76 + "\n"
+          [s, *v.lines, s].collect { |e| "#{comment_mark} #{e}" }.join
         end
       end
 
-      # 詰みまで指したか？
-      def saigoha_tsumi_p
-        if last_action_params
-          if last_action_key = last_action_params[:last_action_key]
-            if last_action_info = Formatter::LastActionInfo[last_action_key]
-              last_action_info.key == :TSUMI
-            end
-          end
+      # 将棋倶楽部24の棋譜だけに存在する、自分の手番で相手が投了したときの文言に対応する
+      # "*" のあとにスペースを入れると、激指でコメントの先頭にスペースが入ってしまうため、仕方なくくっつけている
+      def illegal_judgement_message
+        if last_action_unknown_str
+          "本当の結末は「#{last_action_unknown_str}」だがこれが入っていると激指で読み込めなくなるので仕方なく投了にしている"
         end
       end
     end

data/lib/bioshogi/parser/sfen_parser.rb

@@ -14,6 +14,7 @@ module Bioshogi
         @pi.sfen_info      = Sfen.parse(normalized_source)
         @pi.move_infos     = @pi.sfen_info.move_infos
         @pi.force_handicap = @pi.sfen_info.handicap?
+        # @pi.force_preset_info = @pi.sfen_info.handicap?
 
         @pi.sfen_info.piece_counts.each do |location_key, counts|
           location = Location.fetch(location_key)

data/lib/bioshogi/parser.rb

@@ -7,7 +7,7 @@ module Bioshogi
     # 担当するクラス
     def accepted_class(source)
       source = Source.wrap(source)
-      support_parsers.find { |e| e.accept?(source) }
+      support_parsers.find { |e| e.accept?(source) } || default_parser
     end
 
     # 棋譜ファイルのコンテンツを読み込む
@@ -36,5 +36,9 @@ module Bioshogi
         BodParser,
       ]
     end
+
+    def default_parser
+      KifParser
+    end
   end
 end

data/lib/bioshogi/piece/piece_score.rb

@@ -5,14 +5,14 @@ module Bioshogi
     class PieceScore
       include ApplicationMemoryRecord
       memory_record [
-        { key: :king,   basic_weight: 40000, promoted_weight: 0,    hold_weight: 40000, },
-        { key: :rook,   basic_weight:  2000, promoted_weight: 2200, hold_weight:  2100, },
-        { key: :bishop, basic_weight:  1800, promoted_weight: 2000, hold_weight:  1890, },
-        { key: :gold,   basic_weight:  1200, promoted_weight: 0,    hold_weight:  1260, },
-        { key: :silver, basic_weight:  1000, promoted_weight: 1200, hold_weight:  1050, },
-        { key: :knight, basic_weight:   700, promoted_weight: 1200, hold_weight:   735, },
-        { key: :lance,  basic_weight:   600, promoted_weight: 1200, hold_weight:   630, },
-        { key: :pawn,   basic_weight:   100, promoted_weight: 1200, hold_weight:   105, },
+        { key: :king,   basic_weight: 40000, promoted_weight: 0,    hold_weight: 40000, category_score: 2, },
+        { key: :rook,   basic_weight:  2000, promoted_weight: 2200, hold_weight:  2100, category_score: 1, },
+        { key: :bishop, basic_weight:  1800, promoted_weight: 2000, hold_weight:  1890, category_score: 1, },
+        { key: :gold,   basic_weight:  1200, promoted_weight: 0,    hold_weight:  1260, category_score: 0, },
+        { key: :silver, basic_weight:  1000, promoted_weight: 1200, hold_weight:  1050, category_score: 0, },
+        { key: :knight, basic_weight:   700, promoted_weight: 1200, hold_weight:   735, category_score: 0, },
+        { key: :lance,  basic_weight:   600, promoted_weight: 1200, hold_weight:   630, category_score: 0, },
+        { key: :pawn,   basic_weight:   100, promoted_weight: 1200, hold_weight:   105, category_score: 0, },
       ]
 
       class << self

data/lib/bioshogi/piece/piece_vector.rb

@@ -1,4 +1,5 @@
 # frozen-string-literal: true
+
 #
 # basic_once_vectors      通常の1ベクトル
 # basic_repeat_vectors    通常の繰り返しベクトル
@@ -104,9 +105,9 @@ module Bioshogi
 
       def pattern_plus
         [
-          nil,     [0,-1],     nil,
+          nil,     [0, -1],     nil,
           [-1, 0],    nil, [+1, 0],
-          nil,     [0,+1],     nil,
+          nil,     [0, +1],     nil,
         ]
       end
 

data/lib/bioshogi/piece.rb

@@ -11,6 +11,7 @@ module Bioshogi
   class Piece
     concern :CLI do
       included do
+        # bioshogi piece
         desc "piece", "駒一覧"
         def piece
           tp Piece.collect(&:to_h)
@@ -32,7 +33,7 @@ module Bioshogi
         str = str.remove(/\p{blank}/)
         str.scan(/(#{Piece.all_names.join("|")})(\d+)?/o).inject({}) do |a, (piece, count)|
           piece = Piece.fetch(piece)
-          a.merge(piece.key => (count || 1).to_i) {|_, v1, v2| v1 + v2 }
+          a.merge(piece.key => (count || 1).to_i) { |_, v1, v2| v1 + v2 }
         end
       end
 
@@ -97,14 +98,14 @@ module Bioshogi
 
     include ApplicationMemoryRecord
     memory_record [
-      { key: :king,   name: "玉", basic_alias: "王", promoted_name: nil,  promoted_formal_sheet_name: nil,    other_matched_promoted_names: nil,   sfen_char: "K", promotable: false, always_alive: true,  strong: false, core_piece: true,  dengaku_target: true,  tatakare_target: true,  maesusumeru: true,  },
-      { key: :rook,   name: "飛", basic_alias: nil,  promoted_name: "龍", promoted_formal_sheet_name: nil,    other_matched_promoted_names: "竜",  sfen_char: "R", promotable: true,  always_alive: true,  strong: true,  core_piece: true,  dengaku_target: true,  tatakare_target: true,  maesusumeru: true,  },
-      { key: :bishop, name: "角", basic_alias: nil,  promoted_name: "馬", promoted_formal_sheet_name: nil,    other_matched_promoted_names: nil,   sfen_char: "B", promotable: true,  always_alive: true,  strong: true,  core_piece: true,  dengaku_target: true,  tatakare_target: false, maesusumeru: false, },
-      { key: :gold,   name: "金", basic_alias: nil,  promoted_name: nil,  promoted_formal_sheet_name: nil,    other_matched_promoted_names: nil,   sfen_char: "G", promotable: false, always_alive: true,  strong: false, core_piece: false, dengaku_target: false, tatakare_target: true,  maesusumeru: true,  },
-      { key: :silver, name: "銀", basic_alias: nil,  promoted_name: "全", promoted_formal_sheet_name: "成銀", other_matched_promoted_names: nil,   sfen_char: "S", promotable: true,  always_alive: true,  strong: false, core_piece: false, dengaku_target: false, tatakare_target: true,  maesusumeru: true,  },
-      { key: :knight, name: "桂", basic_alias: nil,  promoted_name: "圭", promoted_formal_sheet_name: "成桂", other_matched_promoted_names: "今",  sfen_char: "N", promotable: true,  always_alive: false, strong: false, core_piece: false, dengaku_target: false, tatakare_target: false, maesusumeru: false, },
-      { key: :lance,  name: "香", basic_alias: nil,  promoted_name: "杏", promoted_formal_sheet_name: "成香", other_matched_promoted_names: "仝",  sfen_char: "L", promotable: true,  always_alive: false, strong: false, core_piece: false, dengaku_target: false, tatakare_target: false, maesusumeru: true,  },
-      { key: :pawn,   name: "歩", basic_alias: nil,  promoted_name: "と", promoted_formal_sheet_name: nil,    other_matched_promoted_names: nil,   sfen_char: "P", promotable: true,  always_alive: false, strong: false, core_piece: false, dengaku_target: false, tatakare_target: false, maesusumeru: true,  },
+      { key: :king,   name: "玉", basic_alias: "王", promoted_name: nil,  promoted_formal_sheet_name: nil,    other_matched_promoted_names: nil,   sfen_char: "K", promotable: false, always_alive: true,  hisyakaku: false, dengaku_target: true,  tatakare_target: true,  forward_movable: true,  kogoma: false, kingin: false, swap_key: nil,     keini_yowai: false, fuigai: true,  count: 1, },
+      { key: :rook,   name: "飛", basic_alias: nil,  promoted_name: "龍", promoted_formal_sheet_name: nil,    other_matched_promoted_names: "竜",  sfen_char: "R", promotable: true,  always_alive: true,  hisyakaku: true,  dengaku_target: true,  tatakare_target: true,  forward_movable: true,  kogoma: false, kingin: false, swap_key: :bishop, keini_yowai: false, fuigai: true,  count: 1, },
+      { key: :bishop, name: "角", basic_alias: nil,  promoted_name: "馬", promoted_formal_sheet_name: nil,    other_matched_promoted_names: nil,   sfen_char: "B", promotable: true,  always_alive: true,  hisyakaku: true,  dengaku_target: true,  tatakare_target: false, forward_movable: false, kogoma: false, kingin: false, swap_key: :rook,   keini_yowai: true,  fuigai: true,  count: 1, },
+      { key: :gold,   name: "金", basic_alias: nil,  promoted_name: nil,  promoted_formal_sheet_name: nil,    other_matched_promoted_names: nil,   sfen_char: "G", promotable: false, always_alive: true,  hisyakaku: false, dengaku_target: true,  tatakare_target: true,  forward_movable: true,  kogoma: true,  kingin: true,  swap_key: nil,     keini_yowai: false, fuigai: true,  count: 2, },
+      { key: :silver, name: "銀", basic_alias: nil,  promoted_name: "全", promoted_formal_sheet_name: "成銀", other_matched_promoted_names: nil,   sfen_char: "S", promotable: true,  always_alive: true,  hisyakaku: false, dengaku_target: true,  tatakare_target: true,  forward_movable: true,  kogoma: true,  kingin: true,  swap_key: nil,     keini_yowai: true,  fuigai: true,  count: 2, },
+      { key: :knight, name: "桂", basic_alias: nil,  promoted_name: "圭", promoted_formal_sheet_name: "成桂", other_matched_promoted_names: "今",  sfen_char: "N", promotable: true,  always_alive: false, hisyakaku: false, dengaku_target: false, tatakare_target: false, forward_movable: false, kogoma: true,  kingin: false, swap_key: nil,     keini_yowai: true,  fuigai: true,  count: 2, },
+      { key: :lance,  name: "香", basic_alias: nil,  promoted_name: "杏", promoted_formal_sheet_name: "成香", other_matched_promoted_names: "仝",  sfen_char: "L", promotable: true,  always_alive: false, hisyakaku: false, dengaku_target: false, tatakare_target: false, forward_movable: true,  kogoma: true,  kingin: false, swap_key: nil,     keini_yowai: false, fuigai: true,  count: 2, },
+      { key: :pawn,   name: "歩", basic_alias: nil,  promoted_name: "と", promoted_formal_sheet_name: nil,    other_matched_promoted_names: nil,   sfen_char: "P", promotable: true,  always_alive: false, hisyakaku: false, dengaku_target: false, tatakare_target: false, forward_movable: true,  kogoma: true,  kingin: false, swap_key: nil,     keini_yowai: true,  fuigai: false, count: 9, },
     ]
 
     class << self
@@ -130,8 +131,12 @@ module Bioshogi
         @promoted_group ||= inject({}) { |a, e| a.merge(e.promoted_names.collect { |key| [key, e] }.to_h) }
       end
 
-      def strong_pieces
-        @strong_pieces ||= find_all(&:strong)
+      def hisyakaku_pieces
+        @hisyakaku_pieces ||= find_all(&:hisyakaku)
+      end
+
+      def kingin_pieces
+        @kingin_pieces ||= find_all(&:kingin)
       end
     end
 
@@ -147,8 +152,18 @@ module Bioshogi
       promotable
     end
 
-    def core_piece?
-      core_piece
+    def xxx_kiri(...)
+      name = any_name(...)
+      name = { "龍" => "竜", "飛" => "飛車" }.fetch(name, name)
+      "#{name}切り"
+    end
+
+    def swaped
+      unless defined?(@swaped)
+        @swaped = self.class[swap_key]
+      end
+
+      @swaped
     end
 
     concerning :NameMethods do
@@ -198,6 +213,10 @@ module Bioshogi
       def promoted_names
         [promoted_name, *promoted_formal_sheet_name, *other_matched_promoted_names, csa.promoted_name].flatten.compact
       end
+
+      def to_counts_key(promoted)
+        :"#{sfen_char}#{promoted ? 1 : 0}"
+      end
     end
 
     concerning :SfenMethods do
@@ -236,7 +255,7 @@ module Bioshogi
     def piece_score
       @piece_score ||= PieceScore.fetch(key)
     end
-    delegate :any_weight, :basic_weight, :promoted_weight, :hold_weight, to: :piece_score
+    delegate :any_weight, :basic_weight, :promoted_weight, :hold_weight, :category_score, to: :piece_score
 
     def piece_pressure
       @piece_pressure ||= PiecePressure.fetch(key)

data/lib/bioshogi/piece_box.rb

@@ -2,17 +2,25 @@
 
 module Bioshogi
   class PieceBox < SimpleDelegator
-    ONE_SIDE_PIECES = "玉飛角金2銀2桂2香2歩9"
+    SOLE_PIECES = "玉飛角金2銀2桂2香2歩9"
 
     class << self
       def real_box
         new(all_piece_counts)
       end
 
+      def showcase_all
+        @showcase_all ||= real_box.freeze
+      end
+
+      def showcase_sole
+        @showcase_sole ||= new(Piece.s_to_h(SOLE_PIECES)).freeze
+      end
+
       private
 
       def all_piece_counts
-        @all_piece_counts ||= Piece.s_to_h(ONE_SIDE_PIECES * 2).freeze
+        @all_piece_counts ||= Piece.s_to_h(SOLE_PIECES * 2).freeze
       end
     end
 
@@ -89,7 +97,7 @@ module Bioshogi
     def detail_score
       object.collect { |piece_key, count|
         piece = Piece[piece_key]
-        {piece: piece.name, count: count, weight: piece.hold_weight, total: piece.hold_weight * count}
+        { piece: piece.name, count: count, weight: piece.hold_weight, total: piece.hold_weight * count }
       }
     end
 

data/lib/bioshogi/place.rb

@@ -1,4 +1,5 @@
 # frozen-string-literal: true
+
 #
 # 座標
 #
@@ -83,8 +84,13 @@ module Bioshogi
 
     attr_accessor :column, :row
 
-    # for Soldier
-    DELEGATE_METHODS = [
+    # # Soldier に生やすやつ
+    # DELEGATE_METHODS = [
+    # ]
+
+    # Soldier に生やすやつ
+    # ただの delgate ではなく soldier 側の location をこっそり受け取る
+    DELEGATE_METHODS_WITH_LOCATION = [
       *Dimension::Column::DELEGATE_METHODS,
       *Dimension::Row::DELEGATE_METHODS,
 
@@ -98,6 +104,11 @@ module Bioshogi
       :move_to_right_edge,
     ]
 
+    # flip する必要がない上下左右対称のメソッド
+    DIRECT_DELEGATE_METHODS = [
+      :both_side_without_corner?,
+    ]
+
     def initialize(column, row)
       @column = column
       @row = row
@@ -146,14 +157,14 @@ module Bioshogi
 
     # "６八銀" なら [6, 8]
     # キャッシュすると3倍速くなる
-    def to_human_int
-      @cache[:to_human_int] ||= to_a.collect(&:to_human_int)
+    def human_int
+      @cache[:human_int] ||= to_a.collect(&:human_int)
     end
 
     # "６八銀" なら {column:6, row:8}
     # キャッシュすると2倍速くなる
     def to_human_h
-      @cache[:to_human_h] ||= Hash[[:column, :row].zip(to_human_int)]
+      @cache[:to_human_h] ||= Hash[[:column, :row].zip(human_int)]
     end
 
     # ほぼキャッシュ効果なし。それどころか少し遅くなる。ただ配列を再生成しないのでこれでいいことにする。
@@ -184,12 +195,53 @@ module Bioshogi
 
     ################################################################################
 
+    # マンハッタン距離を返す
+    # 斜め上には2歩必要なため「結果 <= 1」とすれば 3x3 をダイヤモンド型で範囲の比較ができる
+    def manhattan_distance(other)
+      column.distance(other.column) + row.distance(other.row)
+    end
+
+    # 縦横の大きい方のマンハッタン距離を返す
+    # a.manhattan_distance_a_side_max(b) <= 2 なら a の 5x5 の中に b が含まれていることがわかる
+    def manhattan_distance_a_side_max(other)
+       [column.distance(other.column), row.distance(other.row)].max
+    end
+
+    # manhattan_distance_a_side_max の高速版
+    # other との縦横の差が radius 以下か？
+    # a.in_outer_area?(b, 2) なら a の 5x5 の中に b が含まれていることがわかる
+    # a.in_outer_area?(b, 1) なら a の 3x3 の中に b が含まれていることがわかる
+    # a.in_outer_area?(b, 0) なら a の 1x1 の中に b が含まれていることがわかる
+    def in_outer_area?(other, radius)
+      column.distance(other.column) <= radius && row.distance(other.row) <= radius
+    end
+
+    ################################################################################
+
+    # ▲視点で from からの差をベクトルで返す
+    #
+    #   Place["55"].vector_from(Place["56"]) == V.up    # => true
+    #   Place["55"].vector_from(Place["54"]) == V.down  # => true
+    #   Place["55"].vector_from(Place["45"]) == V.left  # => true
+    #   Place["55"].vector_from(Place["65"]) == V.right # => true
+    def vector_from(from)
+      V[column.value - from.column.value, row.value - from.row.value]
+    end
+
+    def vector_to(to)
+      to.vector_from(self)
+    end
+
+    ################################################################################
+
     def ==(other)
       eql?(other)
     end
 
     def <=>(other)
-      to_xy <=> other.to_xy
+      if self.class == other.class
+        to_xy <=> other.to_xy
+      end
     end
 
     def hash
@@ -212,7 +264,7 @@ module Bioshogi
 
     # 自玉の位置にいる？
     def king_default_place?(location)
-      column_is_center?(location) && bottom_spaces(location) == 0
+      column_is5?(location) && bottom_spaces(location) == 0
     end
 
     def xy_add(x, y)
@@ -231,6 +283,13 @@ module Bioshogi
       xy_add(x * location.sign_dir, y * location.sign_dir)
     end
 
+    ################################################################################ 上下左右対象
+
+    # 角を除いた両サイドにいる？
+    def both_side_without_corner?
+      @column.side_edge? && @row.top_spaces >= 1 && @row.bottom_spaces >= 1
+    end
+
     ################################################################################ location から見た上下左右に寄せた位置を返す
 
     def move_to_bottom_edge(location)
@@ -252,14 +311,14 @@ module Bioshogi
     ################################################################################ location から見た情報を返す
 
     Dimension::Column::DELEGATE_METHODS.each do |name|
-      define_method(name) do |location|
-        @column.white_then_flip(location).public_send(name)
+      define_method(name) do |location, *args|
+        @column.white_then_flip(location).public_send(name, *args)
       end
     end
 
     Dimension::Row::DELEGATE_METHODS.each do |name|
-      define_method(name) do |location|
-        @row.white_then_flip(location).public_send(name)
+      define_method(name) do |location, *args|
+        @row.white_then_flip(location).public_send(name, *args)
       end
     end
 

data/lib/bioshogi/player/other_methods.rb

@@ -3,29 +3,51 @@
 module Bioshogi
   class Player
     module OtherMethods
-      STRONG_PIECE_ALL_COUNT = Location.count * Piece.strong_pieces.count
-
       ################################################################################
 
       # 大駒コンプリートしている？
-      def strong_piece_completed?
-        strong_piece_have_count >= STRONG_PIECE_ALL_COUNT
+      def hisyakaku_piece_completed?
+        hisyakaku_piece_have_count >= hisyakaku_pieces_count_all
+      end
+
+      def hisyakaku_pieces_count_all
+        @hisyakaku_pieces_count_all ||= (Location.count * Piece.hisyakaku_pieces.sum(&:count))
+      end
+      private :hisyakaku_pieces_count_all
+
+      # 持駒を含めた大駒の数
+      def hisyakaku_piece_have_count
+        Piece.hisyakaku_pieces.sum do |e|
+          piece_box.fetch(e.key, 0) + board.soldiers_count[location.key][e.key]
+        end
+      end
+
+      ################################################################################
+
+      # 金銀コンプリートしている？
+      def kingin_piece_completed?
+        kingin_piece_have_count >= kingin_pieces_count_all
+      end
+
+      def kingin_pieces_count_all
+        @kingin_pieces_count_all ||= (Location.count * Piece.kingin_pieces.sum(&:count))
       end
+      private :kingin_pieces_count_all
 
-      # 大駒の数
-      def strong_piece_have_count
-        Piece.strong_pieces.sum do |e|
-          piece_box.fetch(e.key, 0) + board.specific_piece_count_for(location.key, e.key)
+      # 持駒を含めた金銀の数
+      def kingin_piece_have_count
+        Piece.kingin_pieces.sum do |e|
+          piece_box.fetch(e.key, 0) + board.soldiers_count[location.key][e.key]
         end
       end
 
       ################################################################################
 
-      def zengoma?
-        if board.location_piece_counts[opponent_player.location.key] == 1              # 盤上の相手の駒が1つ
-          if opponent_player.piece_box.empty?                                          # 相手の持駒がない
-            location = opponent_player.location                                        # 相手の側
-            board.soldiers.one? { |e| e.piece.key == :king && e.location == location } # 相手の残りの駒が玉か？ (最後に重い処理を持ってくる)
+      # 玉単騎状態？
+      def bare_king?
+        if board.soldiers_count_per_location[location.key] == 1 # 盤上の自分の駒が1つ
+          if soldiers_lookup1(:king).present?                    # 玉がいる
+            piece_box.empty?                                    # 持駒がない
           end
         end
       end
@@ -54,7 +76,7 @@ module Bioshogi
 
       # 圧倒的なスコアがある？
       def overwhelming_score?
-        current_score >= Piece::PieceScore.sure_victory_score
+        current_score >= Analysis::ClusterScoreInfo["圧倒的な駒得"].min_score
       end
 
       ################################################################################

data/lib/bioshogi/player/piece_box_methods.rb

@@ -9,7 +9,7 @@ module Bioshogi
         @piece_box ||= PieceBox.new
       end
 
-      def pieces_add(str = PieceBox::ONE_SIDE_PIECES)
+      def pieces_add(str = PieceBox::SOLE_PIECES)
         piece_box.add(Piece.s_to_h(str))
       end
 

data/lib/bioshogi/player/pressure_methods.rb

@@ -11,7 +11,7 @@ module Bioshogi
       # 圧力レベル(デバッグ用)
       def pressure_report
         rows = []
-        rows += soldiers.collect { |e| {"盤上" => e, "勢力" => e.pressure_level} }
+        rows += soldiers.collect { |e| { "盤上" => e, "勢力" => e.pressure_level } }
         rows += piece_box.collect { |piece_key, count|
           piece = Piece[piece_key]
           {
@@ -19,9 +19,9 @@ module Bioshogi
             "持駒" => "#{piece}#{count}",
           }
         }
-        rows += [{"勢力" => "合計 #{pressure_level}"}]
-        rows += [{"勢力" => "終盤率 #{pressure_rate}"}]
-        rows += [{"勢力" => "序盤率 #{1.0 - pressure_rate}"}]
+        rows += [{ "勢力" => "合計 #{pressure_level}" }]
+        rows += [{ "勢力" => "終盤率 #{pressure_rate}" }]
+        rows += [{ "勢力" => "序盤率 #{1.0 - pressure_rate}" }]
         rows
       end
 

data/lib/bioshogi/player/soldier_methods.rb

@@ -3,16 +3,32 @@
 module Bioshogi
   class Player
     module SoldierMethods
-      def core_soldier(piece_key)
-        board.core_soldier_places_hash.dig(location.key, piece_key)
+      ################################################################################
+
+      # O(1)
+      def soldiers_lookup1(piece_key)
+        board.soldiers_lookup1(location.key, piece_key)
       end
 
+      # O(1)
       def king_soldier
-        core_soldier(:king)
+        soldiers_lookup1(:king).first
+      end
+
+      def king_soldier_only_one_exist?
+        soldiers_lookup1(:king).size == 1
       end
 
       ################################################################################
 
+      # O(1)
+      def soldiers_lookup2(...)
+        board.soldiers_lookup2(location.key, ...)
+      end
+
+      ################################################################################
+
+      # O(n)
       def soldiers
         board.surface.values.find_all { |e| e.location == location }
       end
@@ -21,6 +37,8 @@ module Bioshogi
         soldiers.collect(&:name_without_location).sort.join(" ")
       end
 
+      ################################################################################ 得点
+
       # 入玉宣言時の盤上にある駒の得点合計
       def soldiers_ek_score
         soldiers.sum(&:ek_score)

data/lib/bioshogi/player.rb

@@ -21,12 +21,13 @@ module Bioshogi
     end
 
     def execute(str, options = {})
+      # @executor に入れている理由は最後に実行した情報を保持するためらしい
       @executor = (options[:executor_class] || PlayerExecutor::Human).new(self, str, options)
       @executor.execute
     end
 
     def opponent_player
-      @container.player_at(location.flip)
+      container.player_at(location.flip)
     end
 
     # 自分と相手
@@ -90,10 +91,10 @@ module Bioshogi
       end
     end
 
-    def skill_set
-      @skill_set ||= Analysis::SkillSet.new
+    def tag_bundle
+      @tag_bundle ||= Analysis::TagBundle.new
     end
-    delegate :attack_infos, :defense_infos, to: :skill_set
+    delegate :attack_infos, :defense_infos, to: :tag_bundle
 
     def single_clock
       @single_clock ||= SingleClock.new