bioshogi 0.0.13 → 0.0.15

data/lib/bioshogi/{explain → analysis}/shape_info_relation.rb

@@ -1,7 +1,7 @@
 # frozen-string-literal: true
 
 module Bioshogi
-  module Explain
+  module Analysis
     concern :ShapeInfoRelation do
       included do
         delegate :board_parser, :location_split, :sorted_soldiers, to: :shape_info
@@ -21,7 +21,7 @@ module Bioshogi
       #   end
       # end
       #
-      # def soldier_hash_table
+      # def primary_soldier_hash_table
       #   if shape_info
       #     shape_infos.each_with_object({}) do |e, m|
       #       e.board_parser.primary_soldiers.each_with_object({}) do |s, m|

data/lib/bioshogi/{explain → analysis}/skill_set.rb

@@ -1,7 +1,7 @@
 # frozen-string-literal: true
 
 module Bioshogi
-  module Explain
+  module Analysis
     class SkillSet
       attr_accessor :attack_infos
       attr_accessor :defense_infos
@@ -78,6 +78,11 @@ module Bioshogi
         }.compact.join.presence
       end
 
+      # 戦法と囲いのスタイル(複数)のなかからもっとも変態に近いものを得る
+      def main_style_info
+        (attack_infos + defense_infos).collect(&:style_info).max
+      end
+
       class List < Array
         # 重複しているように感じる囲いなどを整理する
         def normalize
@@ -85,8 +90,8 @@ module Bioshogi
           # 「ダイヤモンド美濃」から見た「美濃囲い」や「片美濃囲い」を消す
           list -= list.flat_map { |e| e.ancestors }
           # さらに「ダイヤモンド美濃」に含まれる「銀美濃」を消す
-          # 「ダイヤモンド美濃」の直接の親ではないが、派生元と見なしてもよいものが other_parents にある
-          list -= list.flat_map { |e| e.other_parents.flat_map(&:self_and_ancestors) }
+          # 「ダイヤモンド美濃」の直接の親ではないが、派生元と見なしてもよいものが related_ancestors にある
+          list -= list.flat_map { |e| e.related_ancestors.flat_map(&:self_and_ancestors) }
           list
         end
 

data/lib/bioshogi/analysis/style_accessor.rb

@@ -0,0 +1,48 @@
+# frozen-string-literal: true
+
+module Bioshogi
+  module Analysis
+    concern :StyleAccessor do
+      class_methods do
+        # - 頻度0件の戦法が多いため0件の戦法は初期値「変態」としてテーブルには含めない
+        # - 1件でも存在するものだけで4エリアで分けたテーブルを作る
+        # - そこに含まれなかったものは「変態」とする
+        # - こうすることでほとんどが王道になってしまうのを防ぐことができる
+        def styles_hash
+          @styles_hash ||= yield_self do
+            # 分布数降順の戦法配列を準備する
+
+            av = values
+            av = av.find_all { |e| e.frequency >= 1 } # 1件以上のものに絞る
+            av = av.sort_by { |e| -e.frequency }      # 分布数降順とする
+
+            # テーブル作成
+
+            backets = Array.new(av.size, StyleInfo.count.pred) # 正確に四分割できないため「変態」で埋める
+            step = av.size / StyleInfo.count                   # 1区分の幅
+            StyleInfo.count.pred.times do |i|                  # i = 0, 1, 2
+              range = (i * step)...(i.next * step)
+              backets.fill(i, range)                           # 最初の3区分を 0, 1, 2 で埋める
+            end
+
+            # 分布数降順の戦法に対応するスタイルを割り当てる
+
+            av.each_with_object({}).with_index do |(e, m), i|
+              m[e.key] = StyleInfo.fetch(backets[i])
+            end
+          end
+        end
+      end
+
+      def style_info
+        self.class.styles_hash[key] || StyleInfo.values.last
+      end
+
+      # 使用数
+      # これは Frequency にない場合もあるため、ない場合に 0 を返すのは正しい。
+      def frequency
+        Frequency.dig(tactic_key, key) || 0
+      end
+    end
+  end
+end

data/lib/bioshogi/analysis/style_info.rb

@@ -0,0 +1,15 @@
+# frozen-string-literal: true
+
+module Bioshogi
+  module Analysis
+    class StyleInfo
+      include ApplicationMemoryRecord
+      memory_record [
+        { key: "王道",   segment: :majority, },
+        { key: "準王道", segment: :majority, },
+        { key: "準変態", segment: :minority, },
+        { key: "変態",   segment: :minority, },
+      ]
+    end
+  end
+end

data/lib/bioshogi/analysis/tactic_hit_turn_table.rb

@@ -0,0 +1,413 @@
+# -*- frozen_string_literal: true -*-
+# /Users/ikeda/src/bioshogi/lib/bioshogi/analysis/tactic_hit_turn_table_generator.rb から生成しているので編集するべからず
+# 手数が nil のものは最後に判定してるため成立した手数を正確に知ることができない
+module Bioshogi
+  module Analysis
+    TacticHitTurnTable = {
+     :"ロケット" => nil,
+     :"力戦" => nil,
+     :"名人に定跡なし" => nil,
+     :"大駒全ブッチ" => nil,
+     :"対居飛車" => nil,
+     :"対抗形" => nil,
+     :"対振り飛車" => nil,
+     :"対穴熊" => nil,
+     :"居玉" => nil,
+     :"急戦" => nil,
+     :"手得角交換型" => nil,
+     :"持久戦" => nil,
+     :"相入玉" => nil,
+     :"相居玉" => nil,
+     :"相居飛車" => nil,
+     :"相振り飛車" => nil,
+     :"相穴熊" => nil,
+     :"短手数" => nil,
+     :"穴熊" => nil,
+     :"背水の陣" => nil,
+     :"長手数" => nil,
+     :"2段ロケット" => 1,
+     :"3段ロケット" => 1,
+     :"4段ロケット" => 1,
+     :"5段ロケット" => 1,
+     :"6段ロケット" => 1,
+     :"たすきの角" => 1,
+     :"たすきの銀" => 1,
+     :"たたきの歩" => 1,
+     :"ふんどしの桂" => 1,
+     :"パンツを脱ぐ" => 1,
+     :"一間竜" => 1,
+     :"初手▲3六歩戦法" => 1,
+     :"初手▲7八銀戦法" => 1,
+     :"初手▲7八飛戦法" => 1,
+     :"割り打ちの銀" => 1,
+     :"原始中飛車" => 1,
+     :"垂れ歩" => 1,
+     :"尻銀" => 1,
+     :"居飛車" => 1,
+     :"振り飛車" => 1,
+     :"桂頭の銀" => 1,
+     :"歩頭の桂" => 1,
+     :"田楽刺し" => 1,
+     :"突き違いの歩" => 1,
+     :"継ぎ桂" => 1,
+     :"腹銀" => 1,
+     :"金底の歩" => 1,
+     :"銀ばさみ" => 1,
+     :"2手目△3ニ飛戦法" => 2,
+     :"2手目△3二銀システム" => 2,
+     :"2手目△6二銀戦法" => 2,
+     :"2手目△7四歩戦法" => 2,
+     :"パックマン戦法" => 2,
+     :"嬉野流" => 2,
+     :"新米長玉" => 2,
+     :"端玉には端歩" => 2,
+     :"遠見の角" => 2,
+     :"阪田流2手目△9四歩" => 2,
+     :"こびん攻め" => 3,
+     :"メイドシステム" => 3,
+     :"天彦流▲6六角" => 3,
+     :"手損角交換型" => 3,
+     :"継ぎ歩" => 3,
+     :"英ちゃん流中飛車" => 3,
+     :"角不成" => 3,
+     :"角道オープン四間飛車" => 3,
+     :"連打の歩" => 3,
+     :"金沢流" => 3,
+     :"陽動振り飛車" => 3,
+     :"鬼殺し" => 3,
+     :"4手目△3三角戦法" => 4,
+     :"羽生式袖飛車" => 4,
+     :"菜々河流△4四角" => 4,
+     :"角頭歩戦法" => 4,
+     :"5手爆弾" => 5,
+     :"5筋位取り中飛車" => 5,
+     :"ムリヤリ早石田" => 5,
+     :"位の確保" => 5,
+     :"四間飛車" => 5,
+     :"山崎流パックマン" => 5,
+     :"早石田" => 5,
+     :"無敵囲い" => 5,
+     :"穴角向かい飛車" => 5,
+     :"筋違い角" => 5,
+     :"xaby角戦法" => 6,
+     :"うっかり三間飛車" => 6,
+     :"ゴキゲン中飛車" => 6,
+     :"右四間飛車超急戦" => 6,
+     :"新嬉野流" => 6,
+     :"相掛かり" => 6,
+     :"▲5五龍中飛車" => 7,
+     :"先手中飛車" => 7,
+     :"升田式石田流" => 7,
+     :"原始棒銀" => 7,
+     :"必笑ひっかけ戦法" => 7,
+     :"新石田流" => 7,
+     :"目くらまし戦法" => 7,
+     :"角交換型" => 7,
+     :"飛車不成" => 7,
+     :"きｍきｍ金" => 8,
+     :"ウソ矢倉" => 8,
+     :"向かい飛車" => 8,
+     :"相筋違い角" => 8,
+     :"角換わり" => 8,
+     :"都成流△3一金" => 8,
+     :"鬼殺し向かい飛車" => 8,
+     :"きんとうん戦法" => 9,
+     :"カメレオン戦法" => 9,
+     :"土下座の歩" => 9,
+     :"大隅囲い" => 9,
+     :"天彦流向かい飛車" => 9,
+     :"新鬼殺し" => 9,
+     :"早囲い" => 9,
+     :"村田システム" => 9,
+     :"耀龍ひねり飛車" => 9,
+     :"菅井流三間飛車" => 9,
+     :"△3三飛戦法" => 10,
+     :"ダイレクト向かい飛車" => 10,
+     :"一間飛車" => 10,
+     :"戸辺流4→3戦法" => 10,
+     :"阪田流向かい飛車" => 10,
+     :"ずれ美濃" => 11,
+     :"エルモ囲い" => 11,
+     :"タランチュラ戦法" => 11,
+     :"三間飛車" => 11,
+     :"中住まい" => 11,
+     :"丸山ワクチン" => 11,
+     :"久保流早石田" => 11,
+     :"九間飛車" => 11,
+     :"棒玉" => 11,
+     :"3→4→3戦法" => 12,
+     :"△2三歩戦法" => 12,
+     :"カニ囲い" => 12,
+     :"一手損角換わり" => 12,
+     :"対矢倉急戦棒銀" => 12,
+     :"英春流かまいたち戦法" => 12,
+     :"菜々河流向かい飛車" => 12,
+     :"カニ缶囲い" => 13,
+     :"ゴリ違い角" => 13,
+     :"入玉" => 13,
+     :"左山囲い" => 13,
+     :"耀龍四間飛車" => 13,
+     :"角道不突き左美濃" => 13,
+     :"鈴木流早石田" => 13,
+     :"魔界四間飛車" => 13,
+     :"右四間飛車急戦" => 14,
+     :"あずまや囲い" => 15,
+     :"ネコ式タテ歩取り" => 15,
+     :"メリケン向かい飛車" => 15,
+     :"三間飛車ミレニアム" => 15,
+     :"右四間飛車" => 15,
+     :"天守閣囲い" => 15,
+     :"棒銀" => 15,
+     :"極限早繰り銀" => 15,
+     :"横歩取り" => 15,
+     :"裏アヒル囲い" => 15,
+     :"裏アヒル戦法" => 15,
+     :"角交換振り飛車" => 15,
+     :"角換わり棒銀" => 15,
+     :"超速▲3七銀戦法" => 15,
+     :"△3三桂戦法" => 16,
+     :"△3三角型空中戦法" => 16,
+     :"ムリヤリ矢倉" => 16,
+     :"ちょんまげ美濃" => 17,
+     :"はく式四間飛車" => 17,
+     :"ひねり飛車" => 17,
+     :"カブト囲い" => 17,
+     :"ゴリゴリ金" => 17,
+     :"ノーマル四間飛車" => 17,
+     :"中原囲い" => 17,
+     :"勇気流" => 17,
+     :"四間飛車ミレニアム" => 17,
+     :"幽霊角" => 17,
+     :"振り飛車エルモ" => 17,
+     :"振り飛車串カツ囲い" => 17,
+     :"新ポンポン桂" => 17,
+     :"片美濃囲い" => 17,
+     :"端棒銀" => 17,
+     :"舟囲い" => 17,
+     :"超急戦" => 17,
+     :"連盟美濃" => 17,
+     :"青野流" => 17,
+     :"飯島流引き角戦法" => 17,
+     :"鳥刺し" => 17,
+     :"いかだ囲い" => 18,
+     :"やばボーズ流" => 18,
+     :"ノーガード戦法" => 18,
+     :"室岡システム" => 18,
+     :"相横歩取り" => 18,
+     :"遠山流" => 18,
+     :"つくつくぼうし戦法" => 19,
+     :"カニカニ金" => 19,
+     :"三間飛車藤井システム" => 19,
+     :"中飛車ミレニアム" => 19,
+     :"大盾囲い" => 19,
+     :"新村田システム" => 19,
+     :"玉頭位取り" => 19,
+     :"相掛かり棒銀" => 19,
+     :"矢倉早囲い" => 19,
+     :"稲庭戦法" => 19,
+     :"竹部スペシャル" => 19,
+     :"美濃囲い" => 19,
+     :"舟囲いDX" => 19,
+     :"角換わり早繰り銀" => 19,
+     :"鬼六流どっかん飛車" => 19,
+     :"△3三金型早繰り銀" => 20,
+     :"△4五角戦法" => 20,
+     :"一間飛車穴熊" => 20,
+     :"中座飛車" => 20,
+     :"裾固め" => 20,
+     :"GAVA角" => 21,
+     :"▲5七金戦法" => 21,
+     :"ヒラメ戦法" => 21,
+     :"ポンポン桂" => 21,
+     :"対振り持久戦" => 21,
+     :"悪形矢倉" => 21,
+     :"桐山流タテ歩棒銀" => 21,
+     :"片ツノ銀囲い" => 21,
+     :"石田流" => 21,
+     :"立石流四間飛車" => 21,
+     :"藤井システム" => 21,
+     :"鎖鎌銀" => 21,
+     :"アヒル囲い" => 22,
+     :"アヒル戦法" => 22,
+     :"オールド雁木" => 22,
+     :"左美濃急戦" => 22,
+     :"振り飛車穴熊" => 22,
+     :"矢倉中飛車" => 22,
+     :"矢倉流中飛車" => 22,
+     :"UFO銀" => 23,
+     :"へなちょこ急戦" => 23,
+     :"カニカニ銀" => 23,
+     :"中原流相掛かり" => 23,
+     :"坊主美濃" => 23,
+     :"塚田スペシャル" => 23,
+     :"天野矢倉" => 23,
+     :"屋敷流二枚銀棒銀型" => 23,
+     :"暴銀" => 23,
+     :"桐山流中原囲い" => 23,
+     :"矢倉右玉" => 23,
+     :"逆棒銀" => 23,
+     :"金美濃" => 23,
+     :"銀雲雀" => 23,
+     :"雲隠れ玉" => 23,
+     :"鷺宮定跡" => 23,
+     :"エルモ急戦" => 24,
+     :"レグスペ" => 24,
+     :"右四間飛車左美濃" => 24,
+     :"天守閣美濃" => 24,
+     :"棒金" => 24,
+     :"矢倉新24手組" => 24,
+     :"矢倉旧24手組" => 24,
+     :"5筋位取り" => 25,
+     :"6筋位取り" => 25,
+     :"ゴリラの右手" => 25,
+     :"ノーマル三間飛車" => 25,
+     :"モノレール囲い" => 25,
+     :"土居矢倉" => 25,
+     :"居飛車金無双" => 25,
+     :"居飛車金美濃" => 25,
+     :"屋敷流二枚銀" => 25,
+     :"山田定跡" => 25,
+     :"振り飛車天守閣美濃" => 25,
+     :"振り飛車端玉銀冠" => 25,
+     :"文鎮囲い" => 25,
+     :"森下システム" => 25,
+     :"森安流袖飛車穴熊" => 25,
+     :"片穴熊" => 25,
+     :"矢倉▲3七銀戦法" => 25,
+     :"神吉流三間飛車" => 25,
+     :"米長流急戦矢倉" => 25,
+     :"袖飛車" => 25,
+     :"豆腐矢倉" => 25,
+     :"金無双急戦" => 25,
+     :"金盾囲い" => 25,
+     :"銀美濃" => 25,
+     :"▲4六銀右急戦" => 26,
+     :"△7二飛亜急戦" => 26,
+     :"モノレール向かい飛車" => 26,
+     :"九間飛車左穴熊" => 26,
+     :"加藤流袖飛車" => 26,
+     :"箱入り娘" => 26,
+     :"腰掛け銀" => 26,
+     :"阿久津流急戦矢倉" => 26,
+     :"いちご囲い" => 27,
+     :"へこみ矢倉" => 27,
+     :"ツノ銀囲い" => 27,
+     :"トマホーク" => 27,
+     :"ミレニアム囲い" => 27,
+     :"幻想四間飛車" => 27,
+     :"木村美濃" => 27,
+     :"筋違い角蟻地獄戦法" => 27,
+     :"角矢倉" => 27,
+     :"金矢倉" => 27,
+     :"離れ金無双" => 27,
+     :"▲4六銀左急戦" => 28,
+     :"オリジナル雁木" => 28,
+     :"ショーダンオリジナル" => 28,
+     :"中原流急戦矢倉" => 28,
+     :"中飛車左穴熊" => 28,
+     :"振り飛車ミレニアム" => 28,
+     :"玉頭銀" => 28,
+     :"ツノ銀雁木" => 29,
+     :"大山美濃" => 29,
+     :"左美濃" => 29,
+     :"流れ矢倉" => 29,
+     :"金無双" => 29,
+     :"カギ囲い" => 30,
+     :"コーヤン流三間飛車" => 30,
+     :"羽生流右玉" => 30,
+     :"金多伝" => 30,
+     :"錆刀戦法" => 30,
+     :"▲4五歩早仕掛け" => 31,
+     :"オザワシステム" => 31,
+     :"セメント囲い" => 31,
+     :"下町流三間飛車" => 31,
+     :"升田美濃" => 31,
+     :"新風車" => 31,
+     :"無責任矢倉" => 31,
+     :"片銀冠" => 31,
+     :"神吉流穴熊" => 31,
+     :"空中楼閣" => 31,
+     :"紙穴熊" => 31,
+     :"脇システム" => 31,
+     :"銀矢倉" => 31,
+     :"飯島流相掛かり引き角戦法" => 31,
+     :"ボナンザ囲い" => 32,
+     :"右玉" => 32,
+     :"カブト美濃" => 33,
+     :"串カツ囲い" => 33,
+     :"振り飛車四枚美濃" => 33,
+     :"糸谷流右玉" => 33,
+     :"美濃熊囲い" => 33,
+     :"英春流カメレオン" => 33,
+     :"角換わり右玉" => 33,
+     :"角換わり腰掛け銀旧型" => 33,
+     :"銀立ち矢倉" => 33,
+     :"真部流" => 34,
+     :"高美濃囲い" => 34,
+     :"チョコレート囲い" => 35,
+     :"ツノ銀中飛車" => 35,
+     :"ツノ銀型右玉" => 35,
+     :"一直線穴熊" => 35,
+     :"居飛穴音無しの構え" => 35,
+     :"新型雁木" => 35,
+     :"端玉銀冠" => 35,
+     :"花村流名古屋戦法" => 35,
+     :"角換わり腰掛け銀" => 35,
+     :"金銀橋" => 35,
+     :"Uターン飛車" => 36,
+     :"かんぴょう囲い" => 36,
+     :"居飛車穴熊" => 36,
+     :"銀多伝" => 36,
+     :"一文字矢倉" => 37,
+     :"居飛車銀冠" => 37,
+     :"松尾流穴熊" => 37,
+     :"総矢倉" => 37,
+     :"高矢倉" => 37,
+     :"三段右玉" => 38,
+     :"四枚美濃" => 38,
+     :"矢倉棒銀" => 38,
+     :"ダイヤモンド美濃" => 39,
+     :"四枚穴熊" => 39,
+     :"金門矢倉" => 39,
+     :"銀冠" => 39,
+     :"間宮久夢流" => 39,
+     :"カタ囲い" => 40,
+     :"ショーダンシステム" => 40,
+     :"中原飛車" => 40,
+     :"対ひねり飛車たこ金戦法" => 40,
+     :"銀冠穴熊" => 40,
+     :"雀刺し" => 40,
+     :"雁木右玉" => 40,
+     :"振り飛車銀冠穴熊" => 41,
+     :"木村定跡" => 41,
+     :"楠本式石田流" => 41,
+     :"同型矢倉" => 42,
+     :"四手角" => 42,
+     :"四角矢倉" => 43,
+     :"隅矢倉" => 43,
+     :"高田流左玉" => 43,
+     :"菊水矢倉" => 44,
+     :"清野流岐阜戦法" => 45,
+     :"飛騨の中飛車合掌造り" => 45,
+     :"流線矢倉" => 46,
+     :"四枚銀冠" => 47,
+     :"矢倉穴熊" => 47,
+     :"菱矢倉" => 48,
+     :"藤森流急戦矢倉" => 48,
+     :"右矢倉" => 49,
+     :"居飛車金冠" => 49,
+     :"振り飛車ビッグ4" => 49,
+     :"地下鉄飛車" => 50,
+     :"富士見矢倉" => 50,
+     :"ビッグ4" => 52,
+     :"風車" => 52,
+     :"穴角戦法" => 53,
+     :"銀冠の小部屋" => 60,
+     :"都詰め" => 61,
+     :"四段端玉" => 81,
+     :"穴熊の姿焼き" => 84,
+     :"大駒コンプリート" => 97,
+     :"駒柱" => 121,
+    }
+  end
+end

data/lib/bioshogi/{explain → analysis}/tactic_hit_turn_table_generator.rb

@@ -1,33 +1,43 @@
-# -*- compile-command: "ruby -I../.. -rbioshogi -e Bioshogi::Explain::TacticHitTurnTableGenerator.new.generate" -*-
-
 module Bioshogi
-  module Explain
+  module Analysis
     class TacticHitTurnTableGenerator
-      def generate
-        body = body_format(turns_hash.inspect)
-        output_file.write(template % { body: body })
-        puts "write: #{output_file}"
+      def initialize(options = {})
+        @options = {
+          verbose: true,
+        }.merge(options)
       end
 
-      private
+      def call
+        output_file.write(template % { body: body })
+        if @options[:verbose]
+          puts "write: #{output_file}"
+        end
+      end
 
-      def turns_hash
-        hash = {}
-        Explain::TacticInfo.all_elements.each do |e|
-          print "."
-          info = e.sample_kif_info
-          found = info.formatter.container.hand_logs.each.with_index do |hand_log, i|
-            if hand_log.skill_set.flat_map { |e| e.flat_map(&:key) }.include?(e.key)
-              hash[e.key.to_s] = i.next
-              break true
+      def to_h
+        av = Analysis::TacticInfo.all_elements.collect do |e|
+          turn = nil
+          e.main_reference_info.formatter.container.hand_logs.each.with_index do |hand_log, i|
+            if hand_log.skill_set.has_skill?(e)
+              turn = i.next
+              break
             end
           end
-          unless found
-            raise e.key
-          end
+          [e, turn]
         end
-        puts
-        hash
+
+        av.sort_by { |e, turn| [turn || 0, e.name] }.collect { |e, turn| [e.name, turn] }.to_h
+      end
+
+      def body
+        str = to_h.inspect
+        str = str.gsub(/{/, "")
+        str = str.gsub(/}/, ",")
+        str = str.gsub(/\s*,\s*/, ",\n")
+        str = str.gsub(/^(?=")/, "  " * 3)
+        str = str.gsub("=>", " => ")
+        str = str.gsub(/ "/, ':"')
+        str = str.rstrip
       end
 
       def output_file
@@ -38,8 +48,9 @@ module Bioshogi
         o = []
         o << "# -*- frozen_string_literal: true -*-"
         o << "# #{__FILE__} から生成しているので編集するべからず"
+        o << "# 手数が nil のものは最後に判定してるため成立した手数を正確に知ることができない"
         o << "module Bioshogi"
-        o << "  module Explain"
+        o << "  module Analysis"
         o << "    TacticHitTurnTable = {"
         o << "%{body}"
         o << "    }"
@@ -47,15 +58,6 @@ module Bioshogi
         o << "end"
         o.join("\n") + "\n"
       end
-
-      def body_format(str)
-        str = str.gsub(/{/, "")
-        str = str.gsub(/}/, ",")
-        str = str.gsub(/\s*,\s*/, ",\n")
-        str = str.gsub(/^(?=")/, "  " * 3)
-        str = str.gsub("=>", " => ")
-        str = str.rstrip
-      end
     end
   end
 end