bioshogi 0.0.17 → 0.0.18

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    bioshogi (0.0.17)
+    bioshogi (0.0.18)
       actionview
       activesupport (>= 7.1.0)
       benchmark
-      color
+      color (< 2.0.0)
       faraday
       memory_record
       nkf
@@ -20,13 +20,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (8.0.2)
-      activesupport (= 8.0.2)
+    actionview (8.0.2.1)
+      activesupport (= 8.0.2.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (8.0.2)
+    activesupport (8.0.2.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -39,97 +39,140 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    ast (2.4.3)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.3)
     builder (3.3.0)
     byebug (12.0.0)
     coderay (1.1.3)
     color (1.8)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
+    connection_pool (2.5.4)
     crass (1.0.6)
-    diff-lcs (1.6.1)
+    diff-lcs (1.6.2)
     docile (1.4.1)
-    drb (2.2.1)
+    drb (2.2.3)
     erubi (1.13.1)
-    faraday (2.12.2)
+    faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.0)
+    faraday-net_http (3.4.1)
       net-http (>= 0.5.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.10.2)
+    json (2.13.2)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
     logger (1.7.0)
-    loofah (2.24.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    memory_record (0.0.20)
+    memory_record (0.0.22)
       activesupport
     method_source (1.1.0)
-    mini_portile2 (2.8.8)
+    mini_portile2 (2.8.9)
     minitest (5.25.5)
     net-http (0.6.0)
       uri
     nkf (0.2.0)
-    nokogiri (1.18.6)
+    nokogiri (1.18.9)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     observer (0.1.2)
-    pkg-config (1.6.0)
+    parallel (1.27.0)
+    parser (3.3.9.0)
+      ast (~> 2.4.1)
+      racc
+    pkg-config (1.6.4)
     power_assert (2.0.5)
+    prism (1.5.0)
     pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     racc (1.8.1)
-    rails-dom-testing (2.2.0)
+    rack (3.2.1)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rake (13.2.1)
-    rmagick (6.1.1)
+    rainbow (3.1.1)
+    rake (13.3.0)
+    regexp_parser (2.11.2)
+    rmagick (6.1.4)
       observer (~> 0.1)
       pkg-config (~> 1.4)
-    rspec (3.13.0)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.3)
+    rspec-core (3.13.5)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.2)
-    rubyzip (2.4.1)
+    rspec-support (3.13.5)
+    rubocop (1.80.2)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.46.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.26.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rails (2.33.3)
+      activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
+      rack (>= 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rails-omakase (1.1.0)
+      rubocop (>= 1.72)
+      rubocop-performance (>= 1.24)
+      rubocop-rails (>= 2.30)
+    ruby-progressbar (1.13.0)
+    rubyzip (3.1.0)
     securerandom (0.4.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     stackprof (0.2.27)
     systemu (2.6.5)
     table_format (0.0.17)
       activesupport
       nkf
-    test-unit (3.6.7)
+    test-unit (3.7.0)
       power_assert
-    thor (1.3.2)
+    thor (1.4.0)
     tree_support (0.1.9)
       activesupport
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
     uri (1.0.3)
-    zeitwerk (2.7.2)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   ruby
@@ -141,9 +184,10 @@ DEPENDENCIES
   pry
   rake
   rspec
+  rubocop-rails-omakase
   simplecov
   stackprof
   test-unit
 
 BUNDLED WITH
-   2.6.3
+   2.7.1

data/bioshogi.gemspec

@@ -28,13 +28,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "byebug"
+  spec.add_development_dependency "rubocop-rails-omakase"
 
   spec.add_dependency "activesupport", ">= 7.1.0"
   spec.add_dependency "actionview"
   spec.add_dependency "table_format"
   spec.add_dependency "memory_record"
   spec.add_dependency "tree_support"
-  spec.add_dependency "color"
+  spec.add_dependency "color", "< 2.0.0"
   spec.add_dependency "zeitwerk"
   spec.add_dependency "thor"
   spec.add_dependency "rmagick", ">= 5.0.0"

data/lib/bioshogi/ai/evaluator/attack_weight_table.rb

@@ -3,7 +3,6 @@
 module Bioshogi
   module AI
     module Evaluator
-
       # http://www.yss-aya.com/book.html
       AttackWeightTable = {
         # 相手玉近くの自分の金銀の価値

data/lib/bioshogi/ai/evaluator/base.rb

@@ -21,7 +21,7 @@ module Bioshogi
 
         # 自分基準評価値
         def score
-          Bioshogi.run_counts["#{self.class.name}#score"] += 1
+          Bioshogi.method_run_counts["#{self.class.name}#score"] += 1
           score_compute
         end
 

data/lib/bioshogi/ai/evaluator/level3.rb

@@ -14,7 +14,7 @@ module Bioshogi
               "序終盤合計"     => total_score(player),
             }
           end
-          rows += [{"全体" => score_compute}]
+          rows += [{ "全体" => score_compute }]
         end
 
         private
@@ -83,9 +83,8 @@ module Bioshogi
         # target: 対象玉 (自分側 or 相手側)
         # key: :attack or :defense
         def a_d_score_of(player, target, key)
-          king_place = target.king_place
           table = AttackWeightTable[key]
-          player.soldiers.sum { |e| soldier_score_for_scene(e, king_place, table) }
+          player.soldiers.sum { |e| soldier_score_for_scene(e, target.king_soldier.place, table) }
         end
 
         # 盤上の駒の位置による重み

data/lib/bioshogi/ai/evaluator/level4.rb

@@ -14,7 +14,7 @@ module Bioshogi
               "合計"           => total_score(player),
             }
           end
-          rows += [{"差(自分基準)" => score_compute}]
+          rows += [{ "差(自分基準)" => score_compute }]
         end
 
         private

data/lib/bioshogi/alias_mod.rb

@@ -0,0 +1,35 @@
+module Bioshogi
+  module AliasMod
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def lookup(v)
+        super || invert_table[key_cast(v)]
+      end
+
+      private
+
+      def invert_table
+        # class に secondary_key (シンボル) を定義する場合
+        #
+        # @invert_table ||= inject({}.with_indifferent_access) do |a, e|
+        #   key = respond_to?(:secondary_key) ? secondary_key : nil
+        #   Array(key).flatten.compact.inject(a) do |a, key|
+        #     if value = e.send(key)
+        #       a = a.merge(value => e)
+        #     end
+        #     a
+        #   end
+        # end
+
+        # instance に値を定義する場合
+        @invert_table ||= inject({}.with_indifferent_access) do |a, object|
+          value = object.respond_to?(:secondary_key) ? object.secondary_key : nil
+          Array(value).flatten.compact.inject(a) do |a, value|
+            a.merge(value => object)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bioshogi/analysis/abbrev_expander.rb

@@ -0,0 +1,48 @@
+# frozen-string-literal: true
+
+module Bioshogi
+  module Analysis
+    class AbbrevExpander
+      SUFFIX_LIST = ["戦法", "囲い", "流", "型"]
+
+      attr_reader :str
+
+      class << self
+        def expand(...)
+          new(...).call
+        end
+      end
+
+      def initialize(str)
+        @str = str.strip
+      end
+
+      def call
+        if @str.blank?
+          return []
+        end
+
+        # 順番重要
+        [
+          str,
+          *correct_notational_variation,
+          *SUFFIX_LIST.collect { |e| "#{strip_str}#{e}" },
+          strip_str,
+        ].compact_blank.uniq
+      end
+
+      private
+
+      def correct_notational_variation
+        [
+          str.sub(/向かい飛車/, "向飛車"),
+          str.sub(/向飛車/, "向かい飛車"),
+        ]
+      end
+
+      def strip_str
+        @strip_str ||= str.remove(/(#{SUFFIX_LIST.join("|")})\z/)
+      end
+    end
+  end
+end

data/lib/bioshogi/analysis/analyzer_mod.rb

@@ -4,10 +4,10 @@ module Bioshogi
   module Analysis
     concern :AnalyzerMod do
       def execute_after_process
-        player.used_piece_counts[hand.to_counts_key] += 1
+        player.used_soldier_counter.update(hand.used_soldier)
       end
 
-      def move_hand_process(move_hand)
+      def move_hand_process
         super
 
         if move_hand.soldier.piece.key == :king
@@ -19,28 +19,28 @@ module Bioshogi
         end
       end
 
-      # 大駒コンプリートチェック用にしか使ってない、ことはない
-      def piece_box_added(captured_soldier)
-        # 駒を取った回数の記録
-        container.kill_count += 1
+      def piece_box_added
+        super
 
-        # 駒が取られる最初の手数の記録
-        container.critical_turn ||= container.turn_info.turn_offset
+        if analysis_feature_enabled?
+          # 総キル数の記録
+          container.kill_count += 1
+          player.kill_count += 1
 
-        # 「歩と角」を除く駒が取られる最初の手数の記録
-        unless container.outbreak_turn
-          key = captured_soldier.piece.key
-          if key != :pawn && key != :bishop
-            container.outbreak_turn = container.turn_info.turn_offset
-          end
-        end
+          # 駒が取られる最初の手数の記録
+          container.critical_turn ||= container.turn_info.turn_offset
 
-        if analysis_feature_enabled?
-          TacticInfo.piece_box_added_proc_list.each do |e|
-            if instance_exec(e, captured_soldier, &e.piece_box_added_proc)
-              skill_push2(e)
+          # 「歩と角」を除く駒が取られる最初の手数の記録
+          unless container.outbreak_turn
+            key = captured_soldier.piece.key
+            if key != :pawn && key != :bishop
+              container.outbreak_turn = container.turn_info.turn_offset
+              CustomAnalyzer.new(self).call(:ct_outbreak)
             end
           end
+
+          CustomAnalyzer.new(self).call(:ct_capture)
+          CaptureAnalyzer.new(self).call
         end
       end
 
@@ -54,31 +54,16 @@ module Bioshogi
 
       def perform_analyzer
         if analysis_feature_enabled?
-          Analyzer.new(self).call
-        end
-      end
-
-      def skill_push2(skill)
-        player.skill_set.list_push(skill)   # プレイヤーの個別設定
-        skill_set.list_push(skill) # executor の方にも設定(これいる？) ← いらない
-
-        # 自分に入れる
-        # p skill
-        # p skill.add_to_self
-        if v = skill.add_to_self
-          player.skill_set.list_push(v)
-        end
-
-        # 相手に入れる
-        if v = skill.add_to_opponent
-          player.opponent_player.skill_set.list_push(v)
-          # 設計ミス
-          # skill_set.list_push(v) # ← しかし、ここで入れてしまうと 先手に後手の技が入ってしまう。つまり先後の情報を含める。
+          ShapeAnalyzer.new(self).call
+          MotionAnalyzer.new(self).call
+          EveryAnalyzer.new(self).call
+          XmotionAnalyzer.new(self).call
+          CustomAnalyzer.new(self).call(:ct_every)
         end
       end
 
-      def skill_set
-        @skill_set ||= SkillSet.new
+      def tag_bundle
+        @tag_bundle ||= TagBundle.new
       end
 
       def analysis_feature_enabled?

data/lib/bioshogi/analysis/atsumeruyo.rb

@@ -0,0 +1,19 @@
+# frozen-string-literal: true
+
+module Bioshogi
+  module Analysis
+    class Atsumeruyo
+      attr_accessor :container
+
+      def initialize(container)
+        @container = container
+      end
+
+      def call
+        # ここで hand_log.tag_bundle を収集しようかと思ったがやめ
+        # container.hand_logs.each do |hand_log|
+        # end
+      end
+    end
+  end
+end