bioshogi 0.0.3 → 0.0.4

data/lib/bioshogi/assets/kifu_formats/sample.kif

@@ -0,0 +1,123 @@
+開始日時：2017/11/11 10:00:00
+終了日時：2017/11/11 17:22:00
+棋戦：女流王座戦
+場所：大阪・芝苑
+手合割：平手
+先手：加藤桃子 女王
+後手：里見香奈 女流王座
+戦型：ゴキゲン中飛車
+手数----指手---------消費時間--
+1 ２六歩(27) (00:00/00:00:00)
+2 ３四歩(33) (00:00/00:00:00)
+3 ２五歩(26) (00:00/00:00:00)
+4 ３三角(22) (00:00/00:00:00)
+5 ７六歩(77) (00:00/00:00:00)
+6 ４二銀(31) (00:00/00:00:00)
+7 ４八銀(39) (00:00/00:00:00)
+8 ５四歩(53) (00:00/00:00:00)
+9 ６八玉(59) (00:00/00:00:00)
+10 ５五歩(54) (00:00/00:00:00)
+11 ３六歩(37) (00:00/00:00:00)
+12 ５二飛(82) (00:00/00:00:00)
+13 ３七銀(48) (00:00/00:00:00)
+14 ５三銀(42) (00:00/00:00:00)
+15 ４六銀(37) (00:00/00:00:00)
+16 ４四銀(53) (00:00/00:00:00)
+17 ５八金(49) (00:00/00:00:00)
+18 ６二玉(51) (00:00/00:00:00)
+19 ７八玉(68) (00:00/00:00:00)
+20 ７二玉(62) (00:00/00:00:00)
+21 ６六歩(67) (00:00/00:00:00)
+22 ８二玉(72) (00:00/00:00:00)
+23 ６七金(58) (00:00/00:00:00)
+24 ７二銀(71) (00:00/00:00:00)
+25 ７七角(88) (00:00/00:00:00)
+26 ９四歩(93) (00:00/00:00:00)
+27 ８八玉(78) (00:00/00:00:00)
+28 ９五歩(94) (00:00/00:00:00)
+29 ９八香(99) (00:00/00:00:00)
+30 ８四歩(83) (00:00/00:00:00)
+31 ９九玉(88) (00:00/00:00:00)
+32 ８三銀(72) (00:00/00:00:00)
+33 ８八銀(79) (00:00/00:00:00)
+34 ７二金(61) (00:00/00:00:00)
+35 ６五歩(66) (00:00/00:00:00)
+36 ７四歩(73) (00:00/00:00:00)
+37 ６六金(67) (00:00/00:00:00)
+38 ７三桂(81) (00:00/00:00:00)
+39 ８六角(77) (00:00/00:00:00)
+40 ５一飛(52) (00:00/00:00:00)
+41 ７八飛(28) (00:00/00:00:00)
+42 ８五歩(84) (00:00/00:00:00)
+43 ５九角(86) (00:00/00:00:00)
+44 ４二角(33) (00:00/00:00:00)
+45 ７九金(69) (00:00/00:00:00)
+46 ３三桂(21) (00:00/00:00:00)
+47 ７五歩(76) (00:00/00:00:00)
+48 同歩(74) (00:00/00:00:00)
+49 同金(66) (00:00/00:00:00)
+50 同角(42) (00:00/00:00:00)
+51 同飛(78) (00:00/00:00:00)
+52 ７四歩打 (00:00/00:00:00)
+53 ７六飛(75) (00:00/00:00:00)
+54 ７五金打 (00:00/00:00:00)
+55 ７八飛(76) (00:00/00:00:00)
+56 ５六歩(55) (00:00/00:00:00)
+57 同歩(57) (00:00/00:00:00)
+58 ６五金(75) (00:00/00:00:00)
+59 ５五歩(56) (00:00/00:00:00)
+60 ５六歩打 (00:00/00:00:00)
+61 ２六角(59) (00:00/00:00:00)
+62 １四歩(13) (00:00/00:00:00)
+63 ６二歩打 (00:00/00:00:00)
+64 ５二金(41) (00:00/00:00:00)
+65 ６一歩成(62) (00:00/00:00:00)
+66 同飛(51) (00:00/00:00:00)
+67 ５四歩(55) (00:00/00:00:00)
+68 ６六金(65) (00:00/00:00:00)
+69 ６八飛(78) (00:00/00:00:00)
+70 ７六金(66) (00:00/00:00:00)
+71 ７七歩打 (00:00/00:00:00)
+72 ７五金(76) (00:00/00:00:00)
+73 ５八飛(68) (00:00/00:00:00)
+74 ６六金(75) (00:00/00:00:00)
+75 ６八飛(58) (00:00/00:00:00)
+76 ６五金(66) (00:00/00:00:00)
+77 ３二角打 (00:00/00:00:00)
+78 ８六歩(85) (00:00/00:00:00)
+79 同歩(87) (00:00/00:00:00)
+80 ３五歩(34) (00:00/00:00:00)
+81 ２三角成(32) (00:00/00:00:00)
+82 ６四歩(63) (00:00/00:00:00)
+83 ３五歩(36) (00:00/00:00:00)
+84 ２一飛(61) (00:00/00:00:00)
+85 ３四馬(23) (00:00/00:00:00)
+86 ９二香(91) (00:00/00:00:00)
+87 ４八角(26) (00:00/00:00:00)
+88 ９一飛(21) (00:00/00:00:00)
+89 ２四歩(25) (00:00/00:00:00)
+90 ７五金(65) (00:00/00:00:00)
+91 ５六馬(34) (00:00/00:00:00)
+92 ８四歩打 (00:00/00:00:00)
+93 ７五角(48) (00:00/00:00:00)
+94 同歩(74) (00:00/00:00:00)
+95 ６四飛(68) (00:00/00:00:00)
+96 ６三金(52) (00:00/00:00:00)
+97 ６八飛(64) (00:00/00:00:00)
+98 ６五角打 (00:00/00:00:00)
+99 同飛(68) (00:00/00:00:00)
+100 同桂(73) (00:00/00:00:00)
+101 同馬(56) (00:00/00:00:00)
+102 ５九飛打 (00:00/00:00:00)
+103 ６六桂打 (00:00/00:00:00)
+104 ７三金(72) (00:00/00:00:00)
+105 ５二角打 (00:00/00:00:00)
+106 ６四金(63) (00:00/00:00:00)
+107 同馬(65) (00:00/00:00:00)
+108 同金(73) (00:00/00:00:00)
+109 ６五歩打 (00:00/00:00:00)
+110 ４八角打 (00:00/00:00:00)
+111 ６四歩(65) (00:00/00:00:00)
+112 ６六角成(48) (00:00/00:00:00)
+113 ７三金打 (00:00/00:00:00)
+114 投了 (00:00/00:00:00)

data/lib/bioshogi/assets/kifu_formats/sample.sfen

@@ -0,0 +1 @@
+position startpos moves 2g2f 3c3d 2f2e 2b3c 7g7f 3a4b 3i4h 5c5d 5i6h 5d5e 3g3f 8b5b 4h3g 4b5c 3g4f 5c4d 4i5h 5a6b 6h7h 6b7b 6g6f 7b8b 5h6g 7a7b 8h7g 9c9d 7h8h 9d9e 9i9h 8c8d 8h9i 7b8c 7i8h 6a7b 6f6e 7c7d 6g6f 8a7c 7g8f 5b5a 2h7h 8d8e 8f5i 3c4b 6i7i 2a3c 7f7e 7d7e 6f7e 4b7e 7h7e P*7d 7e7f G*7e 7f7h 5e5f 5g5f 7e6e 5f5e P*5f 5i2f 1c1d P*6b 4a5b 6b6a+ 5a6a 5e5d 6e6f 7h6h 6f7f P*7g 7f7e 6h5h 7e6f 5h6h 6f6e B*3b 8e8f 8g8f 3d3e 3b2c+ 6c6d 3f3e 6a2a 2c3d 9a9b 2f4h 2a9a 2e2d 6e7e 3d5f P*8d 4h7e 7d7e 6h6d 5b6c 6d6h B*6e 6h6e 7c6e 5f6e R*5i N*6f 7b7c B*5b 6c6d 6e6d 7c6d P*6e B*4h 6e6d 4h6f+ G*7c

data/lib/bioshogi/cli/input_checker.rb

@@ -0,0 +1,21 @@
+require "../cli" if $0 == __FILE__
+
+module Bioshogi
+  class CLI
+    desc "input_checker", "入力"
+    def input_checker(*argv)
+      InputParser.check(argv.join(" "))
+    end
+  end
+end
+
+if $0 == __FILE__
+  Bioshogi::CLI.start(["input_checker", "68S", "△76歩 34歩"])
+end
+# >> |--------+--------------+-----------+----------+-----------+------------+----------------+-------------+--------------+---------------------+------------------+----------------+----------+----------+--------+-----------+-----------------+-------------------+---------+-----------+----------------------|
+# >> | 入力   | ki2_location | kif_place | ki2_same | kif_piece | ki2_one_up | ki2_left_right | ki2_up_down | ki2_as_it_is | ki2_promote_trigger | kif_drop_trigger | kif_place_from | csa_sign | csa_from | csa_to | csa_piece | sfen_drop_piece | sfen_drop_trigger | sfen_to | sfen_from | sfen_promote_trigger |
+# >> |--------+--------------+-----------+----------+-----------+------------+----------------+-------------+--------------+---------------------+------------------+----------------+----------+----------+--------+-----------+-----------------+-------------------+---------+-----------+----------------------|
+# >> | 68S    |              |        68 |          | S         |            |                |             |              |                     |                  |                |          |          |        |           |                 |                   |         |           |                      |
+# >> | △76歩 | △           |        76 |          | 歩        |            |                |             |              |                     |                  |                |          |          |        |           |                 |                   |         |           |                      |
+# >> | 34歩   |              |        34 |          | 歩        |            |                |             |              |                     |                  |                |          |          |        |           |                 |                   |         |           |                      |
+# >> |--------+--------------+-----------+----------+-----------+------------+----------------+-------------+--------------+---------------------+------------------+----------------+----------+----------+--------+-----------+-----------------+-------------------+---------+-----------+----------------------|

data/lib/bioshogi/cli/piece.rb

@@ -1,12 +1,7 @@
-# frozen-string-literal: true
-# bioshogi piece
-
-if $0 == __FILE__
-  require "../cli"
-end
+require "../cli" if $0 == __FILE__
 
 module Bioshogi
-  class Cli
+  class CLI
     desc "piece", "駒一覧"
     def piece
       tp Piece.collect(&:to_h)
@@ -15,5 +10,17 @@ module Bioshogi
 end
 
 if $0 == __FILE__
-  Bioshogi::Cli.start(["piece"])
+  Bioshogi::CLI.start(["piece"])
 end
+# >> |--------+------+-------------+---------------+----------------------------+------------------------------+-----------+------------+--------------+----------+------|
+# >> | key    | name | basic_alias | promoted_name | promoted_formal_sheet_name | other_matched_promoted_names | sfen_char | promotable | always_alive | stronger | code |
+# >> |--------+------+-------------+---------------+----------------------------+------------------------------+-----------+------------+--------------+----------+------|
+# >> | king   | 玉   | 王          |               |                            |                              | K         | false      | true         | false    |    0 |
+# >> | rook   | 飛   |             | 龍            |                            | 竜                           | R         | true       | true         | true     |    1 |
+# >> | bishop | 角   |             | 馬            |                            |                              | B         | true       | true         | true     |    2 |
+# >> | gold   | 金   |             |               |                            |                              | G         | false      | true         | false    |    3 |
+# >> | silver | 銀   |             | 全            | 成銀                       |                              | S         | true       | true         | false    |    4 |
+# >> | knight | 桂   |             | 圭            | 成桂                       | 今                           | N         | true       | false        | false    |    5 |
+# >> | lance  | 香   |             | 杏            | 成香                       | 仝                           | L         | true       | false        | false    |    6 |
+# >> | pawn   | 歩   |             | と            |                            |                              | P         | true       | false        | false    |    7 |
+# >> |--------+------+-------------+---------------+----------------------------+------------------------------+-----------+------------+--------------+----------+------|

data/lib/bioshogi/cli.rb

@@ -1,106 +1,20 @@
-# frozen-string-literal: true
-#
-# bioshogi versus -n 3
-#
-
 $LOAD_PATH.unshift(File.expand_path("..", __dir__))
 
 require "bioshogi"
 require "thor"
 
 module Bioshogi
-  class Cli < Thor
+  class CLI < Thor
     class_option :debug, type: :boolean
     class_option :quiet, type: :boolean
+
+    include Converter::CLI
+    include AI::Versus::CLI
   end
-end
 
-Pathname(__dir__).glob("cli/*.rb").each do |file|
-  require file
+  Pathname(__dir__).glob("cli/*.rb").each { |e| require e }
 end
 
 if $0 == __FILE__
-  Bioshogi::Cli.start
+  Bioshogi::CLI.start
 end
-# >> |------------------------|
-# >> | Bioshogi::Diver::NegaAlphaDiver |
-# >> | Bioshogi::Diver::NegaScoutDiver |
-# >> |------------------------|
-# >> {"depth_max"=>3,
-# >>  "times"=>1,
-# >>  "time_limit"=>3,
-# >>  "round"=>1,
-# >>  "logging"=>false,
-# >>  "log_file"=>"brain.log",
-# >>  "black_diver"=>"Diver::NegaAlphaDiver",
-# >>  "white_diver"=>"Diver::NegaScoutDiver"}
-# >> |-------------+----------------|
-# >> |   depth_max | 3              |
-# >> |       times | 1              |
-# >> |  time_limit | 3              |
-# >> |       round | 1              |
-# >> |     logging | false          |
-# >> |    log_file | brain.log      |
-# >> | black_diver | Diver::NegaAlphaDiver |
-# >> | white_diver | Diver::NegaScoutDiver |
-# >> |-------------+----------------|
-# >> ---------------------------------------- [1] ▲７六歩(77) (Bioshogi::Diver::NegaAlphaDiver)
-# >> |-----------------+------|
-# >> |      time_limit | 3    |
-# >> | depth_max_range | 0..3 |
-# >> |-----------------+------|
-# >> |------+--------------+---------------------------+------+------------+----------|
-# >> | 順位 | 候補手       | 読み筋                    | 形勢 | 評価局面数 | 処理時間 |
-# >> |------+--------------+---------------------------+------+------------+----------|
-# >> |    1 | ▲７六歩(77) | △４四歩(43) ▲４四角(88) |  205 |       1050 | 0.129571 |
-# >> |    2 | ▲９八香(99) | △１四歩(13) ▲４六歩(47) |    0 |         59 | 0.014618 |
-# >> |    3 | ▲８六歩(87) | △１四歩(13) ▲６六歩(67) |    0 |         59 | 0.015365 |
-# >> |    4 | ▲７八銀(79) | △１四歩(13) ▲１八香(19) |    0 |         57 |   0.0145 |
-# >> |    5 | ▲６八銀(79) | △１四歩(13) ▲３八飛(28) |    0 |         56 | 0.012922 |
-# >> |    6 | ▲６六歩(67) | △１四歩(13) ▲９六歩(97) |    0 |         59 | 0.015214 |
-# >> |    7 | ▲７八金(69) | △１四歩(13) ▲５六歩(57) |    0 |         56 | 0.014731 |
-# >> |    8 | ▲６八金(69) | △１四歩(13) ▲７六歩(77) |    0 |         56 | 0.014576 |
-# >> |    9 | ▲５八金(69) | △１四歩(13) ▲２六歩(27) |    0 |         54 | 0.015056 |
-# >> |   10 | ▲５六歩(57) | △１四歩(13) ▲４六歩(47) |    0 |         59 | 0.014406 |
-# >> |   11 | ▲６八玉(59) | △１四歩(13) ▲７八銀(79) |    0 |         57 | 0.015313 |
-# >> |   12 | ▲５八玉(59) | △１四歩(13) ▲１八香(19) |    0 |         56 | 0.014563 |
-# >> |   13 | ▲４八玉(59) | △１四歩(13) ▲３八飛(28) |    0 |         55 | 0.015561 |
-# >> |   14 | ▲４六歩(47) | △１四歩(13) ▲５八金(49) |    0 |         59 | 0.014996 |
-# >> |   15 | ▲５八金(49) | △１四歩(13) ▲７八銀(79) |    0 |         54 | 0.015237 |
-# >> |   16 | ▲４八金(49) | △１四歩(13) ▲９八香(99) |    0 |         54 | 0.014886 |
-# >> |   17 | ▲３八金(49) | △１四歩(13) ▲１六歩(17) |    0 |         52 | 0.013963 |
-# >> |   18 | ▲３六歩(37) | △１四歩(13) ▲３七桂(29) |    0 |         60 | 0.014453 |
-# >> |   19 | ▲４八銀(39) | △１四歩(13) ▲４六歩(47) |    0 |         53 | 0.013778 |
-# >> |   20 | ▲３八銀(39) | △１四歩(13) ▲９八香(99) |    0 |         52 |  0.01624 |
-# >> |   21 | ▲２六歩(27) | △１四歩(13) ▲８六歩(87) |    0 |         60 | 0.015151 |
-# >> |   22 | ▲３八飛(28) | △１四歩(13) ▲５八金(49) |    0 |         58 | 0.015105 |
-# >> |   23 | ▲４八飛(28) | △１四歩(13) ▲９六歩(97) |    0 |         57 | 0.015086 |
-# >> |   24 | ▲５八飛(28) | △１四歩(13) ▲５六歩(57) |    0 |         57 | 0.015008 |
-# >> |   25 | ▲６八飛(28) | △１四歩(13) ▲７六歩(77) |    0 |         57 | 0.014952 |
-# >> |   26 | ▲７八飛(28) | △１四歩(13) ▲５八金(49) |    0 |         58 | 0.014058 |
-# >> |   27 | ▲１八飛(28) | △１四歩(13) ▲９六歩(97) |    0 |         59 | 0.016418 |
-# >> |   28 | ▲１六歩(17) | △１四歩(13) ▲１七桂(29) |    0 |         61 | 0.014441 |
-# >> |   29 | ▲９六歩(97) | △１四歩(13) ▲９七角(88) |    0 |         62 | 0.012523 |
-# >> |   30 | ▲１八香(19) | △１四歩(13) ▲７六歩(77) |    0 |         57 | 0.015551 |
-# >> |------+--------------+---------------------------+------+------------+----------|
-# >> 後手の持駒：なし
-# >>   ９ ８ ７ ６ ５ ４ ３ ２ １
-# >> +---------------------------+
-# >> |v香v桂v銀v金v玉v金v銀v桂v香|一
-# >> | ・v飛 ・ ・ ・ ・ ・v角 ・|二
-# >> |v歩v歩v歩v歩v歩v歩v歩v歩v歩|三
-# >> | ・ ・ ・ ・ ・ ・ ・ ・ ・|四
-# >> | ・ ・ ・ ・ ・ ・ ・ ・ ・|五
-# >> | ・ ・ 歩 ・ ・ ・ ・ ・ ・|六
-# >> | 歩 歩 ・ 歩 歩 歩 歩 歩 歩|七
-# >> | ・ 角 ・ ・ ・ ・ ・ 飛 ・|八
-# >> | 香 桂 銀 金 玉 金 銀 桂 香|九
-# >> +---------------------------+
-# >> 先手の持駒：なし
-# >> 手数＝1 ▲７六歩(77) まで
-# >>
-# >> 後手番
-# >>
-# >> ▲７六歩(77) 205
-# >>
-# >> ▲７六歩(77)

data/lib/bioshogi/converter.rb

@@ -0,0 +1,56 @@
+# -*- compile-command: "../../.bin/bioshogi convert -f sfen assets/kifu_formats/sample.kif" -*-
+
+module Bioshogi
+  class Converter
+    concern :CLI do
+      included do
+        desc "convert", "一括棋譜フォーマット変換"
+        option :format,     type: :string,  aliases: "-f", default: "kif"
+        option :output_dir, type: :string,  aliases: "-o"
+        option :overwrite,  type: :boolean, aliases: "-w", default: false
+        def convert(*files)
+          Converter.new(files, options.to_options).call
+        end
+      end
+    end
+
+    def initialize(files, options = {})
+      @files = files
+      @options = {
+        :format     => "kif",
+        :output_dir => nil,
+        :overwrite  => false,
+      }.merge(options)
+    end
+
+    def call
+      @files.each { |e| process_one(e) }
+    end
+
+    def process_one(in_file)
+      in_file = Pathname(in_file).expand_path
+      info = Parser.file_parse(in_file)
+      str = info.public_send("to_#{@options[:format]}")
+      case
+      when @options[:overwrite]
+        in_file.write(str)
+        puts "[overwrite] #{in_file} => #{out_file}"
+      when @options[:output_dir].present?
+        out_file = output_dir + in_file.basename.sub_ext(extname)
+        FileUtils.mkdir_p(out_file.dirname)
+        out_file.write(str)
+        puts "[output] #{in_file} => #{out_file}"
+      else
+        puts str
+      end
+    end
+
+    def output_dir
+      Pathname(@options[:output_dir]).expand_path
+    end
+
+    def extname
+      ".#{@options[:format]}"
+    end
+  end
+end

data/lib/bioshogi/extreme_validator.rb

@@ -136,7 +136,7 @@ module Bioshogi
         if error_list.exist?
           files = error_list.readlines.reject { |e|e.match?("#") }.collect { |e| Pathname(e.strip) }
         else
-          files = ROOT_DIR.glob("../../2chkifu/**/*.{ki2,KI2}").sort # ~/src/2chkifu
+          files = ROOT.glob("../../2chkifu/**/*.{ki2,KI2}").sort # ~/src/2chkifu
         end
         files.take(limit)
       end

data/lib/bioshogi/formatter/animation/demo_builder.rb

@@ -50,7 +50,7 @@ module Bioshogi
         end
 
         def store_dir
-          ROOT_DIR.join("../demo/BGM合成後の確認用").expand_path
+          ROOT.join("../demo/BGM合成後の確認用").expand_path
         end
       end
     end

data/lib/bioshogi/input_parser.rb

@@ -4,6 +4,13 @@ module Bioshogi
   module InputParser
     extend self
 
+    def check(text)
+      rows = InputParser.scan(text).collect do |str|
+        {"入力" => str}.merge(match!(str).named_captures)
+      end
+      tp rows
+    end
+
     def match!(str)
       md = str.to_s.match(regexp)
       unless md

data/lib/bioshogi/player.rb

@@ -2,7 +2,7 @@
 
 module Bioshogi
   class Player
-    include Ai::PlayerBrainMod
+    include AI::PlayerBrainMod
     include PieceBoxMethods
     include SoldierMethods
     include OtherMethods

data/lib/bioshogi/version.rb

@@ -1,3 +1,3 @@
 module Bioshogi
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/bioshogi.rb

@@ -9,6 +9,8 @@ require "active_support/core_ext/module/attribute_accessors" # for mattr_accesso
 require "active_support/core_ext/string"
 require "active_support/core_ext/array/grouping"             # for in_groups_of
 require "active_support/core_ext/numeric"                    # for 1.minute
+require "active_support/core_ext/hash"                       # for too_options
+require "active_support/core_ext/pathname"                   # for existence
 
 require "pathname"
 require "time"     # for Time.parse
@@ -19,9 +21,10 @@ require "memory_record"
 require "tree_support"
 
 module Bioshogi
-  ROOT_DIR   = Pathname(__dir__)
-  ASSETS_DIR = ROOT_DIR.join("bioshogi/assets")
-  LOG_DIR    = ROOT_DIR.join("bioshogi/log")
+  ROOT       = Pathname(__dir__)
+  ASSETS_DIR = ROOT.join("bioshogi/assets")
+  LOG_DIR    = ROOT.join("bioshogi/log")
+  TMP_DIR    = ROOT.join("../tmp")
 
   include ActiveSupport::Configurable
   config_accessor(:skill_monitor_enable) { true }
@@ -30,33 +33,45 @@ module Bioshogi
   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"
 end
 
-require "zeitwerk"
-loader = Zeitwerk::Loader.for_gem
-loader.ignore("#{__dir__}/bioshogi/logger.rb")
-loader.ignore("#{__dir__}/bioshogi/vector_constants.rb")
-loader.ignore("#{__dir__}/bioshogi/errors.rb")
-loader.ignore("#{__dir__}/bioshogi/contrib/**/*.rb")
-loader.ignore("#{__dir__}/bioshogi/assets")
-loader.ignore("#{__dir__}/bioshogi/cli.rb")
-loader.ignore("#{__dir__}/bioshogi/cli")
-loader.ignore("#{__dir__}/bioshogi/explain/{備考,囲い,戦型,手筋}")
-
-# 開発環境専用のものは遅延読み込みする
-loader.do_not_eager_load("#{__dir__}/bioshogi/explain/*_generator.rb")
-loader.do_not_eager_load("#{__dir__}/bioshogi/explain/tactic_validator.rb")
-loader.do_not_eager_load("#{__dir__}/bioshogi/explain/file_normalizer.rb")
-loader.do_not_eager_load("#{__dir__}/bioshogi/extreme_validator.rb")
-loader.do_not_eager_load("#{__dir__}/bioshogi/formatter/animation/demo_builder.rb")
-
-loader.log! if false
-loader.setup
-
-require "bioshogi/logger"
-require "bioshogi/vector_constants"
-require "bioshogi/errors"
-
-# 必須
-# loader.eager_load_namespace(Bioshogi::ScreenImage)
-
-# なくてもよい
-loader.eager_load
+if true
+  require "zeitwerk"
+  loader = Zeitwerk::Loader.for_gem
+
+  # 自動で読み込まないファイルやディレクトリを指定する
+  loader.ignore("#{__dir__}/bioshogi/logger.rb")
+  loader.ignore("#{__dir__}/bioshogi/vector_constants.rb")
+  loader.ignore("#{__dir__}/bioshogi/errors.rb")
+  loader.ignore("#{__dir__}/bioshogi/contrib/**/*.rb")
+  loader.ignore("#{__dir__}/bioshogi/assets")
+  loader.ignore("#{__dir__}/bioshogi/cli.rb")
+  loader.ignore("#{__dir__}/bioshogi/cli")
+  loader.ignore("#{__dir__}/bioshogi/explain/{備考,囲い,戦型,手筋}")
+
+  # 変換ルール調整
+  loader.inflector.inflect("cli" => "CLI")
+  loader.inflector.inflect("ai" => "AI")
+
+  # 開発環境専用のものは遅延読み込みする
+  loader.do_not_eager_load("#{__dir__}/bioshogi/explain/*_generator.rb")
+  loader.do_not_eager_load("#{__dir__}/bioshogi/explain/tactic_validator.rb")
+  loader.do_not_eager_load("#{__dir__}/bioshogi/explain/file_normalizer.rb")
+  loader.do_not_eager_load("#{__dir__}/bioshogi/extreme_validator.rb")
+  loader.do_not_eager_load("#{__dir__}/bioshogi/formatter/animation/demo_builder.rb")
+
+  # CLI用
+  # loader.do_not_eager_load("#{__dir__}/bioshogi/commands/*.rb")
+
+  loader.log! if false
+
+  loader.setup
+
+  require "bioshogi/logger"
+  require "bioshogi/vector_constants"
+  require "bioshogi/errors"
+
+  # 必須
+  # loader.eager_load_namespace(Bioshogi::ScreenImage)
+
+  # なくてもよい
+  loader.eager_load
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bioshogi
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Akira Ikeda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2023-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -328,6 +328,7 @@ files:
 - lib/bioshogi/ai/evaluator/level4.rb
 - lib/bioshogi/ai/evaluator/opening_basic_table.rb
 - lib/bioshogi/ai/player_brain_mod.rb
+- lib/bioshogi/ai/versus.rb
 - lib/bioshogi/application_memory_record.rb
 - lib/bioshogi/assertion.rb
 - lib/bioshogi/assets/audios/any.band/Alternatives/000/DisplayState.plist
@@ -604,6 +605,10 @@ files:
 - lib/bioshogi/assets/images/piece/Portella/original/1RY.png
 - lib/bioshogi/assets/images/piece/Portella/original/1TO.png
 - lib/bioshogi/assets/images/piece/Portella/original/1UM.png
+- lib/bioshogi/assets/kifu_formats/sample.csa
+- lib/bioshogi/assets/kifu_formats/sample.ki2
+- lib/bioshogi/assets/kifu_formats/sample.kif
+- lib/bioshogi/assets/kifu_formats/sample.sfen
 - lib/bioshogi/board.rb
 - lib/bioshogi/board/basic.rb
 - lib/bioshogi/board/csa_formatter.rb
@@ -621,10 +626,8 @@ files:
 - lib/bioshogi/builder.rb
 - lib/bioshogi/cli.rb
 - lib/bioshogi/cli/.gitignore
-- lib/bioshogi/cli/convert.rb
-- lib/bioshogi/cli/input_parser.rb
+- lib/bioshogi/cli/input_checker.rb
 - lib/bioshogi/cli/piece.rb
-- lib/bioshogi/cli/versus.rb
 - lib/bioshogi/container.rb
 - lib/bioshogi/container/basic.rb
 - lib/bioshogi/container/checkmate_yomiage.rb
@@ -635,6 +638,7 @@ files:
 - lib/bioshogi/container/serialize_methods.rb
 - lib/bioshogi/container/simple.rb
 - lib/bioshogi/container/test_methods.rb
+- lib/bioshogi/converter.rb
 - lib/bioshogi/cover_image.rb
 - lib/bioshogi/cover_image/bottom_text_methods.rb
 - lib/bioshogi/cover_image/core_methods.rb
@@ -1142,7 +1146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Shogi library

data/lib/bioshogi/cli/convert.rb

@@ -1,34 +0,0 @@
-# frozen-string-literal: true
-# bioshogi convert -f ki2 ../../../experiment/katomomo.kif
-
-if $0 == __FILE__
-  require "../cli"
-end
-
-module Bioshogi
-  class Cli
-    desc "convert", "一括棋譜フォーマット変換"
-    option :format,     type: :string, aliases: "-f", default: "kif"
-    option :output_dir, type: :string, aliases: "-o", default: "output"
-    def convert(*files)
-      files.each do |in_file|
-        in_file = Pathname(in_file).expand_path
-        info = Parser.file_parse(in_file)
-        str = info.public_send("to_#{options[:format]}")
-        if options[:output_dir].blank?
-          puts str
-        else
-          dir = Pathname(options[:output_dir]).expand_path
-          out_file = dir.join(in_file.basename.sub_ext([".", options[:format]].join))
-          FileUtils.mkdir_p(dir)
-          out_file.write(str)
-          puts "#{in_file} => #{out_file}"
-        end
-      end
-    end
-  end
-end
-
-if $0 == __FILE__
-  Bioshogi::Cli.start(["convert", "-f", "ki2", "../../../experiment/katomomo.kif"])
-end

data/lib/bioshogi/cli/input_parser.rb

@@ -1,23 +0,0 @@
-# frozen-string-literal: true
-# bioshogi input_parser "68歩" "△76歩"
-
-if $0 == __FILE__
-  require "../cli"
-end
-
-module Bioshogi
-  class Cli
-    desc "input_parser", "入力"
-    def input_parser(*argv)
-      str = argv.join(" ")
-      rows = InputParser.scan(str).collect do |str|
-        {"入力" => str}.merge(InputParser.match!(str).named_captures)
-      end
-      tp rows
-    end
-  end
-end
-
-if $0 == __FILE__
-  Bioshogi::Cli.start(["input_parser", "68S", "△76歩"])
-end