bioshogi 0.0.15 → 0.0.18

data/lib/bioshogi/counter_hash.rb

@@ -0,0 +1,35 @@
+# 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/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

data/lib/bioshogi/dimension/column.rb

@@ -8,8 +8,6 @@
 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
@@ -17,11 +15,15 @@ module Bioshogi
         end
 
         def left
-          fetch(0)
+          first
         end
 
         def right
-          fetch(dimension_size.pred)
+          last
+        end
+
+        def center
+          half
         end
       end
 
@@ -29,100 +31,125 @@ module Bioshogi
         char_info.number_zenkaku
       end
 
-      # キャッシュ効果あり
-      def to_sfen
-        @cache[:to_sfen] ||= (dimension_size - value).to_s
-      end
-
       # 人間向けの数字で 68 なら 6
-      def to_human_int
+      def human_int
         dimension_size - value
       end
 
+      def to_sfen
+        @cache[:to_sfen] ||= human_int.to_s
+      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?,
+        :distance_from_center,
+
+        :left_space,
+        :right_space,
+
+        :left_right_space_min,
+
+        :column_eq?,
+        :column_is2to8?,
+        :column_is2or8?,
+        :column_is3to7?,
+        :column_is5?,
+
+        :side_edge?,
+        :right_edge?,
+        :left_edge?,
+
+        :right_side?,
+        :left_side?,
+        :left_or_right,
+        :left_or_right_dir_to_center,
       ]
 
-      # location から見て左方向の余白
-      def left_spaces
+      ################################################################################
+
+      # 半分の位置からの距離
+      def distance_from_center
+        distance_from_half
+      end
+
+      def left_space
         value
       end
 
-      # location から見て右方向の余白
-      def right_spaces
-        dimension_size.pred - left_spaces
+      def right_space
+        dimension_size.pred - left_space
       end
 
-      # left_spaces とright_spaces の小さい方
-      def column_spaces_min
-        [left_spaces, right_spaces].min
+      def left_right_space_min
+        [left_space, right_space].min
       end
 
-      # 左右の壁に近づく場合の方向
-      def left_or_right_to_closer_side
-        column_is_right_side? ? :right : :left
+      ################################################################################
+
+      def column_eq?(v)
+        human_int == v
       end
 
-      # 2から8筋か？
-      def column_is_second_to_eighth?
-        ONE_COLUMN <= value && value <= dimension_size.pred - ONE_COLUMN
+      def column_is2to8?
+        human_int.in?(2..8)
       end
 
-      # 2または8筋か？
-      def column_is_second_or_eighth?
-        value == ONE_COLUMN || value == dimension_size.pred - ONE_COLUMN
+      def column_is2or8?
+        column_eq?(2) || column_eq?(8)
       end
 
-      # 3から7筋か？
-      def column_is_three_to_seven?
-        ONE_COLUMN < value && value < dimension_size.pred - ONE_COLUMN
+      def column_is3to7?
+        human_int.in?(3..7)
       end
 
-      # センターにいる？ (5の列にいる？)
-      def column_is_center?
+      def column_is3or7?
+        column_eq?(3) || column_eq?(7)
+      end
+
+      def column_is5?
         value == dimension_size / 2
       end
 
-      # 端？
-      def column_is_edge?
-        column_is_left_edge? || column_is_right_edge?
+      ################################################################################
+
+      def side_edge?
+        left_edge? || right_edge?
+      end
+
+      def right_edge?
+        value == dimension_size.pred
+      end
+
+      def left_edge?
+        value == 0
       end
 
-      # 右側か？
-      def column_is_right_side?
+      ################################################################################
+
+      def right_side?
         value > dimension_size / 2
       end
 
-      # 左側か？
-      def column_is_left_side?
+      def left_side?
         value < dimension_size / 2
       end
 
-      # 右端か？
-      def column_is_right_edge?
-        value == dimension_size.pred
+      def left_or_right
+        case
+        when right_side?
+          :right
+        when left_side?
+          :left
+        else
+          nil
+        end
       end
 
-      # 左端か？
-      def column_is_left_edge?
-        value == 0
+      def left_or_right_dir_to_center
+        if v = left_or_right
+          v == :right ? :left : :right
+        end
       end
 
       ################################################################################

data/lib/bioshogi/dimension/dimension_info.rb

@@ -17,7 +17,7 @@ module Bioshogi
         private
 
         def invert_table
-          @invert_table ||= inject({}) {|a, e| a.merge(e.wh => e) }
+          @invert_table ||= inject({}) { |a, e| a.merge(e.wh => e) }
         end
       end
     end

data/lib/bioshogi/dimension/row.rb

@@ -11,11 +11,15 @@ module Bioshogi
         end
 
         def top
-          fetch(0)
+          first
         end
 
         def bottom
-          fetch(dimension_size.pred)
+          last
+        end
+
+        def middle
+          half
         end
 
         def promotable_depth_set(value)
@@ -48,31 +52,43 @@ module Bioshogi
       end
 
       # 人間向けの数字で 68 なら 8
-      def to_human_int
-        value + 1
+      def human_int
+        top_spaces + 1
       end
 
       ################################################################################ すべて▲から見た結果を返す
 
       DELEGATE_METHODS = [
+        :distance_from_middle,
         :top_spaces,
         :bottom_spaces,
         :opp_side?,
         :not_opp_side?,
         :own_side?,
         :not_own_side?,
+        :middle_row?,
+        :funoue_line_ni_uita?,
+        :kurai_ue?,
+        :row_is_gt4_lteq5?,
+        :row_is_4to5?,
+        :kurai?,
         :kurai_sasae?,
         :just_nyuugyoku?,
-        :atoippo_nyuugyoku?,
+        :next_nyugyoku?,
         :tarefu_desuka?,
       ]
 
-      # 自分の側の一番上を0としてあとどれだけで突き当たるかの値 (例えば7段目であれば6を返す)
+      # 半分の位置からの距離
+      def distance_from_middle
+        distance_from_half
+      end
+
+      # 自分の側の一番上を0としてあとどれだけで突き当たるかの値 (例えば7行目であれば6を返す)
       def top_spaces
         value
       end
 
-      # 自分の側の一番下を0として底辺までの高さを返す (例えば7段目であれば2を返す)
+      # 自分の側の一番下を0として底辺までの高さを返す (例えば7行目であれば2を返す)
       # ここはキャッシュしない方が早い
       def bottom_spaces
         dimension_size.pred - top_spaces
@@ -98,13 +114,46 @@ module Bioshogi
         !own_side?
       end
 
+      # 4..6行目？
+      def middle_row?
+        not_own_side? && not_opp_side?
+      end
+
+      # 浮き飛車状態？
+      def funoue_line_ni_uita?
+        bottom_spaces == promotable_depth
+      end
+
+      # 位(真ん中の行)の一つ上か？
+      # 4
+      def kurai_ue?
+        top_spaces == (dimension_size / 2 - 1)
+      end
+
+      # (相手の陣地 + 1)よりこっちで、位以上
+      # つまり通常の盤面だと5行目だけが該当する
+      # 5..5
+      def row_is_gt4_lteq5?
+        promotable_depth < top_spaces && top_spaces <= (dimension_size / 2)
+      end
+
+      # 4..5
+      def row_is_4to5?
+        promotable_depth <= top_spaces && top_spaces <= (dimension_size / 2)
+      end
+
+      # 位(真ん中の行)か？
+      def kurai?
+        top_spaces == (dimension_size / 2)
+      end
+
       # 位を支える位置(中央の1行下)か？
       # ここらは数字にしてはいけない
       # 「コード上の整数」「将棋の意味での段数」「意味を持つ位置」なのか区別がつかなくなる
       # 位置に意味を持たせた命名にする
       # つまり「6」ではなく「位を支える位置」として命名する
       def kurai_sasae?
-        value == (dimension_size / 2 + 1)
+        top_spaces == (dimension_size / 2 + 1)
       end
 
       # 玉が初めて入玉した位置か？
@@ -113,11 +162,11 @@ module Bioshogi
       end
 
       # 玉があと一歩で入玉できる位置か？
-      def atoippo_nyuugyoku?
+      def next_nyugyoku?
         top_spaces == promotable_depth
       end
 
-      # 垂れ歩状態か？ (つまり2, 3, 4段目)
+      # 垂れ歩状態か？ (つまり2, 3, 4行目)
       def tarefu_desuka?
         top_spaces.between?(1, promotable_depth)
       end

data/lib/bioshogi/{extreme_validator.rb → extreme_detect.rb}

@@ -2,15 +2,15 @@ require "benchmark"
 require "diff/lcs"
 
 module Bioshogi
-  class ExtremeValidator
+  class ExtremeDetect
     def initialize(options = {})
       @options = {
-        :limit => nil,
+        :max => ENV["MAX"],
       }.merge(options)
     end
 
     def call
-      # Bioshogi.config[:analyzer_enable] = false
+      # Bioshogi.config[:analysis_feature] = false
 
       error_body.delete rescue nil
       result = Hash.new(0)
@@ -48,10 +48,17 @@ module Bioshogi
       p result
     end
 
-    def assert_equal(a, b)
+    def assert_equal(a, b, messsage = nil)
+      if true
+        # sfen になると情報が欠けて指し手だけから「穴熊の姿焼き」が判定できないため
+        a = a.gsub(/\*.*穴熊の姿焼き.*\R/, "")
+        b = b.gsub(/\*.*穴熊の姿焼き.*\R/, "")
+      end
+
       r = a == b
       unless r
-        diff(a, b)
+        diff_str = diff(a, b, messsage)
+        puts diff_str
       end
 
       result[r] += 1
@@ -62,6 +69,7 @@ module Bioshogi
         error_body.open("a") do |e|
           e.puts "-" * 80
           e.puts @current.expand_path
+          e.puts diff_str
           e.puts caller
           e.puts "◆a"
           e.puts a
@@ -71,16 +79,18 @@ module Bioshogi
       end
     end
 
-    def diff(str1, str2)
+    def diff(str1, str2, messsage)
       diff = Diff::LCS.sdiff(*[str1, str2].collect { |e| e.lines.collect(&:rstrip) }).each_with_object("") do |e, m|
         if e.old_element != e.new_element
           m << "- #{e.old_element}\n" if e.old_element
           m << "+ #{e.new_element}\n" if e.new_element
         end
       end
-      puts "--------------------------------------------------------------------------------"
-      puts diff
-      puts "--------------------------------------------------------------------------------"
+      str = []
+      str << "-------------------------------------------------------------------------------- #{messsage}\n"
+      str << diff
+      str << "--------------------------------------------------------------------------------\n"
+      str.join
     end
 
     def all_transform_test
@@ -88,31 +98,31 @@ module Bioshogi
 
       # KIF
       v = Parser.parse(info.to_kif)
-      assert_equal v.to_kif(has_header: false), info.to_kif(has_header: false)
-      assert_equal v.to_ki2(has_header: false), info.to_ki2(has_header: false)
-      assert_equal v.to_csa(has_header: false), info.to_csa(has_header: false)
-      assert_equal v.to_sfen, info.to_sfen
+      assert_equal v.to_kif(has_header: false), info.to_kif(has_header: false), "kif → kif"
+      assert_equal v.to_ki2(has_header: false), info.to_ki2(has_header: false), "kif → ki2"
+      assert_equal v.to_csa(has_header: false), info.to_csa(has_header: false), "kif → csa"
+      assert_equal v.to_sfen, info.to_sfen, "kif → sfen"
 
       # KI2
       v = Parser.parse(info.to_ki2)
-      assert_equal v.to_kif(has_header: false), info.to_kif(has_header: false)
-      assert_equal v.to_ki2(has_header: false), info.to_ki2(has_header: false)
-      assert_equal v.to_csa(has_header: false), info.to_csa(has_header: false)
-      assert_equal v.to_sfen, info.to_sfen
+      assert_equal v.to_kif(has_header: false), info.to_kif(has_header: false), "ki2 → kif"
+      assert_equal v.to_ki2(has_header: false), info.to_ki2(has_header: false), "ki2 → ki2"
+      assert_equal v.to_csa(has_header: false), info.to_csa(has_header: false), "ki2 → csa"
+      assert_equal v.to_sfen, info.to_sfen, "ki2 → sfen"
 
       # CSA
       v = Parser.parse(info.to_csa)
-      assert_equal v.to_kif(has_header: false), info.to_kif(has_header: false)
-      assert_equal v.to_ki2(has_header: false), info.to_ki2(has_header: false)
-      assert_equal v.to_csa(has_header: false), info.to_csa(has_header: false)
-      assert_equal v.to_sfen, info.to_sfen
+      assert_equal v.to_kif(has_header: false), info.to_kif(has_header: false), "csa → kif"
+      assert_equal v.to_ki2(has_header: false), info.to_ki2(has_header: false), "csa → ki2"
+      assert_equal v.to_csa(has_header: false), info.to_csa(has_header: false), "csa → csa"
+      assert_equal v.to_sfen, info.to_sfen, "csa → sfen"
 
       # SFEN
       v = Parser.parse(info.to_sfen)
-      assert_equal v.to_kif(has_header: false, has_footer: false), info.to_kif(has_header: false, has_footer: false)
-      assert_equal v.to_ki2(has_header: false, has_footer: false), info.to_ki2(has_header: false, has_footer: false)
-      assert_equal v.to_csa(has_header: false, has_footer: false), info.to_csa(has_header: false, has_footer: false)
-      assert_equal v.to_sfen, info.to_sfen
+      assert_equal v.to_kif(has_header: false, has_footer: false), info.to_kif(has_header: false, has_footer: false), "sfen → kif"
+      assert_equal v.to_ki2(has_header: false, has_footer: false), info.to_ki2(has_header: false, has_footer: false), "sfen → ki2"
+      assert_equal v.to_csa(has_header: false, has_footer: false), info.to_csa(has_header: false, has_footer: false), "sfen → csa"
+      assert_equal v.to_sfen, info.to_sfen, "sfen → sfen"
     end
 
     def error_body
@@ -123,8 +133,8 @@ module Bioshogi
       @error_list ||= LOG_DIR.join("error_list.txt")
     end
 
-    def limit
-      @limit ||= (@options[:limit].presence || 1000_0000).to_i
+    def max
+      @max ||= (@options[:max].presence || 1000_0000).to_i
     end
 
     def result
@@ -138,7 +148,7 @@ module Bioshogi
         else
           files = ROOT.glob("../../2chkifu/**/*.{ki2,KI2}").sort # ~/src/2chkifu
         end
-        files.take(limit)
+        files.take(max)
       end
     end
   end