bioshogi 0.0.13 → 0.0.15

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/errors.rb

@@ -44,7 +44,7 @@ module Bioshogi
   class FileFormatError < BioshogiError
   end
 
-  # 手合割・囲い・戦型などのあるはずのデータがない
+  # 手合割・囲い・戦法などのあるはずのデータがない
   class KeyNotFound < BioshogiError
   end
 
@@ -75,7 +75,7 @@ module Bioshogi
   end
 
   # .kif ファイルの時間がマイナスになっている
-  class TimeMinusError < SyntaxDefact
+  class ConsumedTimeMinusError < SyntaxDefact
   end
 
   ################################################################################ ルール系 (RuleError) 人間同士で指すと現われる反則。しかし公式の棋譜には残らないグループ

data/lib/bioshogi/extreme_validator.rb

@@ -10,7 +10,7 @@ module Bioshogi
     end
 
     def call
-      # Bioshogi.config[:skill_monitor_enable] = false
+      # Bioshogi.config[:analyzer_enable] = false
 
       error_body.delete rescue nil
       result = Hash.new(0)

data/lib/bioshogi/formatter/animation/demo_builder.rb

@@ -33,7 +33,7 @@ module Bioshogi
           # bin = info.to_animation_mp4(page_duration: 0.0166666666667, end_duration: 0)
           # no_audio_file.write(bin)
 
-          file = Explain::TacticInfo.flat_lookup("トマホーク").sample_kif_file
+          file = Analysis::TacticInfo.flat_lookup("トマホーク").main_reference_file
           info = Parser.parse(file)
           bin = info.to_animation_mp4({
               :color_theme_key => :is_color_theme_real,

data/lib/bioshogi/formatter/core.rb

@@ -76,8 +76,8 @@ module Bioshogi
       def container_new
         container_class.new.tap do |e|
           e.params.update(@parser_options.slice(*[
-                :skill_monitor_enable,
-                :skill_monitor_technique_enable,
+                :analyzer_enable,
+                :analyzer_technique_enable,
                 :candidate_enable,
                 :validate_enable,
                 :validate_double_pawn_skip,
@@ -90,8 +90,8 @@ module Bioshogi
       def container_for_image
         container = Container::Basic.new
         container.params.update({
-            :skill_monitor_enable           => false,
-            :skill_monitor_technique_enable => false,
+            :analyzer_enable           => false,
+            :analyzer_technique_enable => false,
             :candidate_enable               => false,
             :validate_enable                => false,
           })
@@ -163,15 +163,18 @@ module Bioshogi
 
       def container_run_all(container)
         Runner.new(self, container).call
-        if @parser_options[:skill_monitor_enable]
+        if @parser_options[:analyzer_enable]
           SkillEmbed.new(self, container).call
+          StyleEmbed.new(self, container).call
         end
       end
 
+      # FIXME: これは skill_embed のなかだけにあればよくね？
       def skill_set_hash
         @skill_set_hash ||= {}
       end
 
+      # FIXME: メソッドが重複してね？
       def raw_header_part_hash
         pi.header.object.collect { |key, value|
           if value
@@ -234,6 +237,23 @@ module Bioshogi
           [s, *v.lines, s].collect {|e| "#{comment_mark} #{e}" }.join
         end
       end
+
+      # 勝った側を返す
+      # nil の場合もある
+      def win_side_location(container)
+        # 勝者が明示されている場合
+        # SHOGI-EXTEND 側からは常に勝者を入れている
+        # これは切断されたときどちらが切断してどちらが勝ったのか手番では判断できないため
+        if v = @pi.header["勝者"]
+          Location.fetch(v)
+        else
+          # 明示されていないかつ「投了」「時間切れ」「詰み」で終わった場合のみ、手番による勝者を信じる
+          # これは入玉の場合「指した方が負け」になるケースがあるため、入玉などは除外しないといけない
+          if @pi.win_player_collect_p
+            container.win_player.location
+          end
+        end
+      end
     end
   end
 end

data/lib/bioshogi/formatter/last_action_info.rb

@@ -31,20 +31,22 @@ module Bioshogi
     class LastActionInfo
       include ApplicationMemoryRecord
       memory_record [
-        { key: "TORYO",           kakinoki_word: "投了",       reason: nil,              draw: nil,  },
-        { key: "CHUDAN",          kakinoki_word: "中断",       reason: "切断により",     draw: nil,  },
-        { key: "SENNICHITE",      kakinoki_word: "千日手",     reason: "千日手",         draw: true, },
-        { key: "TIME_UP",         kakinoki_word: "切れ負け",   reason: "時間切れにより", draw: nil,  },
-        { key: "ILLEGAL_MOVE",    kakinoki_word: nil,          reason: "反則により",     draw: nil,  },
-        { key: "+ILLEGAL_ACTION", kakinoki_word: nil,          reason: "反則により",     draw: nil,  },
-        { key: "-ILLEGAL_ACTION", kakinoki_word: nil,          reason: "反則により",     draw: nil,  },
-        { key: "JISHOGI",         kakinoki_word: "持将棋",     reason: nil,              draw: nil,  },
-        { key: "KACHI",           kakinoki_word: nil,          reason: nil,              draw: nil,  },
-        { key: "HIKIWAKE",        kakinoki_word: nil,          reason: nil,              draw: nil,  },
-        { key: "MATTA",           kakinoki_word: "中断",       reason: nil,              draw: nil,  },
-        { key: "TSUMI",           kakinoki_word: "詰み",       reason: nil,              draw: nil,  },
-        { key: "FUZUMI",          kakinoki_word: nil,          reason: nil,              draw: nil,  },
-        { key: "ERROR",           kakinoki_word: nil,          reason: "エラーにより",   draw: nil,  },
+        # 手番による勝者判定が可能なら win_player_collect_p を true にする
+        # CHUDAN などはどちらが中断(切断)したのかもしわからない
+        { key: "TORYO",           kakinoki_word: "投了",       reason: nil,              draw: nil,  win_player_collect_p: true, },
+        { key: "CHUDAN",          kakinoki_word: "中断",       reason: "切断により",     draw: nil,  win_player_collect_p: nil,  }, # 切断の場合どちらが切断したのかわからないため win_player_collect_p: true にしてはいけない
+        { key: "SENNICHITE",      kakinoki_word: "千日手",     reason: "千日手",         draw: true, win_player_collect_p: nil,  },
+        { key: "TIME_UP",         kakinoki_word: "切れ負け",   reason: "時間切れにより", draw: nil,  win_player_collect_p: true, },
+        { key: "ILLEGAL_MOVE",    kakinoki_word: nil,          reason: "反則により",     draw: nil,  win_player_collect_p: nil,  },
+        { key: "+ILLEGAL_ACTION", kakinoki_word: nil,          reason: "反則により",     draw: nil,  win_player_collect_p: nil,  },
+        { key: "-ILLEGAL_ACTION", kakinoki_word: nil,          reason: "反則により",     draw: nil,  win_player_collect_p: nil,  },
+        { key: "JISHOGI",         kakinoki_word: "持将棋",     reason: nil,              draw: nil,  win_player_collect_p: nil,  },
+        { key: "KACHI",           kakinoki_word: nil,          reason: nil,              draw: nil,  win_player_collect_p: nil,  }, # この場合、win_player が信用できなくなり、つまりどちらが勝ったのかわからなくなる
+        { key: "HIKIWAKE",        kakinoki_word: nil,          reason: nil,              draw: nil,  win_player_collect_p: nil,  },
+        { key: "MATTA",           kakinoki_word: "中断",       reason: nil,              draw: nil,  win_player_collect_p: nil,  },
+        { key: "TSUMI",           kakinoki_word: "詰み",       reason: nil,              draw: nil,  win_player_collect_p: true, },
+        { key: "FUZUMI",          kakinoki_word: nil,          reason: nil,              draw: nil,  win_player_collect_p: nil,  },
+        { key: "ERROR",           kakinoki_word: nil,          reason: "エラーにより",   draw: nil,  win_player_collect_p: nil,  },
       ]
 
       alias csa_key key
@@ -62,15 +64,17 @@ module Bioshogi
       end
 
       def judgment_message(container)
-        s = []
-        s << "まで#{container.turn_info.turn_offset}手で"
-        s << reason
-        unless draw
-          s << container.opponent_player.call_name
-          s << "の"
-          s << "勝ち"
+        if win_player_collect_p
+          s = []
+          s << "まで#{container.turn_info.turn_offset}手で"
+          s << reason
+          unless draw
+            s << container.opponent_player.call_name # これが信じられるのは win_player_collect_p のときだけ
+            s << "の"
+            s << "勝ち"
+          end
+          s.join
         end
-        s.join
       end
     end
   end

data/lib/bioshogi/formatter/skill_embed.rb

@@ -3,7 +3,7 @@
 module Bioshogi
   module Formatter
     class SkillEmbed
-      MIN_TURN = 14
+      MIN_TURN = 14             # これ以上の手数だと対局が成立している見なす
 
       attr_accessor :xparser
       attr_accessor :container
@@ -14,6 +14,8 @@ module Bioshogi
       end
 
       def call
+        miyakodume_check
+        meijin_judgement        # 力戦より前
         rikisen_judgement
 
         # 両方が入玉していれば「相入玉」タグを追加する
@@ -22,17 +24,29 @@ module Bioshogi
 
         if @xparser.preset_info
           if @xparser.preset_info.special_piece
-            ibisha_judgement # 振り飛車でなければ居飛車
-            aiibisha_judgement              # 両方居飛車なら相居飛車
-            aihuri_judgement                # 両方振り飛車なら相振り
-            taihuri_judgement               # 片方だけが「振り飛車」なら、振り飛車ではない方に「対振り」。両方に「対抗型」
-            haisui_judgement                # 大駒がない状態で勝ったら「背水の陣」
+            ibisha_judgement    # 振り飛車でなければ居飛車(最初に判定する)
+            aiibisha_judgement  # 両方居飛車なら相居飛車
+            taiibisya_judgement # 相手が居飛車なら対居飛車
+            aihuri_judgement   # 両方振り飛車なら相振り
+            taikoukei_judgement  # 片方だけが「振り飛車」なら、振り飛車ではない方に「対振り飛車」。両方に「対抗形」
+            haisui_judgement   # 大駒がない状態で勝ったら「背水の陣」
+            rocket_judgement   # N段ロケットがあれば「ロケット」
+            SugatayakiValidator.new(self).call # 穴熊の姿焼
+            igyoku_judgement   # 居玉判定
+            aiigyoku_judgement # 相居玉判定
+            kyusen_judgement   # 急戦・持久戦
+            tantesuu_judgement # 短手数・長手数
+            anaguma_judgement  # 穴熊・対穴熊
           end
-          igyoku_judgement                  # 居玉判定
-          aiigyoku_judgement                # 相居玉判定
         end
 
-        header_write # ヘッダーに埋める
+        header_write
+      end
+
+      # 勝った側を返す
+      # nil の場合もある
+      def win_side_location
+        @win_side_location ||= @xparser.win_side_location(@container)
       end
 
       private
@@ -62,64 +76,131 @@ module Bioshogi
         end
       end
 
+      def meijin_judgement
+        if @container.turn_info.display_turn >= MIN_TURN
+          if win_side_location
+            player = @container.player_at(win_side_location)
+            if player.skill_set.power_battle?
+              player.skill_set.list_push(Analysis::NoteInfo[:"名人に定跡なし"])
+            end
+          end
+        end
+      end
+
+      def miyakodume_check
+        if last_action_params = @xparser.pi.last_action_params
+          if last_action_key = last_action_params[:last_action_key]
+            if last_action_info = LastActionInfo[last_action_key]
+              if last_action_info.key == :TSUMI
+                if soldier = @container.board["55"]
+                  if soldier.piece.key == :king
+                    tag = Analysis::NoteInfo["都詰め"]
+                    if @container.lose_player.location == soldier.location
+                      @container.win_player.skill_set.list_push(tag)
+                      # 最後の手にも入れておく
+                      if hand_log = @container.hand_logs.last
+                        hand_log.skill_set.list_push(tag)
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+
       def ainyugyoku_judgement
-        if @container.players.all? { |e| e.skill_set.has_skill?(Explain::NoteInfo["入玉"]) }
+        if @container.players.all? { |e| e.skill_set.has_skill?(Analysis::NoteInfo["入玉"]) }
           @container.players.each do |player|
-            player.skill_set.list_push(Explain::NoteInfo["相入玉"])
+            player.skill_set.list_push(Analysis::NoteInfo["相入玉"])
           end
         end
       end
 
       # 振り飛車でなければ居飛車
       def ibisha_judgement
-        @container.players.each do |e|
-          skill_set = e.skill_set
-          if !skill_set.has_skill?(Explain::NoteInfo["振り飛車"]) && !skill_set.has_skill?(Explain::NoteInfo["居飛車"])
-            e.skill_set.list_push(Explain::NoteInfo["居飛車"])
+        if @container.turn_info.display_turn >= MIN_TURN # 0手で切断した場合も「居飛車」とならないようにするため
+          @container.players.each do |e|
+            skill_set = e.skill_set
+            if !skill_set.has_skill?(Analysis::NoteInfo["振り飛車"]) && !skill_set.has_skill?(Analysis::NoteInfo["居飛車"])
+              e.skill_set.list_push(Analysis::NoteInfo["居飛車"])
+            end
           end
         end
       end
 
       def aiibisha_judgement
         # 両方居飛車なら相居飛車
-        if @container.players.all? { |e| e.skill_set.has_skill?(Explain::NoteInfo["居飛車"]) }
+        if @container.players.all? { |e| e.skill_set.has_skill?(Analysis::NoteInfo["居飛車"]) }
           @container.players.each do |player|
-            player.skill_set.list_push(Explain::NoteInfo["相居飛車"])
+            player.skill_set.list_push(Analysis::NoteInfo["相居飛車"])
+          end
+        end
+      end
+
+      def taiibisya_judgement
+        # 相手が居飛車なら対居飛車
+        @container.players.each do |player|
+          if player.opponent_player.skill_set.has_skill?(Analysis::NoteInfo["居飛車"])
+            player.skill_set.list_push(Analysis::NoteInfo["対居飛車"])
           end
         end
       end
 
       def aihuri_judgement
         # 両方振り飛車なら相振り
-        if @container.players.all? { |e| e.skill_set.has_skill?(Explain::NoteInfo["振り飛車"]) }
+        if @container.players.all? { |e| e.skill_set.has_skill?(Analysis::NoteInfo["振り飛車"]) }
+          @container.players.each do |player|
+            player.skill_set.list_push(Analysis::NoteInfo["相振り飛車"])
+          end
+        end
+      end
+
+      def anaguma_judgement
+        # 両方穴熊なら相穴熊
+        if @container.players.all? { |e| e.skill_set.has_skill?(Analysis::NoteInfo["穴熊"]) }
           @container.players.each do |player|
-            player.skill_set.list_push(Explain::NoteInfo["相振り"])
+            player.skill_set.list_push(Analysis::NoteInfo["相穴熊"])
           end
         end
       end
 
-      def taihuri_judgement
-        # 片方だけが「振り飛車」なら、振り飛車ではない方に「対振り」。両方に「対抗型」
-        if player = @container.players.find { |e| e.skill_set.has_skill?(Explain::NoteInfo["振り飛車"]) }
+      def taikoukei_judgement
+        # 片方だけが「振り飛車」なら両方に「対抗形」
+        if player = @container.players.find { |e| e.skill_set.has_skill?(Analysis::NoteInfo["振り飛車"]) }
           others = @container.players - [player]
-          if others.none? { |e| e.skill_set.has_skill?(Explain::NoteInfo["振り飛車"]) }
-            others.each { |e| e.skill_set.list_push(Explain::NoteInfo["対振り"]) }
-            @container.players.each { |e| e.skill_set.list_push(Explain::NoteInfo["対抗型"]) }
+          if others.none? { |e| e.skill_set.has_skill?(Analysis::NoteInfo["振り飛車"]) }
+            @container.players.each { |e| e.skill_set.list_push(Analysis::NoteInfo["対抗形"]) }
           end
         end
       end
 
       # 大駒がない状態で勝ったら「背水の陣」
       def haisui_judgement
-        @container.players.each do |player|
-          if player == @container.win_player
-            if player.stronger_piece_have_count.zero?
-              player.skill_set.list_push(Explain::NoteInfo["背水の陣"])
+        if @container.turn_info.display_turn >= MIN_TURN
+          if win_side_location
+            player = @container.player_at(win_side_location)
+            if player.stronger_piece_have_count.zero?                           # 最後の状態でも全ブッチ状態なら
+              if player.skill_set.has_skill?(Analysis::NoteInfo["大駒全ブッチ"]) # 途中、大駒全ブッチしいて (←これがないと 相入玉.kif でも入ってしまう)
+                player.skill_set.list_push(Analysis::NoteInfo["背水の陣"])
+              end
             end
           end
         end
       end
 
+      # N段ロケットがあれば「ロケット」
+      def rocket_judgement
+        @container.players.each do |player|
+          technique_infos = player.skill_set.technique_infos
+          if Analysis::TechniqueInfo.rocket_list.any? { |e| technique_infos.include?(e) }
+            player.skill_set.list_push(Analysis::NoteInfo["ロケット"])
+          end
+        end
+      end
+
+      # 居玉判定
       def igyoku_judgement
         @container.players.each do |e|
           enabled = false
@@ -139,24 +220,56 @@ module Bioshogi
             end
           end
           if enabled
-            e.skill_set.list_push(Explain::DefenseInfo["居玉"])
+            e.skill_set.list_push(Analysis::DefenseInfo["居玉"])
           end
         end
       end
 
       def aiigyoku_judgement
         # 両方居玉だったら備考に相居玉
-        if @container.players.all? { |e| e.skill_set.has_skill?(Explain::DefenseInfo["居玉"]) }
+        if @container.players.all? { |e| e.skill_set.has_skill?(Analysis::DefenseInfo["居玉"]) }
           @container.players.each do |e|
-            e.skill_set.list_push(Explain::NoteInfo["相居玉"])
+            e.skill_set.list_push(Analysis::NoteInfo["相居玉"])
           end
         end
         # end
       end
 
+      def kyusen_judgement
+        if @container.turn_info.display_turn >= MIN_TURN
+          if turn = @container.outbreak_turn
+            if turn < Stat::OUTBREAK_TURN_AVG
+              key = "急戦"
+            else
+              key = "持久戦"
+            end
+            @container.players.each do |e|
+              e.skill_set.list_push(Analysis::NoteInfo[key])
+            end
+          end
+        end
+      end
+
+      def tantesuu_judgement
+        if @container.turn_info.display_turn >= MIN_TURN
+          if @container.critical_turn # 1回でも駒の交換があった
+            max = @container.turn_info.display_turn
+            if max >= MIN_TURN
+              if max < Stat::TURN_MAX_AVG
+                key = "短手数"
+              else
+                key = "長手数"
+              end
+              @container.players.each do |e|
+                e.skill_set.list_push(Analysis::NoteInfo[key])
+              end
+            end
+          end
+        end
+      end
+
       def header_write
-        # ヘッダーに埋める
-        Explain::TacticInfo.each do |e|
+        Analysis::TacticInfo.each do |e|
           @container.players.each do |player|
             list = player.skill_set.public_send(e.list_key).normalize
             if v = list.presence

data/lib/bioshogi/formatter/style_embed.rb

@@ -0,0 +1,27 @@
+# frozen-string-literal: true
+
+module Bioshogi
+  module Formatter
+    class StyleEmbed
+      attr_accessor :xparser
+      attr_accessor :container
+
+      def initialize(xparser, container)
+        @xparser = xparser
+        @container = container
+      end
+
+      def call
+        if @xparser.preset_info
+          if @xparser.preset_info.special_piece
+            @container.players.each do |player|
+              if main_style_info = player.skill_set.main_style_info
+                @xparser.pi.header.object.update("#{player.call_name}の棋風" => main_style_info.name)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end