bioshogi 0.0.13 → 0.0.14

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

data/lib/bioshogi/formatter/sugatayaki_validator.rb

@@ -0,0 +1,96 @@
+module Bioshogi
+  module Formatter
+    class SugatayakiValidator
+      delegate :win_side_location, :container, to: :@skill_embed
+
+      def initialize(skill_embed)
+        @skill_embed = skill_embed
+      end
+
+      def call
+        if valid?
+          win_player.skill_set.list_push(tag)
+
+          # 最後の手にも入れておく
+          container.hand_logs.last&.then do |hand_log|
+            hand_log.skill_set.list_push(tag)
+          end
+
+          # tp info
+        end
+      end
+
+      def tag
+        Analysis::NoteInfo["穴熊の姿焼き"]
+      end
+
+      def info
+        {
+          "閾値"       => Piece::PieceScore.sure_victory_score,
+          "勝者の得点" => win_player.current_score,
+          "敗者の得点" => lose_player.current_score,
+          "得点差"     => win_player.current_score - lose_player.current_score,
+        }
+      end
+
+      def valid?
+        unless win_side_location # 勝ち負けがはっきりしているか？
+          return
+        end
+        unless anaguma_formation? # 相手が穴熊状態か？
+          return
+        end
+        # unless stronger_piece_completed? # 大駒コンプリートしている？ → overwhelming_score? の方が汎用的
+        #   return
+        # end
+        unless win_player.overwhelming_score? # 自分が圧倒的な戦力を持っているか？
+          return
+        end
+        true
+      end
+
+      # 左右どちらかに相手の穴熊が存在する？
+      def anaguma_formation?
+        sub_anaguma_formation?(false) || sub_anaguma_formation?(true)
+      end
+
+      # 角に相手の穴熊が存在する？
+      def sub_anaguma_formation?(flop)
+        true &&
+          lose_side_soldier_at("19", flop).try { piece.key == :king } && # 角に玉がある
+          lose_side_soldier_at("18", flop) &&
+          lose_side_soldier_at("29", flop) &&
+          lose_side_soldier_at("28", flop)
+      end
+
+      # 勝ったプレイヤー
+      def win_player
+        @win_player ||= container.player_at(win_side_location)
+      end
+
+      # 負けたプレイヤー
+      def lose_player
+        @lose_player ||= container.player_at(lose_side_location)
+      end
+
+      # 負けた側
+      def lose_side_location
+        @lose_side_location ||= win_side_location.flip
+      end
+
+      # 負けた方の盤上の駒を得る
+      def lose_side_soldier_at(place, flop)
+        place = Place[place]
+        if flop
+          place = place.flop
+        end
+        place = place.flip_if_white(lose_side_location)
+        if soldier = container.board[place]
+          if soldier.location == lose_side_location
+            soldier
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bioshogi/kanji_number.rb

@@ -1,7 +1,3 @@
-if $0 == __FILE__
-  require "active_support/core_ext/module/attribute_accessors"
-end
-
 module Bioshogi
   module KanjiNumber
     extend self
@@ -84,45 +80,4 @@ module Bioshogi
       s.scan(regexp, &block)
     end
   end
-
-  if $0 == __FILE__
-    KanjiNumber.kanji_to_number_string("")               # => ""
-    KanjiNumber.kanji_to_number_string("歩")             # => "歩"
-    KanjiNumber.kanji_to_number_string("歩〇")           # => "歩0"
-    KanjiNumber.kanji_to_number_string("歩九")           # => "歩9"
-    KanjiNumber.kanji_to_number_string("歩十")           # => "歩10"
-    KanjiNumber.kanji_to_number_string("歩十〇")         # => "歩10"
-    KanjiNumber.kanji_to_number_string("歩十一")         # => "歩11"
-    KanjiNumber.kanji_to_number_string("歩十九")         # => "歩19"
-    KanjiNumber.kanji_to_number_string("歩二十")         # => "歩20"
-    KanjiNumber.kanji_to_number_string("歩二十〇")       # => "歩20"
-    KanjiNumber.kanji_to_number_string("歩二十一")       # => "歩21"
-    KanjiNumber.kanji_to_number_string("歩百二十三")     # => "歩123"
-    KanjiNumber.kanji_to_number_string("歩千二百三十四") # => "歩1234"
-
-    KanjiNumber.kanji_to_number_string("歩十")           # => "歩10"
-    KanjiNumber.kanji_to_number_string("歩百")           # => "歩100"
-    KanjiNumber.kanji_to_number_string("歩千")           # => "歩1000"
-    KanjiNumber.kanji_to_number_string("歩1万")          # => "歩10000"
-    KanjiNumber.kanji_to_number_string("歩1憶")          # => "歩100000"
-    KanjiNumber.kanji_to_number_string("歩1兆")          # => "歩1000000"
-
-    KanjiNumber.number_to_kanji(0)                      # => "〇"
-    KanjiNumber.number_to_kanji(1)                      # => "一"
-    KanjiNumber.number_to_kanji(10)                     # => "十"
-    KanjiNumber.number_to_kanji(12)                     # => "十二"
-    KanjiNumber.number_to_kanji(2)                      # => "二"
-    KanjiNumber.number_to_kanji(23)                     # => "二十三"
-    KanjiNumber.number_to_kanji(123)                    # => "百二十三"
-    KanjiNumber.number_to_kanji(120)                    # => "百二十"
-    KanjiNumber.number_to_kanji(100)                    # => "百"
-    KanjiNumber.number_to_kanji(1000)                   # => "千"
-    KanjiNumber.number_to_kanji(10000)                  # => "一万"
-    KanjiNumber.number_to_kanji(100000)                 # => "一憶"
-    KanjiNumber.number_to_kanji(1000000)                # => "一兆"
-    KanjiNumber.number_to_kanji(1234.5678)              # => "千二百三十四"
-
-    KanjiNumber.extract("歩百二十三") # => ["百二十三"]
-    KanjiNumber.regexp                # => /[十百千万憶兆〇一二三四五六七八九]+/
-  end
 end

data/lib/bioshogi/kifu_format_info.rb

@@ -2,14 +2,14 @@ module Bioshogi
   class KifuFormatInfo
     include ApplicationMemoryRecord
     memory_record [
-      { key: "kif",  },
-      { key: "ki2",  },
-      { key: "csa",  },
-      { key: "sfen", },
+      { key: :kif,  },
+      { key: :ki2,  },
+      { key: :csa,  },
+      { key: :sfen, },
     ]
 
     def name
-      @name ||= key.to_s.upcase
+      super.upcase
     end
   end
 end

data/lib/bioshogi/parser/base.rb

@@ -25,8 +25,8 @@ module Bioshogi
             #  skip: 棋譜には記さない
             # false: 例外を出す(デフォルト)
             :typical_error_case             => false,
-            :skill_monitor_enable           => true,
-            :skill_monitor_technique_enable => true,
+            :analyzer_enable           => true,
+            :analyzer_technique_enable => true,
             :candidate_enable               => true,  # ki2にしないのであれば指定するとかなり速くなる
 
             :validate_enable                => true,  # 将棋ウォーズの棋譜なら指定すると少し速くなる

data/lib/bioshogi/parser/pi.rb

@@ -40,6 +40,17 @@ module Bioshogi
       def clock_nothing?
         !clock_exist?
       end
+
+      # 勝ち負けがついた一般的な終わり方をしたか？
+      def win_player_collect_p
+        if last_action_params
+          if last_action_key = last_action_params[:last_action_key]
+            if last_action_info = Formatter::LastActionInfo[last_action_key]
+              last_action_info.win_player_collect_p
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/bioshogi/piece/piece_scale.rb

@@ -5,14 +5,15 @@ module Bioshogi
     class PieceScale
       include ApplicationMemoryRecord
       memory_record [
-        { key: :king,   scale: 1.00, },
-        { key: :rook,   scale: 1.00, },
-        { key: :bishop, scale: 1.00, },
-        { key: :gold,   scale: 0.97, },
-        { key: :silver, scale: 0.94, },
-        { key: :knight, scale: 0.91, },
-        { key: :lance,  scale: 0.88, },
-        { key: :pawn,   scale: 0.85, },
+        # http://kijishi.html.xdomain.jp/komanosize.htm
+        { key: :king,   scale: 1.00, }, # 王が一番大きい
+        { key: :rook,   scale: 0.99, }, # 飛車と角の大きさは同じでよい
+        { key: :bishop, scale: 0.99, },
+        { key: :gold,   scale: 0.98, }, # 金・銀の大きさは同じ
+        { key: :silver, scale: 0.98, },
+        { key: :knight, scale: 0.97, }, # 桂馬の香車の差は大きい
+        { key: :lance,  scale: 0.95, },
+        { key: :pawn,   scale: 0.94, },
       ]
     end
   end

data/lib/bioshogi/piece/piece_score.rb

@@ -15,6 +15,20 @@ module Bioshogi
         { key: :pawn,   basic_weight:   100, promoted_weight: 1200, hold_weight:   105, },
       ]
 
+      class << self
+        # このスコア以上であれば必勝(姿焼き判定)とする
+        def sure_victory_score
+          @sure_victory_score ||= [
+            self[:king].basic_weight,      # 玉
+            self[:rook].promoted_weight,   # 龍
+            self[:bishop].promoted_weight, # 馬
+            self[:rook].hold_weight,       # 飛 (持駒)
+            self[:bishop].hold_weight,     # 角 (持駒)
+            self[:gold].basic_weight * 4,  # 金相当 * 4 (と金などを含む)
+          ].sum
+        end
+      end
+
       def piece
         Piece.fetch(key)
       end