bioshogi 0.0.15 → 0.0.18

data/lib/bioshogi/assets/images/piece/nureyon/original/BS0.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" style="overflow:visible" viewBox="-150 -150 300 300" height="300px" width="300px">
+  <rect fill-opacity="0" fill="rgb(0,0,0)" height="300" width="300" y="-150" x="-150"/>
+  <svg version="1.1" y="-250" x="-250" viewBox="-250 -250 500 500" height="500px" width="500px" style="overflow:visible">
+    <g transform="rotate(0,0,0)" stroke-linejoin="round" fill="#fff">
+      <path stroke-linecap="butt" stroke-linejoin="round" stroke="none" fill="rgb(255,227,156)" d="m0.002-147l-98.2634 51.815l-24.5653 242.185h245.653l-24.5653-242.185z"/>
+      <path stroke-linecap="butt" stroke-linejoin="round" stroke="none" fill="rgb(48,48,48)" d="m16.892999 20.617h10.4533c3.36 17.7333 8.026669 33.6 14.7467 47.04c-8.4 1.86667-16.9867 3.73334-25.2 5.6zm41.44-64.773301v12.88h-41.44v-12.88zm-41.44 45.1733v-13.6267h41.44v13.6267zm-79.3334-25.5733c7.84001-8.58667 13.8134-17.36 18.8533-25.3867c7.84001 7.46667 16.239999 17.5467 21.84 25.3867zm134.213 49.84c-4.66667 5.04-11.76 11.3867-18.48 16.4267c-2.61333-6.53333-4.48-13.6267-6.15999-21.0933h32.2933v-84.3733h-83.2534v141.12l-6.15999 1.12l-0.56-10.08c-8.58667 1.49333-17.36 2.8-25.9467 4.29333v-46.2933h24.64v-18.8533h-24.64v-13.6267h20.5333v-17.7333l11.3867-13.44c-6.90665-10.08-21.6533-23.8933-33.04-33.2267h-18.1067c-6.53333 14.3733-17.92 31.92-34.5333 45.1733c4.48 2.98667 10.64 10.2667 13.6267 14.7467l2.98666-2.61334v7.09334h17.92v13.6267h-26.1333v18.8533h26.1333v49.28c-10.8267 1.68-20.72 2.98667-28.7467 4.10667l4.29332 19.7867c18.1067-2.98666 41.8134-7.09333 64.586698-11.3867l3.73334 13.44c16.4267-3.73334 37.1467-8.58667 56.56-13.44l-2.42666-19.7867c8.02666 15.4933 18.6667 27.6267 33.7867 35.6533c2.98665-5.78666 9.33333-14.1867 14.1867-18.48c-12.5067-5.78666-22.0267-15.12-29.12-27.0667c8.02666-5.04 17.7333-11.76 25.5733-18.1067zm-151.947 11.9467c2.98667 10.2667 5.78667 23.52 6.34667 32.479999l15.3067-4.29334c-0.93333-8.58666-3.92-21.84-7.09333-31.92zm58.6133 29.8667c3.17333-8.02666 6.90666-20.16 10.64-31.1733l-16.8-4.106672c-1.12 9.14667-4.29333 22.7733-6.90666 31.36z"/>
+      <path stroke-linecap="butt" stroke-linejoin="round" stroke-width="0" stroke-opacity="1" stroke="rgb(48,48,48)" fill="none" d="m0.002-147l-98.2634 51.815l-24.5653 242.185h245.653l-24.5653-242.185z"/>
+    </g>
+  </svg>
+</svg>

data/lib/bioshogi/assets/images/piece/nureyon/original/BS1.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" style="overflow:visible" viewBox="-150 -150 300 300" height="300px" width="300px">
+  <rect fill-opacity="0" fill="rgb(0,0,0)" height="300" width="300" y="-150" x="-150"/>
+  <svg version="1.1" y="-250" x="-250" viewBox="-250 -250 500 500" height="500px" width="500px" style="overflow:visible">
+    <g transform="rotate(0,0,0)" stroke-linejoin="round" fill="#fff">
+      <path stroke-linecap="butt" stroke-linejoin="round" stroke="none" fill="rgb(255,227,156)" d="m0.002-147l-98.2634 51.815l-24.5653 242.185h245.653l-24.5653-242.185z"/>
+      <path stroke-linecap="butt" stroke-linejoin="round" stroke="none" fill="rgb(239,69,74)" d="m-47.694-3.463c19.4133-14.3733 36.0267-31.1733 46.6667-46.2933c10.8267 15.12 28.7467 32.106699 48.16 46.2933zm58.4267 60.48h52.2667v-19.4133h-52.2667v-21.4667h43.68v-14.56c6.72 4.66667 13.44 8.77333 20.16 12.5067c4.10667-6.90667 8.96-14 14.7467-19.9733c-29.4933-12.5067-59.92-36.96-79.8933-65.3333h-22.96c-13.8133 22.7733-43.8667 51.52-75.7867 67.5733c5.04 4.66667 11.2 12.6933 14 17.92c7.09333-3.92 14-8.21333 20.72-12.88v14.7467h42.1867v21.4667h-51.7067v19.4133h51.7067v22.2133h-66.64v19.9733h158.853v-19.9733h-69.0667z"/>
+      <path stroke-linecap="butt" stroke-linejoin="round" stroke-width="0" stroke-opacity="1" stroke="rgb(48,48,48)" fill="none" d="m0.002-147l-98.2634 51.815l-24.5653 242.185h245.653l-24.5653-242.185z"/>
+    </g>
+  </svg>
+</svg>

data/lib/bioshogi/assets/images/piece/nureyon/original/BX0.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" style="overflow:visible" viewBox="-150 -150 300 300" height="300px" width="300px">
+  <rect fill-opacity="0" fill="rgb(0,0,0)" height="300" width="300" y="-150" x="-150"/>
+  <svg version="1.1" y="-250" x="-250" viewBox="-250 -250 500 500" height="500px" width="500px" style="overflow:visible">
+    <g transform="rotate(0,0,0)" stroke-linejoin="round" fill="#fff">
+      <path stroke-linecap="butt" stroke-linejoin="round" stroke="none" fill="rgb(255,227,156)" d="m0.002-147l-98.2634 51.815l-24.5653 242.185h245.653l-24.5653-242.185z"/>
+      <path stroke-linecap="butt" stroke-linejoin="round" stroke="none" fill="rgb(48,48,48)" d="m10.452999 75.683v-50.7733h57.3067v-21.6533h-57.3067v-41.0667h65.519999v-21.84h-152.32v21.84h62.3467v41.0667h-53.3867v21.6533h53.3867v50.7733h-70.56v21.6533h169.12v-21.6533z"/>
+      <path stroke-linecap="butt" stroke-linejoin="round" stroke="none" fill="rgb(48,48,48)" d="m22.213 40.216999c10.2667 10.4533 24.64 25.0133 31.36 33.7867l16.8-14.9333c-7.28-8.58667-22.0267-22.2133-32.1067-31.7333z"/>
+      <path stroke-linecap="butt" stroke-linejoin="round" stroke-width="0" stroke-opacity="1" stroke="rgb(48,48,48)" fill="none" d="m0.002-147l-98.2634 51.815l-24.5653 242.185h245.653l-24.5653-242.185z"/>
+    </g>
+  </svg>
+</svg>

data/lib/bioshogi/assets/images/piece/nureyon/original/README.org

@@ -0,0 +1,5 @@
+* original に入れているけどオリジナルではない
+* 色はここで調整している
+* K0 は X0(玉) の点を手動で取った
+* 角と馬は文字の位置を手動で調整した
+

data/lib/bioshogi/assets/images/piece/nureyon/original/convert.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+mv 16.svg BK0.svg
+mv 24.svg BR0.svg
+mv 26.svg BB0.svg
+mv 17.svg BG0.svg
+mv 18.svg BS0.svg
+mv 20.svg BN0.svg
+mv 22.svg BL0.svg
+mv 28.svg BP0.svg
+mv 25.svg BR1.svg
+mv 27.svg BB1.svg
+mv 19.svg BS1.svg
+mv 21.svg BN1.svg
+mv 23.svg BL1.svg
+mv 29.svg BP1.svg

data/lib/bioshogi/assets/images/piece/nureyon/original/style.rb

@@ -0,0 +1,26 @@
+require "pathname"
+require "nokogiri"
+
+NEW_RED  = "rgb(239,69,74)" # 朱色 (https://www.color-sample.com/colors/257/)
+NEW_EDGE = 0
+
+BLACK_DEFAULT = "rgb(48,48,48)"
+
+Pathname("svg").glob("*.svg") do |e|
+  puts e
+  str = e.read
+  doc = Nokogiri::XML(str)
+
+  element = doc.at("path[stroke-width]")
+  element["stroke-width"] = NEW_EDGE
+
+  if e.basename.to_s.match?(/^..1/)
+    doc.search("path[stroke=none]").each do |e|
+      if e["fill"] == BLACK_DEFAULT
+        e["fill"] = NEW_RED
+      end
+    end
+  end
+
+  e.write(doc.to_s)
+end

data/lib/bioshogi/assets/images/piece/portella/convert.rb

@@ -0,0 +1,89 @@
+# convert backup/WG0.png -background none -gravity north -crop 249x245+0+11 +repage -extent 249x256 WG0.png
+
+require "rmagick"
+
+[
+  # black
+  { key: "0GY", output: "BK0", shift:   0, }, # 玉
+  { key: "0HI", output: "BR0", shift:   0, }, # 飛
+  { key: "0RY", output: "BR1", shift:   0, }, # 龍
+  { key: "0KA", output: "BB0", shift:   0, }, # 角
+  { key: "0UM", output: "BB1", shift:   0, }, # 馬
+  { key: "0KI", output: "BG0", shift:   0, }, # 金
+  { key: "0GI", output: "BS0", shift:   0, }, # 銀
+  { key: "0NG", output: "BS1", shift:   0, }, # 成銀
+  { key: "0KE", output: "BN0", shift:   0, }, # 桂
+  { key: "0NK", output: "BN1", shift:   0, }, # 成桂
+  { key: "0KY", output: "BL0", shift:   0, }, # 香
+  { key: "0NY", output: "BL1", shift:   0, }, # 成香
+  { key: "0FU", output: "BP0", shift:   0, }, # 歩
+  { key: "0TO", output: "BP1", shift:   0, }, # と
+  # white
+  { key: "1OU", output: "WK0", shift:   0, }, # 王
+  { key: "1HI", output: "WR0", shift:  -2, }, # 飛
+  { key: "1RY", output: "WR1", shift:  -2, }, # 龍
+  { key: "1KA", output: "WB0", shift:  -2, }, # 角
+  { key: "1UM", output: "WB1", shift:  -2, }, # 馬
+  { key: "1KI", output: "WG0", shift:  -7, }, # 金
+  { key: "1GI", output: "WS0", shift:  -8, }, # 銀
+  { key: "1NG", output: "WS1", shift:  -8, }, # 成銀
+  { key: "1KE", output: "WN0", shift: -10, }, # 桂
+  { key: "1NK", output: "WN1", shift: -10, }, # 成桂
+  { key: "1KY", output: "WL0", shift: -11, }, # 香
+  { key: "1NY", output: "WL1", shift: -11, }, # 成香
+  { key: "1FU", output: "WP0", shift: -15, }, # 歩
+  { key: "1TO", output: "WP1", shift: -15, }, # と
+].each do |e|
+  in_file = "original/#{e[:key]}.png"
+  # system "identify #{in_file}"
+
+  image = Magick::Image.read(in_file).first
+  image.background_color = "transparent"
+  w = image.columns
+  h = image.rows
+
+  if e[:shift].negative?
+    shift = -e[:shift]
+    image = image.crop(0, shift, w, h - shift)
+    image = image.extent(w, h, 0, shift)
+  end
+
+  if e[:shift].positive?
+    shift = e[:shift]
+    image = image.crop(0, 0, w, h - shift)
+    image = image.extent(w, h, 0, -shift)
+  end
+
+  output = "#{e[:output] || e[:key]}.png"
+  image.write(output)
+  system "identify #{output}"
+  # system "open #{output}"
+end
+# >> BK0.png PNG 249x256 249x256+0+0 8-bit sRGB 21394B 0.000u 0:00.000
+# >> BR0.png PNG 249x256 249x256+0+0 8-bit sRGB 21201B 0.000u 0:00.000
+# >> BR1.png PNG 249x256 249x256+0+0 8-bit sRGB 21088B 0.000u 0:00.000
+# >> BB0.png PNG 249x256 249x256+0+0 8-bit sRGB 20445B 0.000u 0:00.000
+# >> BB1.png PNG 249x256 249x256+0+0 8-bit sRGB 21050B 0.000u 0:00.000
+# >> BG0.png PNG 249x256 249x256+0+0 8-bit sRGB 18238B 0.000u 0:00.000
+# >> BS0.png PNG 249x256 249x256+0+0 8-bit sRGB 19030B 0.000u 0:00.000
+# >> BS1.png PNG 249x256 249x256+0+0 8-bit sRGB 18668B 0.000u 0:00.000
+# >> BN0.png PNG 249x256 249x256+0+0 8-bit sRGB 18237B 0.000u 0:00.000
+# >> BN1.png PNG 249x256 249x256+0+0 8-bit sRGB 17585B 0.000u 0:00.000
+# >> BL0.png PNG 249x256 249x256+0+0 8-bit sRGB 17442B 0.000u 0:00.000
+# >> BL1.png PNG 249x256 249x256+0+0 8-bit sRGB 16914B 0.000u 0:00.000
+# >> BP0.png PNG 249x256 249x256+0+0 8-bit sRGB 15925B 0.000u 0:00.000
+# >> BP1.png PNG 249x256 249x256+0+0 8-bit sRGB 14981B 0.000u 0:00.000
+# >> WK0.png PNG 249x256 249x256+0+0 8-bit sRGB 22284B 0.000u 0:00.000
+# >> WR0.png PNG 249x256 249x258+0+2 8-bit sRGB 23687B 0.000u 0:00.000
+# >> WR1.png PNG 249x256 249x258+0+2 8-bit sRGB 22756B 0.000u 0:00.000
+# >> WB0.png PNG 249x256 249x258+0+2 8-bit sRGB 22615B 0.000u 0:00.000
+# >> WB1.png PNG 249x256 249x258+0+2 8-bit sRGB 22748B 0.000u 0:00.000
+# >> WG0.png PNG 249x256 249x263+0+7 8-bit sRGB 20611B 0.000u 0:00.000
+# >> WS0.png PNG 249x256 249x264+0+8 8-bit sRGB 20354B 0.000u 0:00.000
+# >> WS1.png PNG 249x256 249x264+0+8 8-bit sRGB 20174B 0.000u 0:00.000
+# >> WN0.png PNG 249x256 249x266+0+10 8-bit sRGB 19168B 0.000u 0:00.000
+# >> WN1.png PNG 249x256 249x266+0+10 8-bit sRGB 18829B 0.000u 0:00.000
+# >> WL0.png PNG 249x256 249x267+0+11 8-bit sRGB 18242B 0.000u 0:00.000
+# >> WL1.png PNG 249x256 249x267+0+11 8-bit sRGB 18471B 0.000u 0:00.000
+# >> WP0.png PNG 249x256 249x272+0+15 8-bit sRGB 17312B 0.000u 0:00.000
+# >> WP1.png PNG 249x256 249x272+0+15 8-bit sRGB 15967B 0.000u 0:00.000

data/lib/bioshogi/board/basic.rb

@@ -15,10 +15,12 @@ module Bioshogi
 
       include UpdateMethods
       include ReaderMethods
-      include TechniqueMatcherMethods
 
-      prepend Analysis::BoardPillerMethods
-      prepend PieceCountsMethods
+      # FIXME: 画像用の場合はこれらを含まないクラスを使いたい
+      include DetectorMethods
+      prepend Analysis::ColumnSoldierCounterMethods      # カラムをキーにして列の駒数を得る
+      prepend Analysis::BoardPieceCountsMethods          # 「先後と駒」をキーにして駒数を得る / 先後をキーにして駒数を得る
+      prepend Analysis::SoldierLookupTableMethods              # 「先後と駒」をキーにして soldier を得る
     end
   end
 end

data/lib/bioshogi/board/csa_formatter.rb

@@ -1,4 +1,5 @@
 # frozen-string-literal: true
+
 # http://www2.computer-shogi.org/protocol/record_v22.html
 
 module Bioshogi

data/lib/bioshogi/board/{technique_matcher_methods.rb → detector_methods.rb}

@@ -1,6 +1,6 @@
 module Bioshogi
   module Board
-    module TechniqueMatcherMethods
+    module DetectorMethods
       # 180度回転した盤面を返す
       def flip
         self.class.new.tap do |board|

data/lib/bioshogi/board/kakinoki_formatter.rb

@@ -1,4 +1,5 @@
 # frozen-string-literal: true
+
 #
 #    ９ ８ ７ ６ ５ ４ ３ ２ １
 #  +---------------------------+

data/lib/bioshogi/board/reader_methods.rb

@@ -13,7 +13,7 @@ module Bioshogi
         lookup(place) or raise PieceNotFoundOnBoard, "#{place}に何もありません\n#{self}"
       end
 
-      def empty_cell?(place)
+      def cell_empty?(place)
         !lookup(place)
       end
 

data/lib/bioshogi/board_parser/compare_board_parser.rb

@@ -38,7 +38,7 @@ module Bioshogi
               soldiers << soldier
             end
           when something != "・"
-            other_objects << {place: place, prefix_char: prefix_char, something: something}
+            other_objects << { place: place, prefix_char: prefix_char, something: something }
           end
         end
       end

data/lib/bioshogi/board_parser/kakinoki_board_parser.rb

@@ -59,20 +59,20 @@ module Bioshogi
 
       def place_validate(x, y, something)
         unless @h_units[x] && @v_units[y]
-          raise SyntaxDefact, "盤面の情報が読み取れません。#{something.inspect} が盤面からはみ出ているかもしれません。左上の升目を (0, 0) としたときの (#{x}, #{y}) の地点です\n#{@source}"
+          raise SyntaxDefact, "盤面の情報が読み取れません。おそらく #{something.inspect} が盤面からはみ出ています。#{coordinate_message(x, y)}\n#{@source}"
         end
       end
 
       def prefix_char_validate(x, y, prefix_char)
         unless prefix_char.match?(/[[:ascii:]]/)
-          raise SyntaxDefact, "盤面がずれているかもしれません。prefix_char=#{prefix_char.inspect}。左上の升目を (0, 0) としたときの (#{x}, #{y}) の地点です\n#{@source}"
+          raise SyntaxDefact, "盤面がずれています。#{prefix_char.inspect} は想定外の文字です。#{coordinate_message(x, y)}\n#{@source}"
         end
       end
 
       def cell_walker
         h_units_read
 
-        mds = shape_lines.collect { |v| v.match(/\|(?<inline>.*)\|(?<y>.)?/) }.compact
+        mds = shape_lines.collect { |v| v.match(/\|(?<inline>.*?)\s*\|(?<y>.)?/) }.compact
         @v_units = mds.collect.with_index { |v, i| v[:y] || Dimension::Row.char_infos[i] }
         inlines = mds.collect { |v| v[:inline] }
 
@@ -90,6 +90,10 @@ module Bioshogi
       def build(place, piece, location_key)
         Soldier.new_with_promoted(piece, place: place, location: Location.fetch(location_key))
       end
+
+      def coordinate_message(x, y)
+        "左上を原点としたときとしたときの#{y.next}行目の#{x.next}列目の地点です。"
+      end
     end
   end
 end

data/lib/bioshogi/board_parser.rb

@@ -18,7 +18,7 @@ module Bioshogi
       private
 
       def parser_class_find(source)
-        support_parsers.find {|e| e.accept?(source) }
+        support_parsers.find { |e| e.accept?(source) }
       end
 
       def support_parsers

data/lib/bioshogi/column_soldier_counter.rb

@@ -0,0 +1,47 @@
+# frozen-string-literal: true
+
+#
+# 列の駒数をなるべく高速に判定する
+#
+module Bioshogi
+  class ColumnSoldierCounter
+    attr_reader :counts
+
+    def initialize
+      reset
+    end
+
+    def reset
+      @counts = Array.new(Dimension::Column.dimension_size, 0)
+    end
+
+    def set(place)
+      update(place, 1)
+    end
+
+    def remove(place)
+      update(place, -1)
+    end
+
+    def filled?(column)
+      @counts[column.value] >= Dimension::Row.dimension_size
+    end
+
+    private
+
+    def update(place, sign)
+      key = place.column.value
+      count = @counts[key] + sign
+      validate!(place, count)
+      @counts[key] = count
+    end
+
+    def validate!(place, count)
+      if count > Dimension::Row.dimension_size
+        raise MustNotHappen, "#{place.column.hankaku_number}の列に#{count}個目の駒を配置しようとしています。棋譜を二重に読ませようとしていませんか？"
+      elsif count.negative?
+        raise MustNotHappen, "#{place.column.hankaku_number}の列の駒の数がマイナスになろうとしている"
+      end
+    end
+  end
+end

data/lib/bioshogi/container/core_methods.rb

@@ -4,20 +4,32 @@ module Bioshogi
   module Container
     concern :CoreMethods do
       attr_writer :board
+      attr_accessor :initial_preset_info
 
-      def before_run_process
+      def initialize(params = {})
+        self.params.update(params)
       end
 
-      def params
-        @params ||= {
-          :analyzer_enable           => false,
-          :analyzer_technique_enable => false,
-          :candidate_enable               => true,
-          :validate_enable                => true,
-          :board_class                    => Board,
+      def after_setup
+        initial_preset_info_set
+      end
+
+      def default_params
+        {
+          :analysis_feature        => false,
+          :ki2_function            => true,
+          :validate_feature        => true,
+          :double_pawn_detect      => true, # 二歩を検出するか？
+          :warp_detect             => true, # 角ワープを検出するか？
+          :board_class             => Board,
+          :last_action_info1        => LastActionInfo[:TORYO],
         }
       end
 
+      def params
+        @params ||= default_params
+      end
+
       def deep_dup
         Marshal.load(Marshal.dump(self))
       end
@@ -34,6 +46,14 @@ module Bioshogi
         @board ||= params[:board_class].new
       end
 
+      def initial_preset_info_set
+        unless defined?(@initial_preset_info)
+          @initial_preset_info = board.preset_info
+        end
+
+        nil
+      end
+
       def placement_from_bod(str)
         str = str.lines.collect(&:strip).join("\n")
         if md = str.match(/(?<board>^\+\-.*\-\+$)/m)
@@ -94,6 +114,14 @@ module Bioshogi
       def load_from_sfen(sfen_info)
         SfenImporter.new(self, sfen_info).import_all
       end
+
+      ################################################################################
+
+      def to_header_h
+        {}.merge(*players.collect(&:to_header_h), to_header_shared_h)
+      end
+
+      ################################################################################
     end
   end
 end

data/lib/bioshogi/container/execute_methods.rb

@@ -9,10 +9,18 @@ module Bioshogi
           delegate :to_kif_a, :to_ki2_a, :to_kif_oneline, to: :hand_logs
         end
 
-        attr_writer :kill_count      # 駒を取った回数
+        attr_accessor :kill_count      # 総キル数
         attr_accessor :critical_turn # 最初の駒が取られる直前の手数           (avg: 22.6328)
         attr_accessor :outbreak_turn # 「歩と角」を除く駒が取られる直前の手数 (avg: 41.8402)
 
+        def tyuuban_ikou
+          outbreak_turn
+        end
+
+        def joban
+          !outbreak_turn
+        end
+
         def kill_count
           @kill_count ||= 0
         end
@@ -22,6 +30,9 @@ module Bioshogi
         end
       end
 
+      def before_execute_all
+      end
+
       def execute(str, options = {})
         options = {
           executor_class: executor_class,
@@ -32,9 +43,29 @@ module Bioshogi
         end
       end
 
+      def after_execute_all
+        if params[:analysis_feature]
+          Analysis::Atsumeruyo.new(self).call
+          Analysis::FinalizeTagDetector.new(self).call
+        end
+      end
+
       def executor_class
         PlayerExecutor::Human
       end
+
+      def to_header_shared_h
+        if params[:analysis_feature]
+          {
+            "接触"     => critical_turn.try { "#{self}手目" },
+            "開戦"     => outbreak_turn.try { "#{self}手目" },
+            "総手数"   => "#{turn_info.display_turn}手",
+            "総キル数" => "#{kill_count}キル",
+          }
+        else
+          {}
+        end
+      end
     end
   end
 end

data/lib/bioshogi/container/players_methods.rb

@@ -4,22 +4,25 @@ module Bioshogi
   module Container
     concern :PlayersMethods do
       class_methods do
-        def start
-          new.tap do |e|
+        def start(...)
+          new(...).tap do |e|
             e.placement_from_preset("平手")
+            e.after_setup
           end
         end
       end
 
-      attr_reader :players
-
       def players
         @players ||= Location.collect do |e|
           Player.new(container: self, location: e)
         end
       end
 
-      # player_at(-1) でも後手を取得できる
+      # player_at(-2) → 先手
+      # player_at(-1) → 後手
+      # player_at(+0) → 先手
+      # player_at(+1) → 後手
+      # player_at(+2) → 先手
       def player_at(location)
         players[Location.fetch(location).code]
       end
@@ -58,13 +61,9 @@ module Bioshogi
       # 両者の(別名を含む)スキル名のリストを合わせてユニークにしたもの
       # つまりその対局に関連するすべてのタグに相当する
       def normalized_names_with_alias
-        players.flat_map { |e| e.skill_set.normalized_names_with_alias }.uniq
+        players.flat_map { |e| e.tag_bundle.normalized_names_with_alias }.uniq
       end
 
-      # def basic_score
-      #   evaluator.basic_score
-      # end
-
       # 互いに王手されている局面か？ (ありえない)
       def position_invalid?
         players.all?(&:mate_advantage?)
@@ -80,8 +79,6 @@ module Bioshogi
       end
 
       concerning :TurnMethods do
-        attr_writer :turn_info
-
         def turn_info
           @turn_info ||= TurnInfo.new
         end

data/lib/bioshogi/container/serialize_methods.rb

@@ -33,7 +33,7 @@ module Bioshogi
         s = []
         s << board.to_s
         s << players.collect { |player|
-          "#{player.call_name}の持駒:#{player.piece_box.to_s}"
+          "#{player.call_name}の持駒:#{player.piece_box}"
         }.join("\n") + "\n"
         s.join
       end
@@ -108,12 +108,13 @@ module Bioshogi
         attr_reader :initial_state_board_sfen
         attr_reader :initial_state_turn_info
 
-        def initialize(*)
-          super
-          before_run_process            # FIXME
-        end
+        # def initialize(*)
+        #   super
+        #   after_setup            # FIXME
+        # end
 
-        def before_run_process
+        def after_setup
+          super
           # turn_info_auto_set
           @initial_state_board_sfen = to_short_sfen # FIXME: これはイケてない
           @initial_state_turn_info = turn_info.clone

data/lib/bioshogi/container.rb

@@ -1,9 +1,13 @@
 module Bioshogi
   module Container
-    class << self
-      def create(...)
-        Basic.new(...)
-      end
+    extend self
+
+    def create(...)
+      Basic.new(...)
+    end
+
+    def new(...)
+      Basic.new(...)
     end
   end
 end