bioshogi 0.0.13 → 0.0.15

data/lib/bioshogi/{explain → analysis}//346/211/213/347/255/213//351/212/200/345/206/240/343/201/256/345/260/217/351/203/250/345/261/213.kif

@@ -1,11 +1,14 @@
-先手の囲い：舟囲い, 天守閣美濃, 端玉銀冠
-後手の囲い：高美濃囲い, 銀冠
-先手の戦型：腰掛け銀, 右四間飛車, 右四間飛車急戦
-後手の戦型：四間飛車
-先手の備考：居飛車, 対振り, 対抗型
-後手の備考：振り飛車, 対抗型
 手合割：平手
+先手の戦法：右四間飛車急戦
+後手の戦法：四間飛車
+先手の囲い：端玉銀冠
+後手の囲い：銀冠
+先手の手筋：一間竜
 後手の手筋：銀冠の小部屋
+先手の備考：対振り飛車, 居飛車, 対抗形, 持久戦, 短手数
+後手の備考：振り飛車, 対居飛車, 対抗形, 持久戦, 短手数
+先手の棋風：準王道
+後手の棋風：王道
 手数----指手---------消費時間--
    1 ７六歩(77)
    2 ３四歩(33)
@@ -13,7 +16,7 @@
    4 ４四歩(43)
    5 ６八玉(59)
    6 ４二飛(82)
-*△戦型：四間飛車
+*△戦法：四間飛車
 *△備考：振り飛車
    7 ７八玉(68)
    8 ６二玉(51)
@@ -32,10 +35,10 @@
   18 ５二金(41)
 *△囲い：美濃囲い
   19 ５六銀(47)
-*▲戦型：腰掛け銀
+*▲戦法：腰掛け銀
   20 ６四歩(63)
   21 ４八飛(28)
-*▲戦型：右四間飛車, 右四間飛車急戦
+*▲戦法：右四間飛車急戦
   22 ６三金(52)
 *△囲い：高美濃囲い
   23 １六歩(17)
@@ -81,6 +84,7 @@
   60 ９三玉(82)
 *△手筋：銀冠の小部屋
   61 ９一飛成(21)
+*▲手筋：一間竜
   62 ９二香打
   63 投了
 まで62手で後手の勝ち

data/lib/bioshogi/analysis.rb

@@ -0,0 +1,4 @@
+module Bioshogi
+  module Analysis
+  end
+end

data/lib/bioshogi/application_memory_record.rb

@@ -3,22 +3,15 @@ module Bioshogi
 
   concern :ApplicationMemoryRecord do
     included do
-      include MemoryRecord
+      unless self < MemoryRecord
+        include MemoryRecord
+      end
 
-      def self.fetch(*)
+      def self.fetch(...)
         super
       rescue KeyError => error
         raise KeyNotFound, error.message
       end
-
-      # fetch できなかったとき default_key が指すレコードを返す
-      def self.safe_fetch(key)
-        v = lookup(key)
-        unless v
-          v = fetch(default_key)
-        end
-        v
-      end
     end
 
     def inspect

data/lib/bioshogi/assertion.rb

@@ -1,18 +1,22 @@
+# frozen-string-literal: true
+
 module Bioshogi
   module Assertion
     extend self
 
-    def assert(actual = nil, message = "assert failed", &block)
+    def assert(actual = nil, message = nil, &block)
       if block_given?
         actual = yield
       end
       unless actual
+        message ||= "assert failed"
         raise MustNotHappen, "#{message}: #{actual.inspect}"
       end
     end
 
-    def assert_equal(expected, actual, message = "assert_equal failed")
+    def assert_equal(expected, actual, message = nil)
       if expected != actual
+        message ||= "assert_equal failed"
         raise MustNotHappen, "#{message}: #{expected.inspect} != #{actual.inspect}"
       end
     end

data/lib/bioshogi/assets/kifu_formats/sample.ki2

@@ -8,11 +8,11 @@
 戦型：ゴキゲン中飛車
 先手の囲い：居飛車穴熊
 後手の囲い：片美濃囲い, 銀冠
-先手の戦型：対振り持久戦, 三間飛車
+先手の戦法：対振り持久戦, 三間飛車
 先手の手筋：垂れ歩
 後手の手筋：垂れ歩
-先手の備考：居飛車, 対振り, 対抗型
-後手の備考：振り飛車, 対抗型
+先手の備考：居飛車, 対振り飛車, 対抗形
+後手の備考：振り飛車, 対抗形
 
 ▲２六歩   △３四歩   ▲２五歩 △３三角   ▲７六歩   △４二銀   ▲４八銀   △５四歩 ▲６八玉 △５五歩
 ▲３六歩   △５二飛   ▲３七銀 △５三銀   ▲４六銀   △４四銀   ▲５八金右 △６二玉 ▲７八玉 △７二玉

data/lib/bioshogi/board/basic.rb

@@ -17,7 +17,7 @@ module Bioshogi
       include ReaderMethods
       include TechniqueMatcherMethods
 
-      prepend Explain::BoardPillerMethods
+      prepend Analysis::BoardPillerMethods
       prepend PieceCountsMethods
     end
   end

data/lib/bioshogi/board/csa_formatter.rb

@@ -18,8 +18,8 @@ module Bioshogi
       end
 
       def to_s
-        Dimension::PlaceY.dimension.times.collect { |y|
-          "P#{y.next}" + Dimension::PlaceX.dimension.times.collect { |x|
+        Dimension::Row.dimension_size.times.collect { |y|
+          "P#{y.next}" + Dimension::Column.dimension_size.times.collect { |x|
             place = Place.fetch([x, y])
             soldier_to_str(@board.surface[place])
           }.join + "\n"

data/lib/bioshogi/board/kakinoki_formatter.rb

@@ -27,21 +27,21 @@ module Bioshogi
       private
 
       def header
-        "  " + Dimension::PlaceX.dimension.times.collect { |i| Dimension::PlaceX.fetch(i).name }.join(" ")
+        "  " + Dimension::Column.dimension_size.times.collect { |i| Dimension::Column.fetch(i).name }.join(" ")
       end
 
       def line
-        "+" + "---" * Dimension::PlaceX.dimension + "+"
+        "+" + "---" * Dimension::Column.dimension_size + "+"
       end
 
       def rows
-        Dimension::PlaceY.dimension.times.collect do |y|
-          fields = Dimension::PlaceX.dimension.times.collect do |x|
+        Dimension::Row.dimension_size.times.collect do |y|
+          fields = Dimension::Column.dimension_size.times.collect do |x|
             place = Place.fetch([x, y])
             soldier = @board.surface[place]
             cell_str(soldier)
           end
-          "|" + fields.join + "|" + Dimension::PlaceY.fetch(y).name
+          "|" + fields.join + "|" + Dimension::Row.fetch(y).name
         end
       end
 

data/lib/bioshogi/board/reader_methods.rb

@@ -13,6 +13,10 @@ module Bioshogi
         lookup(place) or raise PieceNotFoundOnBoard, "#{place}に何もありません\n#{self}"
       end
 
+      def empty_cell?(place)
+        !lookup(place)
+      end
+
       # FIXME: 空いている升の情報は駒を動かした時点で更新するようにすればこの部分の無駄な判定を減らせる
       def blank_places
         Enumerator.new do |y|
@@ -24,9 +28,9 @@ module Bioshogi
         end
       end
 
-      def vertical_pieces(x)
+      def vertical_soldiers(x)
         Enumerator.new do |yielder|
-          Dimension::PlaceY.dimension.times do |y|
+          Dimension::Row.dimension_size.times do |y|
             if soldier = lookup([x, y])
               yielder << soldier
             end
@@ -74,8 +78,8 @@ module Bioshogi
       end
 
       def to_sfen
-        Dimension::PlaceY.dimension.times.collect { |y|
-          Dimension::PlaceX.dimension.times.collect { |x|
+        Dimension::Row.dimension_size.times.collect { |y|
+          Dimension::Column.dimension_size.times.collect { |x|
             lookup([x, y])
           }.chunk(&:class).flat_map { |klass, e|
             if klass == NilClass

data/lib/bioshogi/board_parser/compare_board_parser.rb

@@ -20,11 +20,19 @@ module Bioshogi
             when "*"
               # ▲でどれかがここに含まれる
               soldier = build(place, something, :black)
-              any_exist_soldiers << soldier
+              black_any_exist_soldiers << soldier
             when "?"
               # △側でどれかがここに含まれる
               soldier = build(place, something, :white)
-              any_exist_soldiers << soldier
+              white_any_exist_soldiers << soldier
+            when "~"
+              # ▲でここに含まれない
+              soldier = build(place, something, :black)
+              black_not_exist_soldiers << soldier
+            when "^"
+              # △でここに含まれない
+              soldier = build(place, something, :black)
+              white_not_exist_soldiers << soldier
             else
               soldier = build(place, something, prefix_char)
               soldiers << soldier
@@ -45,8 +53,23 @@ module Bioshogi
       end
 
       # どれかが含まれる用
-      def any_exist_soldiers
-        @any_exist_soldiers ||= SoldierBox.new
+      def black_any_exist_soldiers
+        @black_any_exist_soldiers ||= SoldierBox.new
+      end
+
+      # どれかが含まれる用
+      def white_any_exist_soldiers
+        @white_any_exist_soldiers ||= SoldierBox.new
+      end
+
+      # 含まれない用
+      def black_not_exist_soldiers
+        @black_not_exist_soldiers ||= SoldierBox.new
+      end
+
+      # 含まれない用
+      def white_not_exist_soldiers
+        @white_not_exist_soldiers ||= SoldierBox.new
       end
 
       # 高速に比較するためにメモ化したアクセサシリーズ

data/lib/bioshogi/board_parser/kakinoki_board_parser.rb

@@ -51,7 +51,7 @@ module Bioshogi
             raise SyntaxDefact, "最初の行の横幅が#{cell_width}桁毎になっていません\n#{@source}"
           end
           count = s.gsub("---", "-").count("-")
-          @h_units = Dimension::PlaceX.char_infos.last(count)
+          @h_units = Dimension::Column.char_infos.last(count)
         else
           @h_units = s.strip.split # 一行目のX座標の単位取得。全角数字の羅列から推測する。「一 二」なら横幅2と判定できる
         end
@@ -73,7 +73,7 @@ module Bioshogi
         h_units_read
 
         mds = shape_lines.collect { |v| v.match(/\|(?<inline>.*)\|(?<y>.)?/) }.compact
-        @v_units = mds.collect.with_index { |v, i| v[:y] || Dimension::PlaceY.char_infos[i] }
+        @v_units = mds.collect.with_index { |v, i| v[:y] || Dimension::Row.char_infos[i] }
         inlines = mds.collect { |v| v[:inline] }
 
         inlines.each.with_index do |s, y|

data/lib/bioshogi/container/checkmate_yomiage.rb

@@ -51,7 +51,7 @@ module Bioshogi
         group = soldiers.group_by(&:location)
         group = group.transform_values do |soldiers|
           soldiers = soldiers.sort_by { |e|
-            [e.place.y.to_sfen, e.place.x.to_sfen]
+            [e.place.row.to_sfen, e.place.column.to_sfen]
           } # 右上から横に走査する順
           soldiers = soldiers.collect { |e|
             [e.place.yomiage, e.yomiage].join.squish

data/lib/bioshogi/container/core_methods.rb

@@ -10,8 +10,8 @@ module Bioshogi
 
       def params
         @params ||= {
-          :skill_monitor_enable           => false,
-          :skill_monitor_technique_enable => false,
+          :analyzer_enable           => false,
+          :analyzer_technique_enable => false,
           :candidate_enable               => true,
           :validate_enable                => true,
           :board_class                    => Board,

data/lib/bioshogi/container/execute_methods.rb

@@ -10,7 +10,7 @@ module Bioshogi
         end
 
         attr_writer :kill_count      # 駒を取った回数
-        attr_accessor :critical_turn # 最初の駒が取られる直前の手数           (avg: 21.6328)
+        attr_accessor :critical_turn # 最初の駒が取られる直前の手数           (avg: 22.6328)
         attr_accessor :outbreak_turn # 「歩と角」を除く駒が取られる直前の手数 (avg: 41.8402)
 
         def kill_count

data/lib/bioshogi/container/fast.rb

@@ -9,7 +9,7 @@ module Bioshogi
       include ExecuteMethods
 
       def executor_class
-        PlayerExecutor::WithoutMonitor
+        PlayerExecutor::WithoutAnalyzer
       end
     end
   end

data/lib/bioshogi/container/simple.rb

@@ -10,7 +10,7 @@ module Bioshogi
       include TestMethods
 
       def executor_class
-        PlayerExecutor::WithoutMonitor
+        PlayerExecutor::WithoutAnalyzer
       end
     end
   end

data/lib/bioshogi/converter.rb

@@ -27,6 +27,8 @@ module Bioshogi
       @files.each { |e| process_one(e) }
     end
 
+    private
+
     def process_one(in_file)
       in_file = Pathname(in_file).expand_path
       info = Parser.file_parse(in_file)
@@ -35,7 +37,7 @@ module Bioshogi
       when @options[:overwrite]
         in_file.write(str)
         puts "[overwrite] #{in_file} => #{out_file}"
-      when @options[:output_dir].present?
+      when output_dir
         out_file = output_dir + in_file.basename.sub_ext(extname)
         FileUtils.mkdir_p(out_file.dirname)
         out_file.write(str)
@@ -46,7 +48,9 @@ module Bioshogi
     end
 
     def output_dir
-      Pathname(@options[:output_dir]).expand_path
+      if v = @options[:output_dir]
+        Pathname(v).expand_path
+      end
     end
 
     def extname

data/lib/bioshogi/csa_header_info.rb

@@ -23,6 +23,8 @@ module Bioshogi
       { key: "$START_TIME:", kif_side_key: "開始日時", },
       { key: "$END_TIME:",   kif_side_key: "終了日時", },
       { key: "$OPENING:",    kif_side_key: "戦型",     },
+      { key: "$X_FINAL:",    kif_side_key: "結末",     },
+      { key: "$X_WINNER:",   kif_side_key: "勝者",     },
       {
         key: "$TIME_LIMIT:",
         kif_side_key: "持ち時間",

data/lib/bioshogi/dimension/base.rb

@@ -3,12 +3,18 @@
 module Bioshogi
   module Dimension
     class Base
-      class_attribute :dimension
-      self.dimension = 9
+      DEFAULT = 9
+      CACHE_ENABLE = true # 結局のところ white_then_flip でキャッシュは必要ないが、キャッシュすることで Place.cache_clear の適切な使用がテストできる
+
+      class_attribute :dimension_size, default: DEFAULT
 
       attr_reader :value
 
       class << self
+        def default_size?
+          dimension_size == DEFAULT
+        end
+
         def fetch(value)
           lookup(value) or raise SyntaxDefact, "座標が読み取れません : #{value.inspect}"
         end
@@ -17,8 +23,12 @@ module Bioshogi
           table[value]
         end
 
-        def dimension_set(v)
-          self.dimension = v
+        def size_reset(v)
+          self.dimension_size = v
+          cache_clear
+        end
+
+        def cache_clear
           @char_infos  = nil
           @table       = nil
           @value_range = nil
@@ -26,7 +36,7 @@ module Bioshogi
 
         def table
           @table ||= char_infos.each.with_index.inject({}) { |a, (e, i)|
-            object = new(i).freeze
+            object = new(i)
             a.merge({
                 object           => object,
                 i                => object,
@@ -37,7 +47,7 @@ module Bioshogi
           }.freeze
         end
 
-        # 幅
+        # # 幅
         def value_range
           @value_range ||= 0...char_infos.size
         end
@@ -47,6 +57,15 @@ module Bioshogi
 
       def initialize(value)
         @value = value
+
+        # freeze するためメモ化するなら @func ||= xxx ではなく @cache[:func] ||= xxx とする
+        @cache = {}
+
+        freeze
+      end
+
+      def cache_clear
+        @cache.clear
       end
 
       delegate *[
@@ -57,7 +76,7 @@ module Bioshogi
       ], to: :char_info
 
       def char_info
-        self.class.char_infos[@value]
+        self.class.char_infos[value]
       end
 
       def yomiage
@@ -65,7 +84,27 @@ module Bioshogi
       end
 
       def flip
-        self.class.fetch(self.class.char_infos.size - 1 - @value)
+        @cache[:flip] ||= self.class.fetch(dimension_size.pred - value)
+      end
+
+      def white_then_flip(location)
+        if CACHE_ENABLE
+          location = Location[location]
+          @cache["white_then_flip/#{location.key}"] ||= yield_self do
+            if location.key == :white
+              flip
+            else
+              self
+            end
+          end
+        else
+          location = Location[location]
+          if location.key == :white
+            flip
+          else
+            self
+          end
+        end
       end
 
       def ==(other)
@@ -73,7 +112,7 @@ module Bioshogi
       end
 
       def <=>(other)
-        @value <=> other.value
+        value <=> other.value
       end
 
       def eql?(other)
@@ -85,7 +124,7 @@ module Bioshogi
       end
 
       def inspect
-        "#<#{self.class.name}:#{object_id} #{name.inspect} #{@value}>"
+        "#<#{self.class.name}:#{object_id} #{name.inspect} #{value}>"
       end
     end
   end

data/lib/bioshogi/dimension/column.rb

@@ -0,0 +1,131 @@
+# frozen-string-literal: true
+
+# 方針
+# - location 考慮は Place の仕事である
+# - location を持ち込んではいけない
+# - 常に▲視点のメソッドとする
+
+module Bioshogi
+  module Dimension
+    class Column < Base
+      ONE_COLUMN = 1
+
+      class << self
+        # ["1", "2", "3"] -> ["3", "2", "1"].last(2) -> ["2", "1"]
+        def char_infos
+          @char_infos ||= CharInfo.values.reverse.last(dimension_size)
+        end
+
+        def left
+          fetch(0)
+        end
+
+        def right
+          fetch(dimension_size.pred)
+        end
+      end
+
+      def name
+        char_info.number_zenkaku
+      end
+
+      # キャッシュ効果あり
+      def to_sfen
+        @cache[:to_sfen] ||= (dimension_size - value).to_s
+      end
+
+      # 人間向けの数字で 68 なら 6
+      def to_human_int
+        dimension_size - value
+      end
+
+      ################################################################################ どれも▲から見た結果を返す
+
+      DELEGATE_METHODS = [
+        :left_spaces,
+        :right_spaces,
+
+        :column_spaces_min,
+        :left_or_right_to_closer_side,
+
+        :column_is_second_to_eighth?,
+        :column_is_second_or_eighth?,
+        :column_is_three_to_seven?,
+        :column_is_center?,
+        :column_is_edge?,
+
+        :column_is_right_side?,
+        :column_is_left_side?,
+        :column_is_right_edge?,
+        :column_is_left_edge?,
+      ]
+
+      # location から見て左方向の余白
+      def left_spaces
+        value
+      end
+
+      # location から見て右方向の余白
+      def right_spaces
+        dimension_size.pred - left_spaces
+      end
+
+      # left_spaces とright_spaces の小さい方
+      def column_spaces_min
+        [left_spaces, right_spaces].min
+      end
+
+      # 左右の壁に近づく場合の方向
+      def left_or_right_to_closer_side
+        column_is_right_side? ? :right : :left
+      end
+
+      # 2から8筋か？
+      def column_is_second_to_eighth?
+        ONE_COLUMN <= value && value <= dimension_size.pred - ONE_COLUMN
+      end
+
+      # 2または8筋か？
+      def column_is_second_or_eighth?
+        value == ONE_COLUMN || value == dimension_size.pred - ONE_COLUMN
+      end
+
+      # 3から7筋か？
+      def column_is_three_to_seven?
+        ONE_COLUMN < value && value < dimension_size.pred - ONE_COLUMN
+      end
+
+      # センターにいる？ (5の列にいる？)
+      def column_is_center?
+        value == dimension_size / 2
+      end
+
+      # 端？
+      def column_is_edge?
+        column_is_left_edge? || column_is_right_edge?
+      end
+
+      # 右側か？
+      def column_is_right_side?
+        value > dimension_size / 2
+      end
+
+      # 左側か？
+      def column_is_left_side?
+        value < dimension_size / 2
+      end
+
+      # 右端か？
+      def column_is_right_edge?
+        value == dimension_size.pred
+      end
+
+      # 左端か？
+      def column_is_left_edge?
+        value == 0
+      end
+
+      ################################################################################
+    end
+  end
+end