bioshogi 0.0.15 → 0.0.17

data/lib/bioshogi/analysis/board_piece_counts_methods.rb

@@ -0,0 +1,53 @@
+# frozen-string-literal: true
+#
+# 盤上の駒数を素早く得るための仕組み
+#
+
+module Bioshogi
+  module Analysis
+    module BoardPieceCountsMethods
+      def place_on(soldier, options = {})
+        super
+        specific_piece_counts[soldier.location.key].increment(soldier.piece.key)
+        location_piece_counts.increment(soldier.location.key)
+      end
+
+      def safe_delete_on(place)
+        super.tap do |soldier|
+          if soldier
+            specific_piece_counts[soldier.location.key].decrement(soldier.piece.key)
+            location_piece_counts.decrement(soldier.location.key)
+          end
+        end
+      end
+
+      def all_clear
+        super
+        specific_piece_counts.each_value(&:clear)
+        location_piece_counts.clear
+      end
+
+      ################################################################################ 「大駒コンプリート」チェック用
+
+      # 「先後と駒」をキーにして駒数を得る
+      def specific_piece_counts
+        @specific_piece_counts ||= Location.inject({}) { |a, e| a.merge(e.key => CounterHash.new) }
+      end
+
+      # board.specific_piece_count_for(:black, :rook) で盤上の飛車の個数を取れる
+      def specific_piece_count_for(location_key, piece_key)
+        specific_piece_counts[location_key][piece_key]
+      end
+
+      ################################################################################ 「全駒」チェック用
+
+      # 「先後」をキーにして駒数を得る
+      # zengoma?
+      def location_piece_counts
+        @location_piece_counts ||= CounterHash.new
+      end
+
+      ################################################################################
+    end
+  end
+end

data/lib/bioshogi/analysis/board_piller_methods.rb

@@ -1,52 +1,30 @@
 # frozen-string-literal: true
+#
 # 駒柱判定用
-
+#
 module Bioshogi
   module Analysis
     module BoardPillerMethods
-      attr_accessor :piece_piller_by_latest_piece
-
       def place_on(soldier, options = {})
         super
-
-        c = piller_counts[soldier.place.column.value] + 1
-        if c > Dimension::Row.dimension_size
-          raise MustNotHappen, "#{soldier.place.column.hankaku_number}の列に#{c}個目の駒を配置しようとしています。棋譜を二重に読ませようとしていませんか？"
-        end
-        piller_counts[soldier.place.column.value] = c
-        self.piece_piller_by_latest_piece = (c == Dimension::Row.dimension_size) # 最後の駒が反映される
-      end
-
-      # 現在の状態は駒柱がある状態か？
-      def piece_piller_by_latest_piece?
-        piller_counts.each_value.any? { |c| c >= Dimension::Row.dimension_size } # O(n) になるので使いたくない
-      end
-
-      def all_clear
-        super
-
-        piller_counts.clear
-        self.piece_piller_by_latest_piece = false
+        piller_cop.set(soldier.place)
       end
 
       def safe_delete_on(*)
         super.tap do |soldier|
           if soldier
-            c = piller_counts[soldier.place.column.value]
-            c -= 1
-            if c.negative?
-              raise "must not happen"
-            end
-            piller_counts[soldier.place.column.value] = c
-            self.piece_piller_by_latest_piece = (c == Dimension::Row.dimension_size)
+            piller_cop.remove(soldier.place)
           end
         end
       end
 
-      private
+      def all_clear
+        super
+        piller_cop.reset
+      end
 
-      def piller_counts
-        @piller_counts ||= Hash.new(0)
+      def piller_cop
+        @piller_cop ||= PillerCop.new
       end
     end
   end

data/lib/bioshogi/analysis/core_soldier_place_methods.rb

@@ -0,0 +1,58 @@
+# frozen-string-literal: true
+#
+# 大駒の位置をO(1)で得るための履歴
+#
+
+module Bioshogi
+  module Analysis
+    module CoreSoldierPlaceMethods
+      def place_on(soldier, options = {})
+        super
+        if soldier.piece.core_piece?
+          core_soldier_places_hash[soldier.location.key][soldier.piece.key] = soldier
+        end
+      end
+
+      def safe_delete_on(place)
+        super.tap do |soldier|
+          if soldier
+            if soldier.piece.core_piece?
+              core_soldier_places_hash[soldier.location.key].delete(soldier.piece.key)
+            end
+          end
+        end
+      end
+
+      def all_clear
+        super
+        core_soldier_places_hash.each_value(&:clear)
+      end
+
+      ################################################################################ 玉飛角の位置を瞬時に得るためのテーブル
+
+      def core_soldier_places_hash
+        @core_soldier_places_hash ||= Location.inject({}) { |a, e| a.merge(e.key => {}) }
+      end
+
+      # # board.specific_piece_count_for(:black, :rook) で盤上の飛車の個数を取れる
+      def core_soldier_places_for(location_key, piece_key)
+        core_soldier_places_hash.dig(location_key, piece_key)&.place
+      end
+
+      # # board.specific_piece_count_for(:black, :rook) で盤上の飛車の個数を取れる
+      # def specific_piece_count_for(location_key, piece_key)
+      #   core_soldier_places_hash[location_key][piece_key]
+      # end
+
+      # ################################################################################ 「全駒」チェック用
+      #
+      # # 「先後」をキーにして駒数を得る
+      # # zengoma?
+      # def location_piece_counts
+      #   @location_piece_counts ||= CounterHash.new
+      # end
+      #
+      # ################################################################################
+    end
+  end
+end

data/lib/bioshogi/analysis/defense_info.rb

@@ -173,6 +173,15 @@ module Bioshogi
       def pawn_bishop_have_ok
         nil
       end
+
+      class << self
+        def anaguma_elems
+          @anaguma_elems ||= yield_self do
+            anaguma = NoteInfo.fetch(:"穴熊")
+            find_all { |e| e.add_to_self == anaguma }
+          end
+        end
+      end
     end
   end
 end