bioshogi 0.0.14 → 0.0.15

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

data/lib/bioshogi/formatter/sugatayaki_validator.rb

@@ -84,7 +84,7 @@ module Bioshogi
         if flop
           place = place.flop
         end
-        place = place.flip_if_white(lose_side_location)
+        place = place.white_then_flip(lose_side_location)
         if soldier = container.board[place]
           if soldier.location == lose_side_location
             soldier

data/lib/bioshogi/hand/drop.rb

@@ -59,7 +59,7 @@ module Bioshogi
       end
 
       def type
-        "t_drop"
+        :t_drop
       end
 
       def to_akf(options = {})

data/lib/bioshogi/hand/move.rb

@@ -35,8 +35,8 @@ module Bioshogi
       end
 
       # 成れる状態だった？
-      def promotable?
-        origin_soldier.next_promotable?(soldier.place)
+      def state_where_it_can_become_promote?
+        origin_soldier.tsugini_nareru_on?(soldier.place)
       end
 
       # 人間には読みやすいがパースは大変
@@ -84,14 +84,14 @@ module Bioshogi
       end
 
       def type
-        if promotable?
+        if state_where_it_can_become_promote?
           if promote_trigger?
-            "t_promote_on"
+            :t_promote_on
           else
-            "t_promote_throw"
+            :t_promote_throw
           end
         else
-          "t_move"
+          :t_move
         end
       end
 

data/lib/bioshogi/input_adapter/ki2_adapter.rb

@@ -86,13 +86,13 @@ module Bioshogi
               if md = v.match(/[左右]/)
                 if piece.brave?
                   m = {"左" => :first, "右" => :last}.fetch(md.to_s)
-                  m = flip_if_white(m)
-                  list = list.sort_by { |e| e.place.x.value }.send(m, 1)
+                  m = white_then_flip(m)
+                  list = list.sort_by { |e| e.place.column.value }.send(m, 1)
                 else
                   m = {"左" => :>, "右" => :<}.fetch(md.to_s)
-                  m = flip_if_white(m)
+                  m = white_then_flip(m)
                   list = list.find_all do |e|
-                    place.x.value.send(m, e.place.x.value)
+                    place.column.value.send(m, e.place.column.value)
                   end
                 end
               end
@@ -103,9 +103,9 @@ module Bioshogi
             if v = up_down
               if md = v.match(/[上引]/)
                 m = {"上" => :<, "引" => :>}.fetch(md.to_s)
-                m = flip_if_white(m)
+                m = white_then_flip(m)
                 list = list.find_all do |e|
-                  place.y.value.send(m, e.place.y.value)
+                  place.row.value.send(m, e.place.row.value)
                 end
               end
             end
@@ -115,7 +115,7 @@ module Bioshogi
           if list.size >= 2
             if v = up_down
               if v.include?("寄")
-                list = list.find_all { |e| e.place.y == place.y }
+                list = list.find_all { |e| e.place.row == place.row }
               end
             end
           end
@@ -123,9 +123,9 @@ module Bioshogi
           # 真下にあるもの
           if list.size >= 2
             if one_up?
-              y = place.y.value + player.location.which_value(1, -1)
+              y = place.row.value + player.location.which_value(1, -1)
               list = list.find_all { |e|
-                e.place.x == place.x && e.place.y.value == y
+                e.place.column == place.column && e.place.row.value == y
               }
             end
           end
@@ -144,7 +144,7 @@ module Bioshogi
         !promoted && !suffix_exist? && candidate_soldiers.empty?
       end
 
-      def flip_if_white(key)
+      def white_then_flip(key)
         if player.location.key == :white
           key = self.class.flip_table[key]
         end

data/lib/bioshogi/input_adapter/shared_validation.rb

@@ -12,7 +12,7 @@ module Bioshogi
           end
 
           if move_hand.promote_trigger?
-            unless origin_soldier.next_promotable?(place)
+            unless origin_soldier.tsugini_nareru_on?(place)
               errors_add NotPromotable, "#{origin_soldier.place}から#{place}への移動では成れません"
             end
           end

data/lib/bioshogi/location.rb

@@ -12,8 +12,8 @@ module Bioshogi
   class Location
     include ApplicationMemoryRecord
     memory_record [
-      { key: :black, name: "▲", pentagon_mark: "☗", equality_name: "先手", handicap_name: "下手", equality_yomiage: "先手", handicap_yomiage: "したて", flip_mark: "▼", varrow: " ", csa_sign: "+", angle: 0,   other_match_chars: ["☗"], to_sfen: "b", normalize_key: :itself, value_sign: +1, checkmate_yomiage: "せめかた",  },
-      { key: :white, name: "△", pentagon_mark: "☖", equality_name: "後手", handicap_name: "上手", equality_yomiage: "後手", handicap_yomiage: "うわて", flip_mark: "▽", varrow: "v", csa_sign: "-", angle: 180, other_match_chars: ["☖"], to_sfen: "w", normalize_key: :flip,   value_sign: -1, checkmate_yomiage: "gyokugata", },
+      { key: :black, name: "▲", pentagon_mark: "☗", equality_name: "先手", handicap_name: "下手", equality_yomiage: "先手", handicap_yomiage: "したて", flip_mark: "▼", varrow: " ", csa_sign: "+", angle: 0,   other_match_chars: ["☗"], to_sfen: "b", normalize_key: :itself, sign_dir: +1, checkmate_yomiage: "せめかた",  },
+      { key: :white, name: "△", pentagon_mark: "☖", equality_name: "後手", handicap_name: "上手", equality_yomiage: "後手", handicap_yomiage: "うわて", flip_mark: "▽", varrow: "v", csa_sign: "-", angle: 180, other_match_chars: ["☖"], to_sfen: "w", normalize_key: :flip,   sign_dir: -1, checkmate_yomiage: "gyokugata", },
     ]
 
     class << self
@@ -118,6 +118,26 @@ module Bioshogi
       end
     end
 
+    ################################################################################
+
+    def top
+      Dimension::Row.top.white_then_flip(self)
+    end
+
+    def bottom
+      Dimension::Row.bottom.white_then_flip(self)
+    end
+
+    def left
+      Dimension::Column.left.white_then_flip(self)
+    end
+
+    def right
+      Dimension::Column.right.white_then_flip(self)
+    end
+
+    ################################################################################
+
     private
 
     def call_name_method_name(handicap)