bioshogi 0.0.14 → 0.0.17

data/lib/bioshogi/assets/images/piece/portella/convert.rb

@@ -0,0 +1,89 @@
+# convert backup/WG0.png -background none -gravity north -crop 249x245+0+11 +repage -extent 249x256 WG0.png
+
+require "rmagick"
+
+[
+  # black
+  { key: "0GY", output: "BK0", shift:   0, }, # 玉
+  { key: "0HI", output: "BR0", shift:   0, }, # 飛
+  { key: "0RY", output: "BR1", shift:   0, }, # 龍
+  { key: "0KA", output: "BB0", shift:   0, }, # 角
+  { key: "0UM", output: "BB1", shift:   0, }, # 馬
+  { key: "0KI", output: "BG0", shift:   0, }, # 金
+  { key: "0GI", output: "BS0", shift:   0, }, # 銀
+  { key: "0NG", output: "BS1", shift:   0, }, # 成銀
+  { key: "0KE", output: "BN0", shift:   0, }, # 桂
+  { key: "0NK", output: "BN1", shift:   0, }, # 成桂
+  { key: "0KY", output: "BL0", shift:   0, }, # 香
+  { key: "0NY", output: "BL1", shift:   0, }, # 成香
+  { key: "0FU", output: "BP0", shift:   0, }, # 歩
+  { key: "0TO", output: "BP1", shift:   0, }, # と
+  # white
+  { key: "1OU", output: "WK0", shift:   0, }, # 王
+  { key: "1HI", output: "WR0", shift:  -2, }, # 飛
+  { key: "1RY", output: "WR1", shift:  -2, }, # 龍
+  { key: "1KA", output: "WB0", shift:  -2, }, # 角
+  { key: "1UM", output: "WB1", shift:  -2, }, # 馬
+  { key: "1KI", output: "WG0", shift:  -7, }, # 金
+  { key: "1GI", output: "WS0", shift:  -8, }, # 銀
+  { key: "1NG", output: "WS1", shift:  -8, }, # 成銀
+  { key: "1KE", output: "WN0", shift: -10, }, # 桂
+  { key: "1NK", output: "WN1", shift: -10, }, # 成桂
+  { key: "1KY", output: "WL0", shift: -11, }, # 香
+  { key: "1NY", output: "WL1", shift: -11, }, # 成香
+  { key: "1FU", output: "WP0", shift: -15, }, # 歩
+  { key: "1TO", output: "WP1", shift: -15, }, # と
+].each do |e|
+  in_file = "original/#{e[:key]}.png"
+  # system "identify #{in_file}"
+
+  image = Magick::Image.read(in_file).first
+  image.background_color = "transparent"
+  w = image.columns
+  h = image.rows
+
+  if e[:shift].negative?
+    shift = -e[:shift]
+    image = image.crop(0, shift, w, h - shift)
+    image = image.extent(w, h, 0, shift)
+  end
+
+  if e[:shift].positive?
+    shift = e[:shift]
+    image = image.crop(0, 0, w, h - shift)
+    image = image.extent(w, h, 0, -shift)
+  end
+
+  output = "#{e[:output] || e[:key]}.png"
+  image.write(output)
+  system "identify #{output}"
+  # system "open #{output}"
+end
+# >> BK0.png PNG 249x256 249x256+0+0 8-bit sRGB 21394B 0.000u 0:00.000
+# >> BR0.png PNG 249x256 249x256+0+0 8-bit sRGB 21201B 0.000u 0:00.000
+# >> BR1.png PNG 249x256 249x256+0+0 8-bit sRGB 21088B 0.000u 0:00.000
+# >> BB0.png PNG 249x256 249x256+0+0 8-bit sRGB 20445B 0.000u 0:00.000
+# >> BB1.png PNG 249x256 249x256+0+0 8-bit sRGB 21050B 0.000u 0:00.000
+# >> BG0.png PNG 249x256 249x256+0+0 8-bit sRGB 18238B 0.000u 0:00.000
+# >> BS0.png PNG 249x256 249x256+0+0 8-bit sRGB 19030B 0.000u 0:00.000
+# >> BS1.png PNG 249x256 249x256+0+0 8-bit sRGB 18668B 0.000u 0:00.000
+# >> BN0.png PNG 249x256 249x256+0+0 8-bit sRGB 18237B 0.000u 0:00.000
+# >> BN1.png PNG 249x256 249x256+0+0 8-bit sRGB 17585B 0.000u 0:00.000
+# >> BL0.png PNG 249x256 249x256+0+0 8-bit sRGB 17442B 0.000u 0:00.000
+# >> BL1.png PNG 249x256 249x256+0+0 8-bit sRGB 16914B 0.000u 0:00.000
+# >> BP0.png PNG 249x256 249x256+0+0 8-bit sRGB 15925B 0.000u 0:00.000
+# >> BP1.png PNG 249x256 249x256+0+0 8-bit sRGB 14981B 0.000u 0:00.000
+# >> WK0.png PNG 249x256 249x256+0+0 8-bit sRGB 22284B 0.000u 0:00.000
+# >> WR0.png PNG 249x256 249x258+0+2 8-bit sRGB 23687B 0.000u 0:00.000
+# >> WR1.png PNG 249x256 249x258+0+2 8-bit sRGB 22756B 0.000u 0:00.000
+# >> WB0.png PNG 249x256 249x258+0+2 8-bit sRGB 22615B 0.000u 0:00.000
+# >> WB1.png PNG 249x256 249x258+0+2 8-bit sRGB 22748B 0.000u 0:00.000
+# >> WG0.png PNG 249x256 249x263+0+7 8-bit sRGB 20611B 0.000u 0:00.000
+# >> WS0.png PNG 249x256 249x264+0+8 8-bit sRGB 20354B 0.000u 0:00.000
+# >> WS1.png PNG 249x256 249x264+0+8 8-bit sRGB 20174B 0.000u 0:00.000
+# >> WN0.png PNG 249x256 249x266+0+10 8-bit sRGB 19168B 0.000u 0:00.000
+# >> WN1.png PNG 249x256 249x266+0+10 8-bit sRGB 18829B 0.000u 0:00.000
+# >> WL0.png PNG 249x256 249x267+0+11 8-bit sRGB 18242B 0.000u 0:00.000
+# >> WL1.png PNG 249x256 249x267+0+11 8-bit sRGB 18471B 0.000u 0:00.000
+# >> WP0.png PNG 249x256 249x272+0+15 8-bit sRGB 17312B 0.000u 0:00.000
+# >> WP1.png PNG 249x256 249x272+0+15 8-bit sRGB 15967B 0.000u 0:00.000

data/lib/bioshogi/board/basic.rb

@@ -18,7 +18,8 @@ module Bioshogi
       include TechniqueMatcherMethods
 
       prepend Analysis::BoardPillerMethods
-      prepend PieceCountsMethods
+      prepend Analysis::BoardPieceCountsMethods
+      prepend Analysis::CoreSoldierPlaceMethods
     end
   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/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,10 +10,10 @@ module Bioshogi
 
       def params
         @params ||= {
-          :analyzer_enable           => false,
-          :analyzer_technique_enable => false,
-          :candidate_enable               => true,
-          :validate_enable                => true,
+          :analysis_feature           => false,
+          :analysis_technique_feature => false,
+          :ki2_function               => true,
+          :validate_feature                => true,
           :board_class                    => Board,
         }
       end

data/lib/bioshogi/counter_hash.rb

@@ -0,0 +1,34 @@
+# frozen-string-literal: true
+#
+# h = CounterHash.new
+# h[:x]                           # => 0
+# h.increment(:x)                 # => 1
+# h.keys                          # => [:x]
+# h.decrement(:x)                 # => 0
+# h.keys                          # => []
+# h.count                         # => 0
+#
+module Bioshogi
+  class CounterHash < Hash
+    def initialize
+      super(0)
+    end
+
+    def increment(key)
+      self[key] += 1
+    end
+
+    def decrement(key)
+      self[key] -= 1
+      zero_then_delete(key)
+    end
+
+    private
+
+    def zero_then_delete(key)
+      if self[key].zero?
+        delete(key)
+      end
+    end
+  end
+end

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

data/lib/bioshogi/dimension/module_methods.rb

@@ -3,39 +3,38 @@
 module Bioshogi
   module Dimension
     module ModuleMethods
-      # 一時的に盤面のサイズを変更する(テスト用)
-      #
-      #   before do
-      #     @size_save = Dimension.wh_change([3, 5])
-      #   end
-      #   after do
-      #     Dimension.wh_change(@size_save)
-      #   end
-      #
-      def wh_change(wsize, &block)
-        save_value = dimension_wh
-        h, v = wsize
-        PlaceX.dimension_set(h)
-        PlaceY.dimension_set(v)
+      def change(wh, &block)
+        save_value = current_size
+        set_wh(*wh)
         if block_given?
           begin
             yield
           ensure
-            h, v = save_value
-            PlaceX.dimension_set(h)
-            PlaceY.dimension_set(v)
+            set_wh(*save_value)
           end
         else
           save_value
         end
       end
 
+      def default_size?
+        Column.default_size? && Row.default_size?
+      end
+
       def dimension_info
-        DimensionInfo.fetch(dimension_wh)
+        DimensionInfo.fetch(current_size)
       end
 
-      def dimension_wh
-        [PlaceX.dimension, PlaceY.dimension]
+      def current_size
+        [Column.dimension_size, Row.dimension_size]
+      end
+
+      private
+
+      def set_wh(w, h)
+        Column.size_reset(w)
+        Row.size_reset(h)
+        Place.cache_clear       # 超重要
       end
     end
   end

data/lib/bioshogi/dimension/row.rb

@@ -0,0 +1,128 @@
+# frozen-string-literal: true
+
+module Bioshogi
+  module Dimension
+    class Row < Base
+      class_attribute :promotable_depth, default: 3 # 相手の陣地の成れる縦幅
+
+      class << self
+        def char_infos
+          @char_infos ||= CharInfo.take(dimension_size)
+        end
+
+        def top
+          fetch(0)
+        end
+
+        def bottom
+          fetch(dimension_size.pred)
+        end
+
+        def promotable_depth_set(value)
+          self.promotable_depth = value
+          cache_clear
+        end
+
+        # 一時的に成れない状況にする
+        def promotable_disabled(&block)
+          save_value = promotable_depth
+          promotable_depth_set(0)
+          if block_given?
+            begin
+              yield
+            ensure
+              promotable_depth_set(save_value)
+            end
+          else
+            save_value
+          end
+        end
+      end
+
+      def name
+        char_info.number_kanji
+      end
+
+      def to_sfen
+        @cache[:to_sfen] ||= ("a".ord + value).chr
+      end
+
+      # 人間向けの数字で 68 なら 8
+      def to_human_int
+        value + 1
+      end
+
+      ################################################################################ すべて▲から見た結果を返す
+
+      DELEGATE_METHODS = [
+        :top_spaces,
+        :bottom_spaces,
+        :opp_side?,
+        :not_opp_side?,
+        :own_side?,
+        :not_own_side?,
+        :kurai_sasae?,
+        :just_nyuugyoku?,
+        :atoippo_nyuugyoku?,
+        :tarefu_desuka?,
+      ]
+
+      # 自分の側の一番上を0としてあとどれだけで突き当たるかの値 (例えば7段目であれば6を返す)
+      def top_spaces
+        value
+      end
+
+      # 自分の側の一番下を0として底辺までの高さを返す (例えば7段目であれば2を返す)
+      # ここはキャッシュしない方が早い
+      def bottom_spaces
+        dimension_size.pred - top_spaces
+      end
+
+      # 相手の陣地にいる？
+      def opp_side?
+        top_spaces < promotable_depth
+      end
+
+      # 相手の陣地に入ってない？
+      def not_opp_side?
+        !opp_side?
+      end
+
+      # 自分の陣地にいる？
+      def own_side?
+        bottom_spaces < promotable_depth
+      end
+
+      # 自分の陣地にいない？
+      def not_own_side?
+        !own_side?
+      end
+
+      # 位を支える位置(中央の1行下)か？
+      # ここらは数字にしてはいけない
+      # 「コード上の整数」「将棋の意味での段数」「意味を持つ位置」なのか区別がつかなくなる
+      # 位置に意味を持たせた命名にする
+      # つまり「6」ではなく「位を支える位置」として命名する
+      def kurai_sasae?
+        value == (dimension_size / 2 + 1)
+      end
+
+      # 玉が初めて入玉した位置か？
+      def just_nyuugyoku?
+        top_spaces == promotable_depth.pred
+      end
+
+      # 玉があと一歩で入玉できる位置か？
+      def atoippo_nyuugyoku?
+        top_spaces == promotable_depth
+      end
+
+      # 垂れ歩状態か？ (つまり2, 3, 4段目)
+      def tarefu_desuka?
+        top_spaces.between?(1, promotable_depth)
+      end
+
+      ################################################################################
+    end
+  end
+end