bioshogi 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24784314ab267486f6b996069e621b34d71de864dbddfbf7000103d44ba91d4e
-  data.tar.gz: 7faa362619cdcc5f2ea82311c5e4271106fe055e04234524c97afa2efbc43303
+  metadata.gz: 72cb925a0534d5476e7ee5ef9d52887267da4d14ceacbace3b2c7c95b387a163
+  data.tar.gz: 1188cafe630894a14393c52bbacb2fef8c40372105df430765481e06a2fea903
 SHA512:
-  metadata.gz: 13b7d1e1d0ee41f1beb2cbd93344052d3d5411286846c3f3fa761eeaac2923adafeab147c3f9fbd2f002faf590ffa1e91668bc8a87c89c5fe667fa8aec02389b
-  data.tar.gz: d8344a27ca7a3466bbfccbc73751c2f06dd6da49c81018f53a71babc5adceb0d8a9f3582088dd68c32ac4133772f57060971d292b703e8ac8e9da062fdcfaa85
+  metadata.gz: '02896d309afb421910770794f0b53e96f4b7f831b0c835be5510bdb1bc693b7df7eee448512599d4884c27d8cd8bc1382e75bfdb8c4735be14894ce5734985bf'
+  data.tar.gz: 2bf6eeecced6f1202ec522f0c9be92f5522e2b635542f3e217b0dcd8e27a3b48b79df6311b3703e994db6460c1f25fd277338e611b1959376941809a351653e8

data/.dumbjump

@@ -0,0 +1,4 @@
+-coverage
+# +/opt/rbenv/versions/3.2.2/lib/ruby/gems/3.2.0/gems
+
+

data/A/342/206/222B/342/206/222C/346/210/246/346/263/225.txt

@@ -33,7 +33,7 @@ lib/bioshogi/analysis/戦法/UFO銀.kif:先手の戦法：相掛かり棒銀, UF
 lib/bioshogi/analysis/戦法/Uターン飛車.kif:後手の戦法：四間飛車, Uターン飛車
 lib/bioshogi/analysis/戦法/△2三歩戦法.kif:後手の戦法：△2三歩戦法, 一手損角換わり
 lib/bioshogi/analysis/戦法/ひねり飛車.kif:先手の戦法：相掛かり, ひねり飛車
-lib/bioshogi/analysis/戦法/ゴリラの右手.kif:先手の戦法：角換わり, ゴリラの右手
+lib/bioshogi/analysis/戦法/ゴリラの右手.kif:先手の戦法：角換わり, ゴリラの右手
 lib/bioshogi/analysis/戦法/ショーダンシステム.kif:先手の戦法：初手▲7八飛戦法, 早石田
 lib/bioshogi/analysis/戦法/ダイレクト向かい飛車.kif:後手の戦法：一手損角換わり, ダイレクト向かい飛車
 lib/bioshogi/analysis/戦法/ツノ銀中飛車.kif:後手の戦法：阪田流2手目△9四歩, 対振り持久戦, 袖飛車
@@ -58,7 +58,7 @@ lib/bioshogi/analysis/戦法/対振り持久戦.kif:先手の戦法：対振り
 lib/bioshogi/analysis/戦法/対振り持久戦.kif:後手の戦法：四間飛車, 向かい飛車
 lib/bioshogi/analysis/戦法/対矢倉急戦棒銀.kif:後手の戦法：原始棒銀, 対矢倉急戦棒銀
 lib/bioshogi/analysis/戦法/屋敷流二枚銀棒銀型.kif:先手の戦法：原始棒銀, 棒銀, 屋敷流二枚銀棒銀型
-lib/bioshogi/analysis/戦法/戸部流4→3戦法.kif:後手の戦法：角道オープン四間飛車, 戸部流4→3戦法
+lib/bioshogi/analysis/戦法/戸辺流4→3戦法.kif:後手の戦法：角道オープン四間飛車, 戸辺流4→3戦法
 lib/bioshogi/analysis/戦法/新村田システム.kif:先手の戦法：相掛かり, 新村田システム
 lib/bioshogi/analysis/戦法/新米長玉.kif:後手の戦法：新米長玉, 新嬉野流, 棒玉
 lib/bioshogi/analysis/戦法/暴銀.kif:先手の戦法：角道オープン四間飛車, 角交換振り飛車, 暴銀

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bioshogi (0.0.14)
+    bioshogi (0.0.15)
       actionview
       activesupport (>= 7.1.0)
       color

data/README.org

@@ -313,13 +313,13 @@ container.board["５九"].name # => "▲５九玉"
 *** ５五将棋の例
 
 #+BEGIN_SRC ruby
-Dimension.wh_change([5, 5])
+Dimension.change([5, 5])
 container = Container::Basic.start
 soldiers = ["５五玉", "４五金", "３五銀", "２五角", "１五飛", "５四歩"]
 container.players.each do |player|
   _soldiers = soldiers.collect{|s|
     s = Soldier.from_str(s)
-    s.merge(place: s[:place].flip_if_white(player.location))
+    s.merge(place: s[:place].white_then_flip(player.location))
   }
   player.soldier_create(_soldiers)
 end
@@ -366,7 +366,7 @@ p container
 
 #+BEGIN_SRC ruby
 Bioshogi.logger = ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT))
-Dimension.wh_change([3, 3]) do
+Dimension.change([3, 3]) do
   container = Container::Basic.new
   container.board.placement_from_human("▲３三歩 △１一歩")
   puts container

data/lib/bioshogi/ai/brain.rb

@@ -96,7 +96,7 @@ module Bioshogi
               # if true
               #   if hand.king_captured?
               #     v = -SCORE_MAX
-              #     provisional_hands << {hand: hand, score: -v, black_side_score: -v * player.location.value_sign, best_pv: [], eval_times: 0, sec: 0}
+              #     provisional_hands << {hand: hand, score: -v, black_side_score: -v * player.location.sign_dir, best_pv: [], eval_times: 0, sec: 0}
               #     mate = true
               #     break
               #   end
@@ -109,7 +109,7 @@ module Bioshogi
                 provisional_hands << {
                   :hand             => hand,
                   :score            => v,
-                  :black_side_score => v * player.location.value_sign,
+                  :black_side_score => v * player.location.sign_dir,
                   :best_pv          => pv,
                   :eval_times       => diver.eval_counter,
                   :sec              => Time.now - start_time,
@@ -168,8 +168,8 @@ module Bioshogi
         params[:diver_class].new(params.merge(args))
       end
 
-      # Dimension::PlaceY.promotable_disabled
-      # Dimension.wh_change([2, 5])
+      # Dimension::Row.promotable_disabled
+      # Dimension.change([2, 5])
       # container = Container::Basic.new
       # container.board.placement_from_shape <<~EOT
       # +------+
@@ -193,7 +193,7 @@ module Bioshogi
             {
               :hand       => hand,
               :score      => -v,
-              :socre2     => -v * player.location.value_sign,
+              :socre2     => -v * player.location.sign_dir,
               :best_pv    => pv,
               :eval_times => diver.eval_counter,
               :sec        => Time.now - start_time,
@@ -212,7 +212,7 @@ module Bioshogi
             {
               :hand       => hand,
               :score      => v,
-              :socre2     => v * player.location.value_sign,
+              :socre2     => v * player.location.sign_dir,
               :best_pv    => [],
               :eval_times => 1,
               :sec        => Time.now - start_time,

data/lib/bioshogi/analysis/analyzer.rb

@@ -12,7 +12,7 @@ module Bioshogi
       end
 
       def call
-        if e = TacticInfo.primary_soldier_hash_table[soldier]
+        if e = TacticInfo.primary_soldier_hash_table[black_side_soldier]
           e.each do |e|
             walk_counts[e.key] += 1
             execute_one(e)
@@ -21,13 +21,13 @@ module Bioshogi
 
         if executor.container.params[:analyzer_technique_enable]
           # 主に手筋用で戦法チェックにも使える
-          key = [soldier.piece.key, soldier.promoted, !!executor.drop_hand] # :PIECE_HASH_TABLE:
+          key = [soldier.piece.key, soldier.promoted, !!drop_hand] # :PIECE_HASH_TABLE:
           if e = TacticInfo.piece_hash_table[key]
             e.each do |e|
               execute_block(e) do |list|
                 walk_counts[e.key] += 1
                 cold_war_verification(e)
-                instance_eval(&e.technique_matcher_info.verify_process)
+                instance_eval(&e.technique_verify_info.func)
               end
             end
           end
@@ -46,12 +46,23 @@ module Bioshogi
 
       def execute_block(e)
         catch :skip do
-          list = player.skill_set.list_of(e)
-          yield list
+          yield
           skill_push(e)
         end
       end
 
+      def verify_if
+        unless yield
+          throw :skip
+        end
+      end
+
+      def skip_if
+        if yield
+          throw :skip
+        end
+      end
+
       def skill_push(skill)
         executor.skill_push2(skill)
 
@@ -72,7 +83,11 @@ module Bioshogi
       end
 
       def execute_one(e)
-        execute_block(e) do |list|
+        execute_block(e) do
+          list = player.skill_set.list_of(e)
+
+          ################################################################################ FIXME: 最初にチェックするのは遅いかもしれない
+
           # 美濃囲いがすでに完成していれば美濃囲いチェックはスキップ
           if list.include?(e)
             throw :skip
@@ -90,6 +105,8 @@ module Bioshogi
             throw :skip
           end
 
+          ################################################################################
+
           # 手数制限。制限を超えていたらskip
           if e.turn_limit
             if e.turn_limit < player.container.turn_info.display_turn.next
@@ -332,9 +349,19 @@ module Bioshogi
 
       ################################################################################
 
-      # 後手側の場合は先手側の座標に切り替え済み
+      # 盤上で操作し終わった駒
       def soldier
-        @soldier ||= executor.soldier.flip_if_white
+        @soldier ||= executor.soldier
+      end
+
+      # 盤上で操作し終わった駒の位置
+      def place
+        @place ||= soldier.place
+      end
+
+      # 後手側の場合は先手側の座標に切り替え済み
+      def black_side_soldier
+        @black_side_soldier ||= executor.soldier.white_then_flip
       end
 
       # 比較順序超重要。不一致しやすいものから比較する
@@ -385,6 +412,11 @@ module Bioshogi
         @origin_soldier ||= executor.origin_soldier
       end
 
+      # 盤面
+      def board
+        @board ||= player.board
+      end
+
       # 盤面
       def surface
         @surface ||= player.board.surface
@@ -395,10 +427,36 @@ module Bioshogi
         @location ||= player.location
       end
 
+      # 対戦相手の向き
+      def opponent_location
+        @opponent_location ||= location.flip
+      end
+
+      # soldier は相手の駒か？
+      def opponent?(soldier)
+        soldier.location == opponent_location
+      end
+
+      # soldier は自分の駒か？
+      def own?(soldier)
+        soldier.location == location
+      end
+
+      # 自分
       def player
         @player ||= executor.player
       end
 
+      # 打った駒の情報
+      def drop_hand
+        @drop_hand ||= executor.drop_hand
+      end
+
+      # 移動させた駒の情報
+      def move_hand
+        @move_hand ||= executor.move_hand
+      end
+
       prepend TechniqueMatcherHelper
     end
   end

data/lib/bioshogi/analysis/analyzer_mod.rb

@@ -11,7 +11,7 @@ module Bioshogi
         super
 
         if move_hand.soldier.piece.key == :king
-          # if move_hand.origin_soldier.initial_place?
+          # if move_hand.origin_soldier.king_default_place?
           #   # 元の位置から動いたか？
           # end
           player.king_moved_counter += 1 # 居玉判定用
@@ -82,14 +82,7 @@ module Bioshogi
       end
 
       def perform_analyzer_enable?
-        # return instance_variable_get("@perform_analyzer_enable_p") if instance_variable_defined?("@perform_analyzer_enable_p")
-        # @perform_analyzer_enable_p ||= yield_self do
-        if Bioshogi.config[:analyzer_enable]
-          if Dimension.dimension_info.key == :d9x9
-            container.params[:analyzer_enable]
-          end
-        end
-        # end
+        Bioshogi.config[:analyzer_enable] && container.params[:analyzer_enable] && Dimension.default_size?
       end
     end
   end