bioshogi 0.0.17 → 0.0.18

data/lib/bioshogi/player_executor/base.rb

@@ -14,6 +14,7 @@ module Bioshogi
       delegate :board, :piece_box, :container, to: :player
       delegate :origin_soldier, :captured_soldier, to: :move_hand, allow_nil: true
       delegate :soldier, to: :hand
+      delegate :motion_key, to: :input
 
       def initialize(player, source, params = {})
         @player = player
@@ -56,11 +57,11 @@ module Bioshogi
         execute_after_process
 
         if captured_soldier
-          piece_box_added(captured_soldier)
+          piece_box_added
         end
 
         if move_hand
-          move_hand_process(move_hand)
+          move_hand_process
         end
 
         perform_analyzer
@@ -78,10 +79,10 @@ module Bioshogi
       def execute_after_process
       end
 
-      def piece_box_added(captured_soldier)
+      def piece_box_added
       end
 
-      def move_hand_process(move_hand)
+      def move_hand_process
         if move_hand.soldier.piece.key == :king
           player.king_place = move_hand.soldier.place
         end
@@ -114,7 +115,7 @@ module Bioshogi
         end
       end
 
-      def skill_set
+      def tag_bundle
       end
     end
   end

data/lib/bioshogi/preset_info.rb

@@ -1,63 +1,66 @@
 # frozen-string-literal: true
+
+# |-------------+--------------------------------------+----------------------------------------------------------|
+# | 属性        | 意味                                 | 備考                                                     |
+# |-------------+--------------------------------------+----------------------------------------------------------|
+# | hirate_like | ほぼ平手の配置か？                   |                                                          |
+# | minor       | 一般的なソフトが対応してないものか？ | 「手合割：トンボ」などと表記すると一般的なソフトはバグる |
+# | handicap    | △が初手を指すか？                   |                                                          |
+# | x_taden     | 銀多伝・金多伝を許可するか？         |                                                          |
+# |-------------+--------------------------------------+----------------------------------------------------------|
+
 module Bioshogi
   class PresetInfo
     include ApplicationMemoryRecord
-    # special_piece:
-    #   大駒があるか？
-    #   大駒がないのに「居飛車」と言うのはおかしいので special_piece を確認する
-    #
-    # minor:
-    #   一般的なソフトが対応してないものか？
-    #   逆算で安易に「手合割：トンボ」と表記しないようにするため
-    #   と一般的なソフトはなにそれ状態になり初期配置を用意できない
-    #
-    # handicap:
-    #   △が初手を指すモードか？
-    #
     memory_record [
-      { key: "平手",           minor: false, handicap: false, special_piece: true,  piece_boxes: { black: "",       white: "",       }, },
-      { key: "香落ち",         minor: false, handicap: true,  special_piece: true,  piece_boxes: { black: "",       white: "",       }, },
-      { key: "右香落ち",       minor: true,  handicap: true,  special_piece: true,  piece_boxes: { black: "",       white: "",       }, },
-      { key: "角落ち",         minor: false, handicap: true,  special_piece: false, piece_boxes: { black: "",       white: "",       }, },
-      { key: "飛車落ち",       minor: false, handicap: true,  special_piece: false, piece_boxes: { black: "",       white: "",       }, },
-      { key: "飛香落ち",       minor: false, handicap: true,  special_piece: false, piece_boxes: { black: "",       white: "",       }, },
-      { key: "二枚落ち",       minor: false, handicap: true,  special_piece: false, piece_boxes: { black: "",       white: "",       }, },
-      { key: "二枚持ち",       minor: true,  handicap: true,  special_piece: false, piece_boxes: { black: "飛角",   white: "",       }, }, # これは盤の情報から逆算できない。「二枚落ち」と判定されてしまうため、根本的にロジックを変更しないといけない。
-      { key: "三枚落ち",       minor: false, handicap: true,  special_piece: false, piece_boxes: { black: "",       white: "",       }, }, # 1849/03/15 伊藤宗印 vs 天満屋 の手合割にある
-      { key: "四枚落ち",       minor: false, handicap: true,  special_piece: false, piece_boxes: { black: "",       white: "",       }, },
-      { key: "六枚落ち",       minor: false, handicap: true,  special_piece: false, piece_boxes: { black: "",       white: "",       }, },
-      { key: "トンボ",         minor: true,  handicap: true,  special_piece: true,  piece_boxes: { black: "",       white: "",       }, },
-      { key: "八枚落ち",       minor: false, handicap: true,  special_piece: false, piece_boxes: { black: "",       white: "",       }, },
-      { key: "十枚落ち",       minor: false, handicap: true,  special_piece: false, piece_boxes: { black: "",       white: "",       }, },
-      { key: "十九枚落ち",     minor: true,  handicap: true,  special_piece: false, piece_boxes: { black: "",       white: "",       }, },
-      { key: "二十枚落ち",     minor: true,  handicap: true,  special_piece: false, piece_boxes: { black: "",       white: "",       }, },
-      { key: "青空将棋",       minor: true,  handicap: false, special_piece: true,  piece_boxes: { black: "",       white: "",       }, },
-      { key: "バリケード将棋", minor: true,  handicap: false, special_piece: true,  piece_boxes: { black: "飛角香", white: "飛角香", }, },
-      { key: "5五将棋",        minor: true,  handicap: false, special_piece: true,  piece_boxes: { black: "",       white: "",       }, },
+      { key: "平手",           major: true,  handicap: false, hirate_like: true,  x_taden: true,  piece_boxes: { black: "",       white: "",       }, },
+      { key: "香落ち",         major: true,  handicap: true,  hirate_like: true,  x_taden: true,  piece_boxes: { black: "",       white: "",       }, },
+      { key: "右香落ち",       major: false, handicap: true,  hirate_like: true,  x_taden: true,  piece_boxes: { black: "",       white: "",       }, },
+      { key: "角落ち",         major: true,  handicap: true,  hirate_like: false, x_taden: true,  piece_boxes: { black: "",       white: "",       }, },
+      { key: "飛車落ち",       major: true,  handicap: true,  hirate_like: false, x_taden: true,  piece_boxes: { black: "",       white: "",       }, },
+      { key: "飛香落ち",       major: true,  handicap: true,  hirate_like: false, x_taden: true,  piece_boxes: { black: "",       white: "",       }, },
+      { key: "二枚落ち",       major: true,  handicap: true,  hirate_like: false, x_taden: true,  piece_boxes: { black: "",       white: "",       }, },
+      { key: "二枚持ち",       major: false, handicap: true,  hirate_like: false, x_taden: true,  piece_boxes: { black: "飛角",   white: "",       }, }, # これは盤の情報から逆算できない。「二枚落ち」と判定されてしまうため、根本的にロジックを変更しないといけない。
+      { key: "三枚落ち",       major: true,  handicap: true,  hirate_like: false, x_taden: true,  piece_boxes: { black: "",       white: "",       }, }, # 1849/03/15 伊藤宗印 vs 天満屋 の手合割にある
+      { key: "四枚落ち",       major: true,  handicap: true,  hirate_like: false, x_taden: true,  piece_boxes: { black: "",       white: "",       }, },
+      { key: "六枚落ち",       major: true,  handicap: true,  hirate_like: false, x_taden: true,  piece_boxes: { black: "",       white: "",       }, },
+      { key: "トンボ",         major: false, handicap: true,  hirate_like: false, x_taden: false, piece_boxes: { black: "",       white: "",       }, },
+      { key: "八枚落ち",       major: true,  handicap: true,  hirate_like: false, x_taden: false, piece_boxes: { black: "",       white: "",       }, },
+      { key: "十枚落ち",       major: true,  handicap: true,  hirate_like: false, x_taden: false, piece_boxes: { black: "",       white: "",       }, },
+      { key: "十九枚落ち",     major: false, handicap: true,  hirate_like: false, x_taden: false, piece_boxes: { black: "",       white: "",       }, },
+      { key: "二十枚落ち",     major: false, handicap: true,  hirate_like: false, x_taden: false, piece_boxes: { black: "",       white: "",       }, },
+      { key: "青空将棋",       major: false, handicap: false, hirate_like: false, x_taden: false, piece_boxes: { black: "",       white: "",       }, },
+      { key: "バリケード将棋", major: false, handicap: false, hirate_like: false, x_taden: false, piece_boxes: { black: "飛角香", white: "飛角香", }, },
+      { key: "5五将棋",        major: false, handicap: false, hirate_like: false, x_taden: false, piece_boxes: { black: "",       white: "",       }, },
     ]
 
     class << self
-      def lookup(key)
-        key = key.to_s
-        key = key.sub(/[5５五][5５五々]/, "5五") # 五々将棋 -> 5五将棋
-        key = key.sub(/(.)車/, '\1')             # 飛車 香車 -> 飛 香
-        key = key.sub(/飛落/, "飛車落")
-        key = key.sub(/裸玉/, "十九枚落ち")
-        key = key.sub(/詰将棋/, "平手")
-        key = key.sub(/落\z/, "落ち")            # 香落 -> 香落ち
-        super
+      def key_cast(key)
+        if key.kind_of?(String)
+          key = key.sub(/[5５五][5５五々]/, "5五") # 五々将棋 -> 5五将棋
+          key = key.sub(/(.)車/, '\1')             # 飛車 香車 -> 飛 香
+          key = key.sub(/飛落/, "飛車落")
+          key = key.sub(/詰将棋/, "平手")
+          key = key.sub(/落\z/, "落ち")            # 香落 -> 香落ち
+        end
+        key
       end
 
       # 一般的なものに絞る
-      def major_list
-        @major_list ||= reject(&:minor)
+      def major_only
+        @major_only ||= find_all(&:major)
+      end
+
+      # 一般的でないものに絞る
+      def minor_only
+        @minor_only ||= reject(&:major)
       end
 
       # 持駒の比較は別途行う必要あり
       def lookup_by_soldiers(soldiers, options = {})
         options = {
-          :optimize        => false, # 速くなる (気がするだけでほとんど効果がない)
-          :inclusion_minor => false, # トンボなど一般的な名前も含めるか？
+          :optimize    => false, # 速くなる (気がするだけでほとんど効果がない)
+          :major_only => false, # true: トンボなど一般的な名前も含めない
         }.merge(options)
 
         if options[:optimize]
@@ -78,10 +81,10 @@ module Bioshogi
           # end
         else
           sorted_soldiers = soldiers.sort
-          if options[:inclusion_minor]
-            list = to_a
+          if options[:major_only]
+            list = major_only
           else
-            list = major_list
+            list = to_a
           end
           list.find { |e| sorted_soldiers == e.sorted_soldiers }
         end
@@ -125,6 +128,10 @@ module Bioshogi
       handicap ? 1 : 0
     end
 
-    include Analysis::ShapeInfoRelation
+    def start_locaction
+      @start_locaction ||= Location.fetch(handicap ? :white : :black)
+    end
+
+    include Analysis::ShapeInfoAccessor
   end
 end

data/lib/bioshogi/screen_image/board_methods.rb

@@ -15,9 +15,13 @@ module Bioshogi
       # line で stroke を使うと fill + stroke で二重に同じところを塗るっぽい
       # だから半透明にしても濃くなる
       # なので fill だけにする
+      # しかし、そうすると今度は 2px 以上が描画できなくなるのでやっぱり stroke も入れておく
       def lattice_draw(layer)
         draw_context(layer) do |g|
-          g.fill(inner_frame_lattice_color) # 塗り潰し色で line する (stroke と勘違いしがち)
+          g.stroke_width(lattice_stroke_width) # 2px 以上の場合はこれがいる
+          g.stroke(inner_frame_lattice_color)  # (↑のときの色)
+          g.fill = inner_frame_lattice_color   # 線の中心線の色(1pxだけならこれだけあればいい)
+
           (1...lattice.w).each do |x|
             line_draw(g, V[x, 0], V[x, lattice.h])
           end

data/lib/bioshogi/screen_image/piece_font_weight_info.rb

@@ -3,7 +3,7 @@ module Bioshogi
     class PieceFontWeightInfo
       include ApplicationMemoryRecord
       memory_record [
-        { key: :is_piece_font_weight_auto,   name: "おまかせ", to_params: {                                                         }, },
+        { key: :is_piece_font_weight_auto,   name: "おまかせ", to_params: {}, },
         { key: :is_piece_font_weight_normal, name: "細字",     to_params: { soldier_font_bold: false, stand_piece_font_bold: false, }, },
         { key: :is_piece_font_weight_bold,   name: "太字",     to_params: { soldier_font_bold: true,  stand_piece_font_bold: true,  }, },
       ]

data/lib/bioshogi/screen_image/piece_image_info.rb

@@ -8,11 +8,11 @@ module Bioshogi
       ]
 
       class << self
-        def lookup(v)
-          if v
-            v = v.downcase
-            super
+        def key_cast(key)
+          if key
+            key = key.downcase
           end
+          key
         end
       end
 

data/lib/bioshogi/sfen_importer.rb

@@ -1,4 +1,5 @@
 # frozen-string-literal: true
+
 module Bioshogi
   class SfenImporter
     def initialize(container, sfen_info)
@@ -16,7 +17,7 @@ module Bioshogi
       @sfen_info.piece_counts.each do |location_key, counts|
         @container.player_at(location_key).piece_box.set(counts)
       end
-      @container.before_run_process
+      @container.after_setup
     end
 
     def import_all

data/lib/bioshogi/simple_model.rb

@@ -4,7 +4,7 @@ module Bioshogi
   module SimpleModel
     def initialize(attributes)
       attributes.each do |k, v|
-        public_send("#{k}=", v)
+        send("#{k}=", v)
       end
 
       super()

data/lib/bioshogi/soldier/detector_methods.rb

@@ -0,0 +1,109 @@
+module Bioshogi
+  class Soldier
+    # 手筋判定用
+    concern :DetectorMethods do
+      Place::DELEGATE_METHODS_WITH_LOCATION.each do |name|
+        define_method(name) do |*args, **options|
+          place.public_send(name, location, *args, **options)
+        end
+      end
+
+      delegate *Place::DIRECT_DELEGATE_METHODS, to: :place
+
+      ################################################################################
+
+      # 後手は先手目線として計算する
+      #
+      #   Soldier.from_str("▲55玉").vector_from(Soldier.from_str("▲56玉")) == V.up
+      #   Soldier.from_str("▲55玉").vector_from(Soldier.from_str("▲54玉")) == V.down
+      #   Soldier.from_str("▲55玉").vector_from(Soldier.from_str("▲45玉")) == V.left
+      #   Soldier.from_str("▲55玉").vector_from(Soldier.from_str("▲65玉")) == V.right
+      #
+      #   Soldier.from_str("△55玉").vector_from(Soldier.from_str("△56玉")) == V.down
+      #   Soldier.from_str("△55玉").vector_from(Soldier.from_str("△54玉")) == V.up
+      #   Soldier.from_str("△55玉").vector_from(Soldier.from_str("△45玉")) == V.right
+      #   Soldier.from_str("△55玉").vector_from(Soldier.from_str("△65玉")) == V.left
+      def vector_from(from)
+        white_then_flip.place.vector_from(from.white_then_flip.place)
+      end
+
+      def vector_to(to)
+        white_then_flip.place.vector_to(to.white_then_flip.place)
+      end
+
+      # a から b を見たとき b は左右どちらにいるか？
+      # relative_move_to に渡せる抽象化した向きを返す
+      # def left_or_light_from_a_to_b(a, b)
+      #   v1 = a.white_then_flip.place.column.value
+      #   v2 = b.white_then_flip.place.column.value
+      #   case
+      #   when v1 < v2
+      #     :left
+      #   when v1 > v2
+      #     :right
+      #   end
+      # end
+
+      ################################################################################
+
+      # 前に一直線に進めるタイプか？
+      def boar_mode?
+        (piece.key == :lance && normal?) || piece.key == :rook
+      end
+
+      ################################################################################ for SoldierLookupTableMethods
+
+      def to_key1
+        :"#{location.key}/#{piece.key}"
+      end
+
+      def to_key2
+        :"#{location.key}/#{piece.key}/#{promoted}"
+      end
+
+      ################################################################################ for XmotionAnalyzer, MotionAnalyzer
+
+      def motion_key(drop_hand)
+        [piece.key, promoted, !!drop_hand]
+      end
+
+      ################################################################################ for BoardPieceCountsMethods
+
+      # def location_with_piece
+      #   [location.key, piece.key]
+      # end
+
+      ################################################################################
+
+      # 駒の重さ(=価値) 常にプラス
+      def abs_weight
+        piece.any_weight(promoted)
+      end
+
+      # 駒の重さ(=価値)。先手視点。後手ならマイナスになる
+      def relative_weight
+        abs_weight * location.sign_dir
+      end
+
+      # 敵への駒の圧力(終盤度)
+      def pressure_level(area = 4)
+        case
+        when top_spaces < area
+          if promoted
+            piece.promoted_attack_level
+          else
+            piece.attack_level
+          end
+        when bottom_spaces < area
+          if promoted
+            -piece.promoted_defense_level
+          else
+            -piece.defense_level
+          end
+        else
+          0
+        end
+      end
+    end
+  end
+end

data/lib/bioshogi/soldier.rb

@@ -3,6 +3,10 @@
 module Bioshogi
   class Soldier
     class << self
+      # 文字列から盤上の駒を生成する
+      #
+      #   Soldier.from_str("▲76歩")                      # => <Bioshogi::Soldier "▲７六歩">
+      #   Soldier.from_str("76歩", location: :white)      # => <Bioshogi::Soldier "△７六歩">
       def from_str(str, attributes = {})
         if str.kind_of?(self)
           return str
@@ -18,7 +22,7 @@ module Bioshogi
         if v = attributes[:location]
           location = Location[v]
         end
-        attrs = {place: Place.fetch(md[:place]), location: location}
+        attrs = { place: Place.fetch(md[:place]), location: location }
         new_with_promoted(md[:piece], attrs)
       end
 
@@ -44,7 +48,7 @@ module Bioshogi
       end
 
       # 先後それぞれの形を指定する
-      # Soldier.preset_soldiers(white: "裸玉", black: "裸玉").collect(&:name) # => ["▲５九玉", "△５一玉"]
+      #   Soldier.preset_soldiers(white: "十九枚落ち", black: "十九枚落ち").collect(&:name) # => ["▲５九玉", "△５一玉"]
       def preset_soldiers(preset_key)
         PresetInfo.fetch(preset_key || :"平手").sorted_soldiers
       end
@@ -55,7 +59,7 @@ module Bioshogi
     end
 
     include SimpleModel
-    include TechniqueMatcherMethods
+    include DetectorMethods
     include ScreenImage::SoldierModelMethods
 
     attr_accessor :piece
@@ -82,10 +86,19 @@ module Bioshogi
       { piece: piece, promoted: promoted, place: place, location: location }
     end
 
+    def merge(attributes)
+      self.class.create(self.attributes.merge(attributes))
+    end
+
+    ################################################################################
+
     # 手合割などを調べる際に並び順で異なるオブジェクトと見なされないようにするためだけに用意した
     # だから何をキーにしてもよい。place は基本ユニークなのでこれで並べる
+    # FIXME: 不具合の元になりそう
     def <=>(other)
-      place <=> other.place
+      if other
+        place <=> other.place
+      end
     end
 
     def ==(other)
@@ -100,6 +113,8 @@ module Bioshogi
       attributes.hash
     end
 
+    ################################################################################
+
     # 180度回転
     def flip
       self.class.create(piece: piece, promoted: promoted, place: place.flip, location: location.flip)
@@ -119,6 +134,8 @@ module Bioshogi
       end
     end
 
+    ################################################################################
+
     def all_vectors
       piece.all_vectors(promoted: promoted, location: location)
     end
@@ -131,10 +148,6 @@ module Bioshogi
       v ||= all_vectors.any? { |e| place.vector_add(e) } # ちょっとでも動ける？
     end
 
-    def merge(attributes)
-      self.class.create(self.attributes.merge(attributes))
-    end
-
     ################################################################################ Utility
 
     # 自分を移動元の状態と考えて to に移動したとき成れるか？
@@ -193,6 +206,10 @@ module Bioshogi
       piece.any_name(promoted, options)
     end
 
+    def xxx_kiri(options = {})
+      piece.xxx_kiri(promoted, options)
+    end
+
     def yomiage
       piece.yomiage(promoted)
     end
@@ -213,6 +230,10 @@ module Bioshogi
       piece.csa.any_name(promoted)
     end
 
+    def to_counts_key
+      piece.to_counts_key(promoted)
+    end
+
     def to_akf
       {
         :piece    => piece.key,

data/lib/bioshogi/soldier_box.rb

@@ -1,4 +1,5 @@
 # frozen-string-literal: true
+
 #
 # soldier_box = SoldierBox.new
 # soldier_box << Soldier.from_str("△５一玉")

data/lib/bioshogi/soldier_walker.rb

@@ -1,4 +1,5 @@
 # frozen-string-literal: true
+
 module Bioshogi
   module SoldierWalker
     extend self

data/lib/bioshogi/tasks/chore.rake

@@ -1,3 +1,7 @@
+task :prepare do
+  require "bioshogi"
+end
+
 desc "bundle update (alias)"
 task :bu => :bundle_update
 

data/lib/bioshogi/tasks/extreme_detect.rake

@@ -0,0 +1,7 @@
+desc "2ch棋譜読み込み変換テスト(MAX=xxx)"
+task "extreme_detect" => :prepare do
+  Bioshogi::ExtremeDetect.new.call
+end
+
+desc "alias to extreme_detect"
+task :"2" => :extreme_detect

data/lib/bioshogi/tasks/perf.rake

@@ -0,0 +1,5 @@
+desc "戦法判定処理量確認 (最適化の効果が大きい戦法ランキング)"
+task :bm do
+  require "bioshogi"
+  Bioshogi::Analysis::PerformanceBenchmark.new.call
+end

data/lib/bioshogi/tasks/rdoc.rake

@@ -0,0 +1,11 @@
+require "rdoc/task"
+
+RDoc::Task.new do |rdoc|
+  # rdoc.main = "README.md"     # 最初に表示されるページ（任意）
+  rdoc.rdoc_dir = "rdoc"       # 出力先ディレクトリ（デフォルト: doc）
+  # rdoc.title = "My Project Documentation" # ドキュメントタイトル（任意）
+
+  # ドキュメント対象ファイル（ここをプロジェクトに合わせて調整）
+  # rdoc.rdoc_files.include("lib/**/*.rb", "README.md")
+  rdoc.rdoc_files.include("lib/**/*.rb")
+end

data/lib/bioshogi/tasks/report.rake

@@ -0,0 +1,7 @@
+task :r => :report
+
+desc "レポート"
+task :report do
+  require "bioshogi"
+  Bioshogi::Analysis::TagReporter.new.call
+end

data/lib/bioshogi/tasks/tactic.rake

@@ -6,3 +6,8 @@ task :tactic_stat do
   require "bioshogi"
   Bioshogi::Analysis::TacticStat.new.call
 end
+
+desc "変換テスト"
+task :nc => :prepare do
+  Bioshogi::Analysis::NormalizeCheck.new.call
+end

data/lib/bioshogi/tasks/tactic_detector.rake

@@ -0,0 +1,8 @@
+desc "戦法判定確認"
+task :tactic_detector do
+  require "bioshogi"
+  Bioshogi::Analysis::TacticDetector.new.call
+end
+
+desc "alias to tactic_detector"
+task :v => :tactic_detector