bioshogi 0.0.14 → 0.0.15

data/lib/bioshogi/soldier/technique_matcher_methods.rb

@@ -0,0 +1,51 @@
+module Bioshogi
+  class Soldier
+    # 手筋判定用
+    concern :TechniqueMatcherMethods do
+      Place::DELEGATE_METHODS.each do |name|
+        define_method(name) do |*args, **options|
+          place.public_send(name, location, *args, **options)
+        end
+      end
+
+      ################################################################################
+
+      # 前に一直線に進めるタイプか？
+      def boar_mode?
+        (piece.key == :lance && normal?) || piece.key == :rook
+      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

@@ -1,4 +1,3 @@
-# -*- coding: utf-8; compile-command: "bundle execute rspec ../../spec/soldier_spec.rb" -*-
 # frozen-string-literal: true
 
 module Bioshogi
@@ -56,6 +55,7 @@ module Bioshogi
     end
 
     include SimpleModel
+    include TechniqueMatcherMethods
 
     attr_accessor :piece
     attr_accessor :promoted
@@ -73,6 +73,10 @@ module Bioshogi
       Assertion.assert { place          }
     end
 
+    def normal?
+      !promoted
+    end
+
     def attributes
       { piece: piece, promoted: promoted, place: place, location: location }
     end
@@ -95,15 +99,18 @@ module Bioshogi
       attributes.hash
     end
 
+    # 180度回転
     def flip
       self.class.create(piece: piece, promoted: promoted, place: place.flip, location: location.flip)
     end
 
+    # 左右反転
     def flop
       self.class.create(piece: piece, promoted: promoted, place: place.flop, location: location)
     end
 
-    def flip_if_white
+    # ▲視点に統一
+    def white_then_flip
       if location.key == :white
         flip
       else
@@ -130,8 +137,8 @@ module Bioshogi
     ################################################################################ Utility
 
     # 自分を移動元の状態と考えて to に移動したとき成れるか？
-    def next_promotable?(to)
-      piece.promotable? && !promoted && (place.promotable?(location) || to.promotable?(location))
+    def tsugini_nareru_on?(to)
+      piece.promotable? && !promoted && (place.opp_side?(location) || to.opp_side?(location))
     end
 
     # 移動可能な座標を取得
@@ -142,7 +149,7 @@ module Bioshogi
     # 二歩？
     def collision_pawn(board)
       if piece.key == :pawn && !promoted
-        board.vertical_pieces(place.x).find do |e|
+        board.vertical_soldiers(place.column).find do |e|
           e.piece.key == :pawn && !e.promoted && e.location == location
         end
       end
@@ -155,90 +162,18 @@ module Bioshogi
 
     # 自分を▲側に補正したときの座標
     def normalized_place
-      place.flip_if_white(location)
+      place.white_then_flip(location)
     end
 
     # 入玉宣言時の得点
     def ek_score
-      if place.promotable?(location)
+      if place.opp_side?(location)
         piece.ek_score
       else
         0
       end
     end
 
-    # 手筋判定用
-    concerning :TechniqueMatcherMethods do
-      # 自分の側の一番下を0としてどれだけ前に進んでいるかを返す
-      def bottom_spaces
-        Dimension::PlaceY.dimension - 1 - top_spaces
-      end
-
-      # 自分の側の一番上を0としてあとどれだけで突き当たるかの値
-      def top_spaces
-        place.flip_if_white(location).y.value
-      end
-
-      # 「左右の壁からどれだけ離れているかの値」の小さい方(先後関係なし)
-      def smaller_one_of_side_spaces
-        [place.x.value, __distance_from_right].min
-      end
-
-      # 左右の壁に近い方に進むときの符号(先手視点なので先後関係なし)
-      def sign_to_goto_closer_side
-        if place.x.value > __distance_from_right
-          1
-        else
-          -1
-        end
-      end
-
-      # 先手から見て右からの距離
-      def __distance_from_right
-        Dimension::PlaceX.dimension - 1 - place.x.value
-      end
-
-      # センターにいる？
-      def center_place?
-        place.x.value == Dimension::PlaceX.dimension / 2
-      end
-
-      # 自玉の位置にいる？
-      def initial_place?
-        center_place? && bottom_spaces == 0
-      end
-
-      # 駒の重さ(=価値) 常にプラス
-      def abs_weight
-        piece.any_weight(promoted)
-      end
-
-      # 駒の重さ(=価値)。先手視点。後手ならマイナスになる
-      def relative_weight
-        abs_weight * location.value_sign
-      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
-
     ################################################################################ Formatter
 
     def to_s

data/lib/bioshogi/soldier_walker.rb

@@ -78,7 +78,7 @@ module Bioshogi
       soldier = origin_soldier.merge(place: place)
 
       # 成れるなら成る
-      if origin_soldier.next_promotable?(soldier.place)
+      if origin_soldier.tsugini_nareru_on?(soldier.place)
         move_hand = Hand::Move.create(soldier: soldier.merge(promoted: true), origin_soldier: origin_soldier, captured_soldier: captured_soldier)
         success = piece_store_core(container, move_hand, yielder, options)
         if success

data/lib/bioshogi/turn_info.rb

@@ -46,9 +46,9 @@ module Bioshogi
     # for Analyzer
     def order_key
       if display_turn.even?
-        :sente
+        :order_first
       else
-        :gote
+        :order_second
       end
     end
 

data/lib/bioshogi/v/preset_vectors.rb

@@ -0,0 +1,129 @@
+module Bioshogi
+  class V
+    module PresetVectors
+      ################################################################################
+
+      def around_vectors
+        @around_vectors ||= [up, right, down, left]
+      end
+
+      def left_right_vectors
+        @left_right_vectors ||= [left, right]
+      end
+
+      def wariuchi_vectors
+        @wariuchi_vectors ||= [down_left, down_right]
+      end
+
+      def ikkenryu_vectors
+        @ikkenryu_vectors ||= [left_left, right_right, up_up, down_down]
+      end
+
+      def keima_vectors
+        @keima_methods ||= [up_up_left, up_up_right]
+      end
+
+      def ginbasami_verctors
+        @ginbasami_verctors ||= [[right, right_right, right_right_up], [left,  left_left,   left_left_up]]
+      end
+
+      def tsugikei_vectors
+        @tsugikei_methods ||= [down_down_right, down_down_left]
+      end
+
+      def tasuki_vectors
+        @tasuki_vectors ||= [[up_left, down_right], [up_right, down_left]]
+      end
+
+      def bishop_naname_mae_vectors
+        @bishop_naname_mae_vectors ||= [up_left, up_right]
+      end
+
+      ################################################################################ 上下左右
+
+      def right
+        @right ||= self[1, 0]
+      end
+
+      def down
+        @down ||= self[0, 1]
+      end
+
+      def up
+        @up ||= -down
+      end
+
+      def left
+        @left ||= -right
+      end
+
+      ################################################################################ 斜め
+
+      def up_left
+        @up_left ||= up + left
+      end
+
+      def up_right
+        @up_right ||= up + right
+      end
+
+      def down_left
+        @down_left ||= down + left
+      end
+
+      def down_right
+        @down_right ||= down + right
+      end
+
+      ################################################################################ 一間竜
+
+      def right_right
+        @right_right ||= right + right
+      end
+
+      def left_left
+        @left_left ||= left + left
+      end
+
+      def up_up
+        @up_up ||= up + up
+      end
+
+      def down_down
+        @down_down ||= down + down
+      end
+
+      ################################################################################ 桂馬
+
+      def up_up_right
+        @up_up_right ||= up + up + right
+      end
+
+      def up_up_left
+        @up_up_left ||= up + up + left
+      end
+
+      ################################################################################ 継ぎ桂チェック用
+
+      def down_down_right
+        @down_down_right ||= down + down + right
+      end
+
+      def down_down_left
+        @down_down_left ||= down + down + left
+      end
+
+      ################################################################################ 銀ばさみチェック用
+
+      def right_right_up
+        @right_right_up ||= right + right + up
+      end
+
+      def left_left_up
+        @left_left_up ||= left + left + up
+      end
+
+      ################################################################################
+    end
+  end
+end

data/lib/bioshogi/v.rb

@@ -1,12 +1,14 @@
 module Bioshogi
   class V
+    extend PresetVectors
+
     class << self
       def one
-        self[1, 1]
+        @one ||= self[1, 1]
       end
 
       def half
-        self[0.5, 0.5]
+        @half ||= self[0.5, 0.5]
       end
 
       def [](...)

data/lib/bioshogi/version.rb

@@ -1,3 +1,3 @@
 module Bioshogi
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/lib/bioshogi.rb

@@ -37,6 +37,8 @@ module Bioshogi
   mattr_accessor(:run_counts) { Hash.new(0) }
 
   SFEN1 = "position sfen l+n1g1g1n+l/1ks2r1+r1/1pppp1bpp/p2+b+sp+p2/9/P1P1+SP1PP/1+P+BPP1P2/1BK1GR1+R1/+L+NSG3NL b R2B3G4S5N11L99Pr2b3g4s5n11l99p 1"
+
+  ANALYSIS_VERSION = 3
 end
 
 if true

data//347/275/256/343/201/215/346/217/233/343/201/210/346/216/250/345/245/250.txt

@@ -32,7 +32,7 @@
 ~/src/bioshogi/lib/bioshogi/analysis/戦法/一直線穴熊.kif:8:棋戦詳細：第21期棋王戦予選決勝
 ~/src/bioshogi/lib/bioshogi/analysis/戦法/対振り持久戦.kif:9:棋戦詳細：第63期順位戦C級2組1回戦
 ~/src/bioshogi/lib/bioshogi/analysis/戦法/矢倉▲3七銀戦法.kif:8:棋戦詳細：第1回銀河戦本戦Bブロック22回戦
-~/src/bioshogi/lib/bioshogi/analysis/戦法/戸部流4→3戦法.kif:9:棋戦詳細：第63期順位戦C級2組1回戦
+~/src/bioshogi/lib/bioshogi/analysis/戦法/戸辺流4→3戦法.kif:9:棋戦詳細：第63期順位戦C級2組1回戦
 ~/src/bioshogi/lib/bioshogi/analysis/戦法/角交換振り飛車.kif:6:棋戦詳細：名人八七段勝抜戦
 ~/src/bioshogi/lib/bioshogi/analysis/戦法/遠山流.kif:8:棋戦詳細：アマプロ勝ち抜き戦（近代将棋1995年4月号）
 ~/src/bioshogi/lib/bioshogi/analysis/戦法/四手角.kif:9:棋戦詳細：第18期棋王戦本戦3回戦

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bioshogi
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Akira Ikeda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-30 00:00:00.000000000 Z
+date: 2024-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -297,6 +297,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dumbjump"
 - ".gitignore"
 - ".ruby-version"
 - ".travis.yml"
@@ -331,9 +332,11 @@ files:
 - lib/bioshogi/ai/evaluator/opening_basic_table.rb
 - lib/bioshogi/ai/player_brain_mod.rb
 - lib/bioshogi/ai/versus.rb
+- lib/bioshogi/analysis.rb
 - lib/bioshogi/analysis/analyzer.rb
 - lib/bioshogi/analysis/analyzer_mod.rb
 - lib/bioshogi/analysis/attack_info.rb
+- lib/bioshogi/analysis/basic_accessor.rb
 - lib/bioshogi/analysis/board_piller_methods.rb
 - lib/bioshogi/analysis/chaos_info.rb
 - lib/bioshogi/analysis/defense_info.rb
@@ -353,10 +356,9 @@ files:
 - lib/bioshogi/analysis/tactic_info.rb
 - lib/bioshogi/analysis/tactic_stat.rb
 - lib/bioshogi/analysis/tactic_validator.rb
-- lib/bioshogi/analysis/tech_accessor.rb
 - lib/bioshogi/analysis/technique_info.rb
 - lib/bioshogi/analysis/technique_matcher_helper.rb
-- lib/bioshogi/analysis/technique_matcher_info.rb
+- lib/bioshogi/analysis/technique_verify_info.rb
 - lib/bioshogi/analysis/備考/ロケット.kif
 - lib/bioshogi/analysis/備考/入玉.kif
 - lib/bioshogi/analysis/備考/名人に定跡なし.kif
@@ -552,6 +554,7 @@ files:
 - lib/bioshogi/analysis/戦法/ゴキゲン中飛車.kif
 - lib/bioshogi/analysis/戦法/ゴリゴリ金.kif
 - lib/bioshogi/analysis/戦法/ゴリラの右手.kif
+- lib/bioshogi/analysis/戦法/ゴリ違い角.kif
 - lib/bioshogi/analysis/戦法/ショーダンオリジナル.kif
 - lib/bioshogi/analysis/戦法/ショーダンシステム.kif
 - lib/bioshogi/analysis/戦法/タランチュラ戦法.kif
@@ -626,7 +629,7 @@ files:
 - lib/bioshogi/analysis/戦法/左美濃急戦.kif
 - lib/bioshogi/analysis/戦法/幻想四間飛車.kif
 - lib/bioshogi/analysis/戦法/必笑ひっかけ戦法.kif
-- lib/bioshogi/analysis/戦法/戸部流4→3戦法.kif
+- lib/bioshogi/analysis/戦法/戸辺流4→3戦法.kif
 - lib/bioshogi/analysis/戦法/新ポンポン桂.kif
 - lib/bioshogi/analysis/戦法/新嬉野流.kif
 - lib/bioshogi/analysis/戦法/新村田システム.kif
@@ -710,6 +713,7 @@ files:
 - lib/bioshogi/analysis/戦法/金銀橋.kif
 - lib/bioshogi/analysis/戦法/鈴木流早石田.kif
 - lib/bioshogi/analysis/戦法/銀雲雀.kif
+- lib/bioshogi/analysis/戦法/錆刀戦法.kif
 - lib/bioshogi/analysis/戦法/鎖鎌銀.kif
 - lib/bioshogi/analysis/戦法/間宮久夢流.kif
 - lib/bioshogi/analysis/戦法/阪田流2手目△9四歩.kif
@@ -724,6 +728,7 @@ files:
 - lib/bioshogi/analysis/戦法/飯島流引き角戦法.kif
 - lib/bioshogi/analysis/戦法/飯島流相掛かり引き角戦法.kif
 - lib/bioshogi/analysis/戦法/高田流左玉.kif
+- lib/bioshogi/analysis/戦法/鬼六流どっかん飛車.kif
 - lib/bioshogi/analysis/戦法/鬼殺し.kif
 - lib/bioshogi/analysis/戦法/鬼殺し向かい飛車.kif
 - lib/bioshogi/analysis/戦法/魔界四間飛車.kif
@@ -1077,10 +1082,10 @@ files:
 - lib/bioshogi/dimension.rb
 - lib/bioshogi/dimension/base.rb
 - lib/bioshogi/dimension/char_info.rb
+- lib/bioshogi/dimension/column.rb
 - lib/bioshogi/dimension/dimension_info.rb
 - lib/bioshogi/dimension/module_methods.rb
-- lib/bioshogi/dimension/place_x.rb
-- lib/bioshogi/dimension/place_y.rb
+- lib/bioshogi/dimension/row.rb
 - lib/bioshogi/errors.rb
 - lib/bioshogi/extreme_validator.rb
 - lib/bioshogi/formatter/akf_builder.rb
@@ -1187,6 +1192,7 @@ files:
 - lib/bioshogi/simulator.rb
 - lib/bioshogi/single_clock.rb
 - lib/bioshogi/soldier.rb
+- lib/bioshogi/soldier/technique_matcher_methods.rb
 - lib/bioshogi/soldier_box.rb
 - lib/bioshogi/soldier_walker.rb
 - lib/bioshogi/source.rb
@@ -1207,6 +1213,7 @@ files:
 - lib/bioshogi/turn_info.rb
 - lib/bioshogi/v.rb
 - lib/bioshogi/v/once_vector.rb
+- lib/bioshogi/v/preset_vectors.rb
 - lib/bioshogi/v/repeat_vector.rb
 - lib/bioshogi/vector_constants.rb
 - lib/bioshogi/version.rb