zakuro 0.9.2 → 0.9.4

data/lib/zakuro/calculation/range/transfer/year_boundary.rb

@@ -21,12 +21,13 @@ module Zakuro
             # 年間範囲内の年データの開始月を変更する
             #
             # @param [Context::Context] context 暦コンテキスト
-            # @param [Array<Base::Year>] annual_ranges 年データ（冬至基準）
+            # @param [Array<Array<Monthly::Month>>] annual_ranges 年データ（冬至基準）
             #
             # @return [Array<Base::Year>] 年データ（元旦基準）
             #
             def get(context:, annual_ranges:)
               categorize(context: context, annual_ranges: annual_ranges)
+
               rearranged_years(context: context, annual_ranges: annual_ranges)
             end
 
@@ -36,7 +37,7 @@ module Zakuro
             # 年間範囲内の年データの開始月を変更する
             #
             # @param [Context::Context] context 暦コンテキスト
-            # @param [Array<Base::Year>] annual_ranges 年データ（冬至基準）
+            # @param [Array<Array<Monthly::Month>>] annual_ranges 年データ（冬至基準）
             #
             # @return [Array<Base::Year>] 年データ（元旦基準）
             #
@@ -57,7 +58,7 @@ module Zakuro
             # 年間範囲を昨年/今年で分類する
             #
             # @param [Context::Context] context 暦コンテキスト
-            # @param [Array<Base::Year>] annual_range 1年データ
+            # @param [Array<Array<Monthly::Month>>] annual_range 1年データ
             #
             def categorize(context:, annual_ranges:)
               annual_ranges.each do |annual_range|
@@ -69,7 +70,7 @@ module Zakuro
             # 各月を昨年/今年で分類する
             #
             # @param [Context::Context] context 暦コンテキスト
-            # @param [Array<Month>] annual_range 1年データ
+            # @param [Array<Monthly::Month>] annual_range 1年データ
             #
             def categorize_year(context:, annual_range:)
               is_last_year = true
@@ -80,7 +81,8 @@ module Zakuro
                   context: context,
                   month_label: month.month_label, first_day: month.first_day,
                   solar_terms: month.solar_terms, phase_index: month.phase_index,
-                  is_last_year: is_last_year
+                  is_last_year: is_last_year,
+                  meta: month.meta
                 )
               end
             end
@@ -89,7 +91,7 @@ module Zakuro
             # 年データの開始月を変更する
             #
             # @param [Context::Context] context 暦コンテキスト
-            # @param [Array<Base::Year>] annual_ranges 年データ（冬至基準）
+            # @param [Array<Array<Monthly::Month>>] annual_ranges 年データ（冬至基準）
             # @param [Integer] index 対象年の要素番号
             #
             # @return [Base::Year] 年データ（元旦基準）
@@ -108,7 +110,7 @@ module Zakuro
             # 当年データを生成する
             #
             # @param [Context::Context] context 暦コンテキスト
-            # @param [Array<Month>] annual_range 1年データ
+            # @param [Array<Monthly::Month>] annual_range 1年データ
             #
             # @return [Base::Year] 当年月ありの対象年
             #
@@ -126,7 +128,7 @@ module Zakuro
             #
             # 昨年データを生成する
             #
-            # @param [Array<Month>] annual_range 1年データ
+            # @param [Array<Monthly::Month>] annual_range 1年データ
             # @param [Base::Year] year 対象年
             #
             # @return [Base::Year] 昨年月ありの対象年

data/lib/zakuro/calculation/stella/solar/abstract_average.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require_relative '../../monthly/meta/meta_collector'
+
+require_relative '../../../tools/remainder_comparer'
+
 # :nodoc:
 module Zakuro
   # :nodoc:
@@ -42,36 +46,6 @@ module Zakuro
           annual_range
         end
 
-        # :reek:TooManyStatements { max_statements: 7 }
-
-        class << self
-          #
-          # 月内（当月朔日から当月末日（来月朔日の前日）の間）に二十四節気があるか
-          # @note 大余60で一巡するため 以下2パターンがある
-          #   * current_month <= next_month : (二十四節気) >= current_month && (二十四節気) < next_month
-          #   * current_month > next_month  : (二十四節気) >= current_month || (二十四節気) < next_month
-          #
-          # @param [Cycle::AbstractRemainder] solar_term 二十四節気
-          # @param [Cycle::AbstractRemainder] current_month 月初
-          # @param [Cycle::AbstractRemainder] next_month 月末
-          #
-          # @return [True] 対象の二十四節気がある
-          # @return [False] 対象の二十四節気がない
-          #
-          def in_solar_term?(solar_term:, current_month:, next_month:)
-            # 大余で比較する
-            target_time = solar_term.day
-            current_month_time = current_month.day
-            next_month_time = next_month.day
-            current_month_over = (target_time >= current_month_time)
-            next_month_under = (target_time < next_month_time)
-
-            return current_month_over && next_month_under if current_month_time <= next_month_time
-
-            current_month_over || next_month_under
-          end
-        end
-
         private
 
         # :reek:TooManyStatements { max_statements: 8 }
@@ -87,10 +61,10 @@ module Zakuro
           # * 最大試行回数：4回（設定なし => 設定あり => 設定あり => 設定なし）
           # * 閏月は1回しか設定しない
           # * 最大2回設定する（中気・節気）
-          (0..3).each do |_index|
-            in_range = self.class.in_solar_term?(
-              solar_term: solar_term.remainder, current_month: current_month.remainder,
-              next_month: next_month.remainder
+          4.times.each do |_index|
+            in_range = Tools::RemainderComparer.in_range?(
+              target: solar_term.remainder, start: current_month.remainder,
+              last: next_month.remainder
             )
 
             # 範囲外

data/lib/zakuro/calculation/summary/internal/option.rb

@@ -34,17 +34,32 @@ module Zakuro
             context = month.context
 
             if context.option.dropped_date?
+              solar_term = month.solar_term_by_day(day: day.remainder.day)
+
               remainder = day.remainder
-              solar_terms = month.solar_terms
               option = dropped_date(
-                context: context, remainder: remainder, solar_terms: solar_terms
+                context: context, remainder: remainder, solar_term: solar_term
               )
               options[Context::Option::DROPPED_DATE_KEY] = option
             end
 
+            # TODO: refactor
             if context.option.vanished_date?
               remainder = day.remainder
               average_remainder = month.first_day.average_remainder
+              # p "remainder: #{remainder.format}"
+              # p "last_average_remainder: #{month.meta.last_average_remainder.format}"
+
+              if day.number == 1
+                option = vanished_date(
+                  context: context, remainder: remainder,
+                  average_remainder: month.meta.last_average_remainder
+                )
+                options[Context::Option::VANISHED_DATE_KEY] = option
+
+                return options if option.matched
+              end
+
               option = vanished_date(
                 context: context, remainder: remainder, average_remainder: average_remainder
               )
@@ -61,19 +76,21 @@ module Zakuro
           #
           # @param [Context::Context] context 暦コンテキスト
           # @param [Cycle::AbstractRemainder] remainder 当日和暦日
-          # @param [Array<Cycle::AbstractSolarTerm>] solar_terms 二十四節気
+          # @param [Cycle::AbstractSolarTerm] solar_terms 二十四節気
           #
           # @return [Result::Data::Option::DroppedDate::Option] 没日
           #
-          def dropped_date(context:, remainder:, solar_terms:)
+          def dropped_date(context:, remainder:, solar_term:)
             option = Result::Data::Option::DroppedDate::Option.new
 
             return option if remainder.invalid?
 
             location = Calculation::Option::DroppedDate::Location.new(
-              context: context, solar_terms: solar_terms
+              context: context, solar_term: solar_term
             )
 
+            return option if location.invalid?
+
             return option unless location.exist?
 
             dropped_date = location.get
@@ -122,6 +139,8 @@ module Zakuro
               context: context, average_remainder: average_remainder
             )
 
+            return Result::Data::Option::VanishedDate::Option.new if location.invalid?
+
             unless location.exist?
               # 結果確認のため経朔だけは設定する
               return Result::Data::Option::VanishedDate::Option.new(

data/lib/zakuro/calculation/summary/western/range.rb

@@ -35,6 +35,7 @@ module Zakuro
               years = get_full_range_years(
                 context: context, start_date: start_date, last_date: last_date
               )
+
               operated_years = get_operation_range_years(
                 context: context, years: years, start_date: start_date, last_date: last_date
               )
@@ -66,8 +67,14 @@ module Zakuro
             #
             def get_full_range_years(context:, start_date: Western::Calendar.new,
                                      last_date: Western::Calendar.new)
+              # 年情報の再計算
+              # * 元号開始日に計算値と運用値のズレが見られる場合、年情報の範囲が異なる場合がある
+              # * 例：0781-03-01（計算値は前の元号の「宝亀」を含めるが、運用値では含まない）
+              #
+              # 運用値の範囲で日付検索するが、元号開始日は計算値のままで取る
               full_range = Calculation::Range::DatedFullRange.new(
-                context: context, start_date: start_date, last_date: last_date
+                context: context, start_date: start_date, last_date: last_date,
+                operated: true, restored: true
               )
               full_range.get
             end

data/lib/zakuro/calculation/summary/western/single.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
+require_relative '../../../tools/gengou_range_comparer'
+
 require_relative '../../range/dated_operation_range'
 
 require_relative '../../range/dated_full_range'
 
-require_relative './specifier/single_day'
-
 require_relative '../internal/operation'
 
+require_relative './specifier/single_day'
+
 # :nodoc:
 module Zakuro
   # :nodoc:
@@ -53,8 +55,13 @@ module Zakuro
             # @return [Array<Calculation::Base::Year>] 完全範囲
             #
             def get_full_range_years(context:, date: Western::Calendar.new)
+              # 年情報の再計算
+              # * 元号開始日に計算値と運用値のズレが見られる場合、年情報の範囲が異なる場合がある
+              # * 例：0781-03-01（計算値は前の元号の「宝亀」を含めるが、運用値では含まない）
+              #
+              # 運用値の範囲で日付検索するが、元号開始日は計算値のままで取る
               full_range = Calculation::Range::DatedFullRange.new(
-                context: context, start_date: date
+                context: context, start_date: date, operated: true, restored: true
               )
               full_range.get
             end
@@ -93,12 +100,12 @@ module Zakuro
             end
 
             #
-            # 完全範囲を取得する
+            # 運用情報を取得する
             #
             # @param [Array<Calculation::Base::Year>] years 完全範囲
             # @param [Western::Calendar] date 西暦日
             #
-            # @return [Array<Calculation::Base::Year>] 完全範囲
+            # @return [Result::Operation] 運用情報
             #
             def get_operation(years:, date: Western::Calendar.new)
               calc_date = Specifier::SingleDay.get(

data/lib/zakuro/calculation/summary/western/specifier/single_day.rb

@@ -30,7 +30,7 @@ module Zakuro
               #
               # 取得する
               #
-              # @param [Array<Calculation::Base::Year>] years 範囲
+              # @param [Array<Base::Year>] years 範囲
               # @param [Western::Calendar] date 西暦日
               #
               # @return [Result::Data::SingleDay] 和暦日

data/lib/zakuro/era/japan/gengou/alignment/linear_gengou.rb

@@ -175,7 +175,7 @@ module Zakuro
           # @return [Western::Calendar]設定された元号の開始日
           #
           def native_start_date
-            gengou.both_start_date.western
+            gengou.start_date.western
           end
 
           #

data/lib/zakuro/era/japan/gengou/alignment.rb

@@ -23,6 +23,9 @@ module Zakuro
         # @return [Aligner] 整列結果
         SUMMARY = Aligner.new(resources: Resource::LIST)
 
+        # @return [Aligner] 整列結果（運用値）
+        OPERATED_SUMMARY = Aligner.new(resources: Resource::OPERATED_LIST)
+
         class << self
           #
           # 指定した範囲内の元号を取得する
@@ -30,11 +33,20 @@ module Zakuro
           # @param [Integer] line 行
           # @param [Western::Calendar] start_date 開始日
           # @param [Western::Calendar] last_date 終了日
+          # @param [True, False] operated 運用値設定
+          # @param [True, False] restored 運用値から計算値に戻すか
           #
           # @return [Array<LinearGengou>] 元号
           #
           def get(line: FIRST_LINE,
-                  start_date: Western::Calendar.new, last_date: Western::Calendar.new)
+                  start_date: Western::Calendar.new, last_date: Western::Calendar.new,
+                  operated: false, restored: false)
+            if operated
+              result = OPERATED_SUMMARY.get(line: line, start_date: start_date, last_date: last_date)
+              return result unless restored
+
+              return restore(line: line, list: result)
+            end
 
             SUMMARY.get(line: line, start_date: start_date, last_date: last_date)
           end
@@ -44,12 +56,39 @@ module Zakuro
           #
           # @param [Integer] line 行
           # @param [String] name 元号名
+          # @param [True, False] operated 運用値設定
+          # @param [True, False] restored 運用値から計算値に戻すか
           #
           # @return [Array<LinearGengou>] 元号
           #
-          def get_by_name(line: FIRST_LINE, name:)
+          def get_by_name(line: FIRST_LINE, name:, operated: false, restored: false)
+            if operated
+              result = OPERATED_SUMMARY.get_by_name(line: line, name: name)
+              return result unless restored
+
+              return restore(line: line, list: result)
+            end
+
             SUMMARY.get_by_name(line: line, name: name)
           end
+
+          #
+          # 運用値から計算値に戻す
+          #
+          # @param [Integer] line 行
+          # @param [Array<LinearGengou>] list 元号
+          #
+          # @return [Array<LinearGengou>] 元号
+          #
+          def restore(line: FIRST_LINE, list: [])
+            result = []
+            list.each do |gengou|
+              calc = SUMMARY.get_by_name(line: line, name: gengou.name)
+              result |= calc
+            end
+
+            result
+          end
         end
       end
     end

data/lib/zakuro/era/japan/gengou/resource/parser.rb

@@ -30,9 +30,11 @@ module Zakuro
             # @return [String] 元号名
             attr_reader :name
             # @return [Hash<String, String>] 開始年
-            attr_reader :both_start_year
+            attr_reader :start_year
             # @return [Hash<String, String>] 開始日
-            attr_reader :both_start_date
+            attr_reader :start_date
+            # @return [True, False] 運用値
+            attr_reader :operated
 
             #
             # 初期化
@@ -40,11 +42,12 @@ module Zakuro
             # @param [Hash<String, Strin>] hash 元号情報
             # @param [Integer] index （元号セット内での）元号の要素位置
             #
-            def initialize(hash:, index:)
+            def initialize(hash:, index:, operated: false)
               @index = index
               @name = hash['name']
-              @both_start_year = hash['start_year']
-              @both_start_date = hash['start_date']
+              @start_year = hash['start_year']
+              @start_date = hash['start_date']
+              @operated = operated
             end
 
             #
@@ -53,11 +56,11 @@ module Zakuro
             # @return [Gengou] 元号情報
             #
             def create
-              start_year = Both::YearParser.new(hash: both_start_year).create
-              start_date = Both::DateParser.new(hash: both_start_date).create
+              year = Both::YearParser.new(hash: start_year).create
+              date = SwitchDateParser.new(hash: start_date, operated: operated).create
 
-              Gengou.new(name: name, both_start_year: start_year,
-                         both_start_date: start_date)
+              Gengou.new(name: name, start_year: year,
+                         start_date: date)
             end
           end
 
@@ -70,23 +73,27 @@ module Zakuro
             # @return [String] 元号セット名
             attr_reader :name
             # @return [Hash<String, String>] 終了年
-            attr_reader :both_last_year
+            attr_reader :last_year
             # @return [Hash<String, String>] 終了日
-            attr_reader :both_last_date
+            attr_reader :last_date
             # @return [Array<Hash<String, String>>] 元号情報
             attr_reader :list
+            # @return [True, False] 運用値
+            attr_reader :operated
 
             #
             # 初期化
             #
             # @param [Hash<String, Object>] hash 元号セット情報
+            # @param [True, False] operated 運用値設定
             #
-            def initialize(hash:)
+            def initialize(hash:, operated: false)
               @id = hash['id']
               @name = hash['name']
-              @both_last_year = hash['last_year']
-              @both_last_date = hash['last_date']
+              @last_year = hash['last_year']
+              @last_date = hash['last_date']
               @list = hash['list']
+              @operated = operated
             end
 
             #
@@ -95,10 +102,10 @@ module Zakuro
             # @return [Set] 元号セット情報
             #
             def create
-              last_date = Both::DateParser.new(hash: both_last_date).create
+              date = SwitchDateParser.new(hash: last_date, operated: operated).create
               list = create_list
               Set.new(
-                id: id, name: name, both_last_date: last_date, list: list
+                id: id, name: name, last_date: date, list: list
               )
             end
 
@@ -112,7 +119,9 @@ module Zakuro
             def create_list
               result = []
               list.each_with_index do |li, index|
-                gengou = GengouParser.new(hash: li, index: index).create
+                gengou = GengouParser.new(
+                  hash: li, index: index, operated: operated
+                ).create
                 next_index = index + 1
                 gengou = calc_last_date_on_gengou_data(next_index: next_index,
                                                        gengou: gengou)
@@ -136,11 +145,15 @@ module Zakuro
                 return gengou
               end
               next_item = list[next_index]
+              next_start_date = SwitchDateParser.new(
+                hash: next_item['start_date'], operated: operated
+              ).create
+
               gengou.convert_next_start_year_to_last_year(
                 next_start_year: next_item['start_year']['western']
               )
               gengou.convert_next_start_date_to_last_date(
-                next_start_date: next_item['start_date']['western']
+                next_start_date: next_start_date.western
               )
               gengou
             end
@@ -153,9 +166,50 @@ module Zakuro
             # @param [GengouParser] gengou 元号
             #
             def last_gengou_data(gengou:)
-              gengou.write_last_year(last_year: both_last_year['western'])
-              last_date = Western::Calendar.parse(text: both_last_date['western'])
-              gengou.write_last_date(last_date: last_date)
+              gengou.write_last_year(last_year: last_year['western'])
+
+              date = SwitchDateParser.new(hash: last_date, operated: operated).create
+
+              gengou.write_last_date(last_date: date.western)
+            end
+          end
+
+          #
+          # SwitchDateParser 切替日（運用/計算）
+          #
+          class SwitchDateParser
+            # @return [Hash<String, Strin>] 計算値
+            attr_reader :calculation
+            # @return [Hash<String, Strin>] 運用値
+            attr_reader :operation
+            # @return [True, False] 運用値
+            attr_reader :operated
+
+            #
+            # 初期化
+            #
+            # @param [Hash<String, Strin>] hash 切替日（運用/計算）
+            # @param [True, False] operated 運用値設定
+            #
+            def initialize(hash:, operated: false)
+              @calculation = hash['calculation']
+              @operation = hash['operation']
+              @operated = operated
+            end
+
+            #
+            # 切替日（運用/計算）情報を生成する
+            #
+            # @return [SwitchDate] 切替日（運用/計算）情報
+            #
+            def create
+              calculation_date = Both::DateParser.new(hash: calculation).create
+              operation_date = Both::DateParser.new(hash: operation).create
+
+              Japan::Gengou::Resource::SwitchDate.new(
+                calculation: calculation_date, operation: operation_date,
+                operated: operated
+              )
             end
           end
 
@@ -222,8 +276,11 @@ module Zakuro
               # @return [Both::Date] 日情報
               #
               def create
-                japan_date = Japan::Calendar.parse(text: japan)
-                western_date = Western::Calendar.parse(text: western)
+                japan_date = Japan::Calendar.new
+                western_date = Western::Calendar.new
+
+                japan_date = Japan::Calendar.parse(text: japan) unless japan == ''
+                western_date = Western::Calendar.parse(text: western) unless western == ''
 
                 Japan::Gengou::Resource::Both::Date.new(
                   japan: japan_date, western: western_date
@@ -237,19 +294,20 @@ module Zakuro
             # 解析/展開する
             #
             # @param [String] filepath 元号セットファイルパス
+            # @param [True, False] operated 運用値設定
             #
             # @return [Set] 元号セット情報
             #
             # @raise [ArgumentError] 引数エラー
             #
-            def run(filepath: '')
+            def run(filepath: '', operated: false)
               yaml = YAML.load_file(filepath)
 
               failed = Validator.run(yaml_hash: yaml)
 
               raise ArgumentError, failed.join("\n") unless failed.empty?
 
-              parser = SetParser.new(hash: yaml)
+              parser = SetParser.new(hash: yaml, operated: operated)
               parser.create
             end
           end