bioshogi 0.0.15 → 0.0.18

data/lib/bioshogi/screen_image/nureyon_image_info.rb

@@ -0,0 +1,43 @@
+module Bioshogi
+  module ScreenImage
+    class NureyonImageInfo
+      # include ApplicationMemoryRecord
+      # memory_record [
+      #   # black
+      #   { key: "BK0", real_texture: nil,  }, # 玉
+      #   { key: "BR0", real_texture: nil,  }, # 飛
+      #   { key: "BR1", real_texture: nil,  }, # 龍
+      #   { key: "BB0", real_texture: nil,  }, # 角
+      #   { key: "BB1", real_texture: nil,  }, # 馬
+      #   { key: "BG0", real_texture: nil,  }, # 金
+      #   { key: "BS0", real_texture: nil,  }, # 銀
+      #   { key: "BS1", real_texture: nil,  }, # 成銀
+      #   { key: "BN0", real_texture: nil,  }, # 桂
+      #   { key: "BN1", real_texture: nil,  }, # 成桂
+      #   { key: "BL0", real_texture: nil,  }, # 香
+      #   { key: "BL1", real_texture: nil,  }, # 成香
+      #   { key: "BP0", real_texture: nil,  }, # 歩
+      #   { key: "BP1", real_texture: nil,  }, # と
+      #   # white               nil,
+      #   { key: "WK0", real_texture: "BK0",  }, # 王
+      #   { key: "WR0", real_texture: "BR0",  }, # 飛
+      #   { key: "WR1", real_texture: "BR1",  }, # 龍
+      #   { key: "WB0", real_texture: "BB0",  }, # 角
+      #   { key: "WB1", real_texture: "BB1",  }, # 馬
+      #   { key: "WG0", real_texture: "BG0",  }, # 金
+      #   { key: "WS0", real_texture: "BS0",  }, # 銀
+      #   { key: "WS1", real_texture: "BS1",  }, # 成銀
+      #   { key: "WN0", real_texture: "BN0",  }, # 桂
+      #   { key: "WN1", real_texture: "BN1",  }, # 成桂
+      #   { key: "WL0", real_texture: "BL0",  }, # 香
+      #   { key: "WL1", real_texture: "BL1",  }, # 成香
+      #   { key: "WP0", real_texture: "BP0",  }, # 歩
+      #   { key: "WP1", real_texture: "BP1",  }, # と
+      # ]
+      #
+      # def texture_key
+      #   real_texture || key
+      # end
+    end
+  end
+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

@@ -0,0 +1,26 @@
+module Bioshogi
+  module ScreenImage
+    class PieceImageInfo
+      include ApplicationMemoryRecord
+      memory_record [
+        { key: :portella, name: "Portella", ext_name: "png", default_scale: 0.95, custom_shadow_support: false, },
+        { key: :nureyon,  name: "ぬれよん", ext_name: "png", default_scale: 0.80, custom_shadow_support: true,  },
+      ]
+
+      class << self
+        def key_cast(key)
+          if key
+            key = key.downcase
+          end
+          key
+        end
+      end
+
+      # 駒の種類をプレフィクスにした駒の部分パスを返す
+      # "nureyon/BP0"
+      def piece_path(soldier)
+        "#{key}/#{soldier.image_basename}"
+      end
+    end
+  end
+end

data/lib/bioshogi/screen_image/soldier_methods.rb

@@ -6,7 +6,7 @@ module Bioshogi
       end
 
       def soldier_draw(soldier)
-        if params[:piece_image_key]
+        if piece_image_info
           soldier_draw_by_image(soldier)
         else
           soldier_draw_by_char(soldier)
@@ -43,22 +43,24 @@ module Bioshogi
 
       def soldier_draw_by_image(soldier)
         v = V[*soldier.place.to_xy]
-        piece_image_draw(v: v, location: soldier.location, piece: soldier.piece, promoted: soldier.promoted)
+        piece_image_draw(v: v, soldier: soldier)
       end
 
-      def piece_image_draw(v:, location:, piece:, promoted: false)
-        type = params[:piece_image_key]
-        key = [location.to_sfen, piece.sfen_char, promoted ? "1" : "0"].join.upcase
-        type_with_key = "#{type}/#{key}"
-        wh = cell_rect.collect(&:ceil)
-        cache_key = [type_with_key, wh].join("/")
+      def piece_image_draw(v:, soldier:)
+        piece_path = piece_image_info.piece_path(soldier)
+        scale = params[:piece_image_scale] || piece_image_info.default_scale
+        wh = (cell_rect * scale).collect(&:ceil)               # => [105, 114]
+        cache_key = [piece_path, wh.join("x")].join(",")       # => "nureyon/BP0,105x114"
+
         @piece_image_draw ||= {}
         image = @piece_image_draw[cache_key] ||= yield_self do
-          png_path = ASSETS_DIR.join("images/piece/#{type_with_key}.png")
-          image = Magick::Image.read(png_path).first
-          image.resize_to_fill(*wh)
+          full_path = ASSETS_DIR.join("images/piece/#{piece_path}.#{piece_image_info.ext_name}")
+          image = Magick::Image.read(full_path).first
+          image.resize_to_fill(*wh)                            # 描画領域の大きさに調整(縮小)させる
         end
-        @d_piece_layer.composite!(image, *px(v), Magick::OverCompositeOp)
+
+        top_left = V.one * (1.0 - scale) / 2 # スケールが 0.8 なら左上から右下方向に 0.1 の位置から描画すればセルの真ん中に配置できる
+        @d_piece_layer.composite!(image, *px(v + top_left), Magick::OverCompositeOp)
       end
 
       def soldier_move_cell_draw
@@ -101,7 +103,7 @@ module Bioshogi
 
       def soldier_name(soldier)
         if soldier.piece.key == :king && soldier.location.key == :white
-          "王"
+          "王"                  # FIXME: ハードコーディングすんな
         else
           soldier.any_name
         end

data/lib/bioshogi/screen_image/soldier_model_methods.rb

@@ -0,0 +1,14 @@
+module Bioshogi
+  module ScreenImage
+    concern :SoldierModelMethods do
+      # 対応する画像のファイル名を返す
+      def image_basename
+        [
+          location.to_sfen,     # B (Black)
+          piece.sfen_char,      # P (Pawn)
+          promoted ? "1" : "0", # 0 (不成)
+        ].join.upcase
+      end
+    end
+  end
+end

data/lib/bioshogi/screen_image/stand.rb

@@ -14,10 +14,11 @@ module Bioshogi
 
               # 持駒数
               :piece_count_bg_color        => "hsla(0,0%,100%,0.7)", # 駒数の背景
-              :piece_count_font_color      => "hsla(0,0%,  0%,0.9)", # *駒数の色(nilなら piece_font_color を代用)
+              :piece_count_font_color      => "hsla(0,0%,  0%,0.7)", # *駒数の色(nilなら piece_font_color を代用)
               :piece_count_font_scale      => 0.6,               # 持駒数の大きさ
               :piece_count_stroke_color    => nil,               # 持駒数の縁取り色
               :piece_count_stroke_width    => nil,               # 持駒数の縁取り太さ
+              :piece_count_bold            => nil,               # 持駒数のフォントを bold タイプにするか？
               :piece_count_position_adjust => {                  # 駒数の位置
                 :single                    => [0.7, 0.05],       # 駒数1桁のとき。[0, 0] なら該当の駒の中央
                 :double                    => [0.8, 0.05],       # 駒数2桁のとき
@@ -57,7 +58,8 @@ module Bioshogi
             piece = Piece.fetch(piece_key)
 
             if params[:piece_image_key]
-              piece_image_draw(v: v, location: location, piece: piece)
+              soldier = Soldier.create(location: location, piece: piece, promoted: false, place: Place.zero)
+              piece_image_draw(v: v, soldier: soldier)
             else
               # 持駒の影
               piece_pentagon_draw(v: v, location: location, piece: piece)
@@ -96,6 +98,7 @@ module Bioshogi
             :font_scale   => params[:piece_count_font_scale],
             :stroke_color => params[:piece_count_stroke_color],
             :stroke_width => params[:piece_count_stroke_width],
+            :bold         => params[:piece_count_bold],
             )
         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,8 @@ module Bioshogi
     end
 
     include SimpleModel
-    include TechniqueMatcherMethods
+    include DetectorMethods
+    include ScreenImage::SoldierModelMethods
 
     attr_accessor :piece
     attr_accessor :promoted
@@ -81,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)
@@ -99,6 +113,8 @@ module Bioshogi
       attributes.hash
     end
 
+    ################################################################################
+
     # 180度回転
     def flip
       self.class.create(piece: piece, promoted: promoted, place: place.flip, location: location.flip)
@@ -118,6 +134,8 @@ module Bioshogi
       end
     end
 
+    ################################################################################
+
     def all_vectors
       piece.all_vectors(promoted: promoted, location: location)
     end
@@ -130,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 に移動したとき成れるか？
@@ -192,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
@@ -212,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