zakuro 0.6.1 → 0.8.0

data/lib/zakuro/version/senmyou/stella/solar/average.rb

@@ -26,7 +26,7 @@ module Zakuro
         # @param [Integer] western_year 西暦年
         #
         def initialize(western_year:)
-          solar_term = Average.first_solar_term(western_year: western_year)
+          solar_term = self.class.first_solar_term(western_year: western_year)
           super(solar_term: solar_term)
         end
 
@@ -41,55 +41,57 @@ module Zakuro
           super(annual_range: annual_range)
         end
 
-        #
-        # 計算開始する二十四節気を求める
-        #
-        # @param [Integer] western_year 西暦年
-        #
-        # @return [SolarTerm] 二十四節気
-        #
-        def self.first_solar_term(western_year:)
-          # 天正冬至
-          winter_solstice = Origin::WinterSolstice.get(western_year: western_year)
-
-          # 二十四節気（冬至）
-          solar_term = Cycle::SolarTerm.new(index: 0, remainder: winter_solstice)
-
-          first_solar_term_index = Average.calc_first_solar_term_index(western_year: western_year)
-
-          # 対象の二十四節気まで戻す
-          solar_term.prev_by_index(first_solar_term_index)
-
-          solar_term
-        end
-
-        # :reek:TooManyStatements { max_statements: 6 }
-
-        #
-        # 計算開始する二十四節気番号を求める
-        #
-        # * 前提として入定気は冬至の手前にある
-        # * 例えば、定気が大雪であれば入定気は大雪の範囲内にある
-        # * 入定気は、定気の開始位置に重複しない限り、常に定気より後にある
-        # * 基本的に定気の一つ前から起算すれば、当時から求めた11月(閏10/閏11月)に二十四節気を割り当てられる
-        #
-        # @param [Integer] western_year 西暦年
-        #
-        # @return [Integer] 二十四節気番号
-        #
-        def self.calc_first_solar_term_index(western_year:)
-          # 天正閏余
-          lunar_age = Origin::LunarAge.get(western_year: western_year)
-
-          solar_location = Solar::Location.new(lunar_age: lunar_age)
-          solar_location.run
-
-          solar_term_index = solar_location.index
-
-          # 入定気の一つ後の二十四節気まで戻す（ただし11月経朔が二十四節気上にある場合は戻さない）
-          solar_term_index += 1 unless solar_location.remainder.day.zero?
-
-          solar_term_index
+        class << self
+          #
+          # 計算開始する二十四節気を求める
+          #
+          # @param [Integer] western_year 西暦年
+          #
+          # @return [SolarTerm] 二十四節気
+          #
+          def first_solar_term(western_year:)
+            # 天正冬至
+            winter_solstice = Origin::WinterSolstice.get(western_year: western_year)
+
+            # 二十四節気（冬至）
+            solar_term = Cycle::SolarTerm.new(index: 0, remainder: winter_solstice)
+
+            first_solar_term_index = calc_first_solar_term_index(western_year: western_year)
+
+            # 対象の二十四節気まで戻す
+            solar_term.prev_by_index(first_solar_term_index)
+
+            solar_term
+          end
+
+          # :reek:TooManyStatements { max_statements: 6 }
+
+          #
+          # 計算開始する二十四節気番号を求める
+          #
+          # * 前提として入定気は冬至の手前にある
+          # * 例えば、定気が大雪であれば入定気は大雪の範囲内にある
+          # * 入定気は、定気の開始位置に重複しない限り、常に定気より後にある
+          # * 基本的に定気の一つ前から起算すれば、当時から求めた11月(閏10/閏11月)に二十四節気を割り当てられる
+          #
+          # @param [Integer] western_year 西暦年
+          #
+          # @return [Integer] 二十四節気番号
+          #
+          def calc_first_solar_term_index(western_year:)
+            # 天正閏余
+            lunar_age = Origin::LunarAge.get(western_year: western_year)
+
+            solar_location = Solar::Location.new(lunar_age: lunar_age)
+            solar_location.run
+
+            solar_term_index = solar_location.index
+
+            # 入定気の一つ後の二十四節気まで戻す（ただし11月経朔が二十四節気上にある場合は戻さない）
+            solar_term_index += 1 unless solar_location.remainder.day.zero?
+
+            solar_term_index
+          end
         end
       end
     end

data/lib/zakuro/version/senmyou/stella/solar/interval.rb

@@ -78,24 +78,26 @@ module Zakuro
           MAP[:taisetsu]    # 23
         ].freeze
 
-        #
-        # 入気定日加減数を引き当てる
-        #
-        # @param [Integer] index 二十四節気番号
-        #
-        # @return [Cycle::Remainder] 入気定日加減数
-        #
-        def self.index_of(index)
-          LIST[index]
-        end
+        class << self
+          #
+          # 入気定日加減数を引き当てる
+          #
+          # @param [Integer] index 二十四節気番号
+          #
+          # @return [Cycle::Remainder] 入気定日加減数
+          #
+          def index_of(index)
+            LIST[index]
+          end
 
-        #
-        # 入気定日加減数の総数を返す
-        #
-        # @return [Integer] 入気定日加減数の総数
-        #
-        def self.size
-          LIST.size
+          #
+          # 入気定日加減数の総数を返す
+          #
+          # @return [Integer] 入気定日加減数の総数
+          #
+          def size
+            LIST.size
+          end
         end
       end
     end

data/lib/zakuro/version/senmyou/stella/solar/value.rb

@@ -19,19 +19,21 @@ module Zakuro
         # @return [Integer] 1日
         DAY = Const::Number::Cycle::DAY
 
-        #
-        # 太陽の運行による補正値を算出する
-        #
-        # @param [SolarTerm] solar_location 入定気
-        #
-        # @return [Integer] 補正値
-        #
-        def self.get(solar_location:)
-          remainder = solar_location.remainder
+        class << self
+          #
+          # 太陽の運行による補正値を算出する
+          #
+          # @param [SolarTerm] solar_location 入定気
+          #
+          # @return [Integer] 補正値
+          #
+          def get(solar_location:)
+            remainder = solar_location.remainder
 
-          row = Adjustment.specify(index: solar_location.index)
+            row = Adjustment.specify(index: solar_location.index)
 
-          Calculation::Solar::ChoukeiValue.get(remainder: remainder, row: row)
+            Calculation::Solar::ChoukeiValue.get(remainder: remainder, row: row)
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zakuro
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.8.0
 platform: ruby
 authors:
 - pldb
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-02 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies: []
 description: mainly lunar solar calendar
 email:
@@ -29,6 +29,8 @@ files:
 - VERSION
 - bin/console
 - bin/setup
+- doc/dropped_date.md
+- doc/error.md
 - doc/gengou.md
 - doc/operation.md
 - doc/operation/csv/month.csv
@@ -41,6 +43,7 @@ files:
 - images/各月の求め方.png
 - images/太陽と月.png
 - lib/zakuro.rb
+- lib/zakuro/calculation/base/day.rb
 - lib/zakuro/calculation/base/gengou.rb
 - lib/zakuro/calculation/base/linear_gengou.rb
 - lib/zakuro/calculation/base/operated_year.rb
@@ -48,41 +51,66 @@ files:
 - lib/zakuro/calculation/cycle/abstract_remainder.rb
 - lib/zakuro/calculation/cycle/abstract_solar_term.rb
 - lib/zakuro/calculation/cycle/zodiac.rb
+- lib/zakuro/calculation/era/gengou/abstract_scroll.rb
+- lib/zakuro/calculation/era/gengou/dated_scroll.rb
 - lib/zakuro/calculation/era/gengou/internal/connector.rb
 - lib/zakuro/calculation/era/gengou/internal/counter.rb
 - lib/zakuro/calculation/era/gengou/internal/publisher.rb
 - lib/zakuro/calculation/era/gengou/internal/reserve.rb
-- lib/zakuro/calculation/era/gengou/internal/reserve/list.rb
-- lib/zakuro/calculation/era/gengou/internal/reserve/range.rb
-- lib/zakuro/calculation/era/gengou/scroll.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/abstract_list.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/abstract_range.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/dated_list.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/dated_range.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/empty_link.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/named_list.rb
+- lib/zakuro/calculation/era/gengou/internal/reserve/named_range.rb
+- lib/zakuro/calculation/era/gengou/named_scroll.rb
 - lib/zakuro/calculation/era/version/internal/crawler.rb
 - lib/zakuro/calculation/era/version/internal/range.rb
 - lib/zakuro/calculation/era/version/version.rb
 - lib/zakuro/calculation/monthly/abstract_lunar_phase.rb
+- lib/zakuro/calculation/monthly/const.rb
 - lib/zakuro/calculation/monthly/first_day.rb
 - lib/zakuro/calculation/monthly/initialized_month.rb
 - lib/zakuro/calculation/monthly/month.rb
 - lib/zakuro/calculation/monthly/month_label.rb
 - lib/zakuro/calculation/monthly/operated_month.rb
-- lib/zakuro/calculation/range/full_range.rb
+- lib/zakuro/calculation/monthly/operated_solar_term.rb
+- lib/zakuro/calculation/option/dropped_date/abstract_parameter.rb
+- lib/zakuro/calculation/option/dropped_date/location.rb
+- lib/zakuro/calculation/range/abstract_full_range.rb
+- lib/zakuro/calculation/range/abstract_operation_range.rb
+- lib/zakuro/calculation/range/dated_full_range.rb
+- lib/zakuro/calculation/range/dated_operation_range.rb
 - lib/zakuro/calculation/range/medieval_annual_range.rb
-- lib/zakuro/calculation/range/operated_range.rb
-- lib/zakuro/calculation/range/operated_solar_terms.rb
+- lib/zakuro/calculation/range/named_full_range.rb
+- lib/zakuro/calculation/range/named_operation_range.rb
+- lib/zakuro/calculation/range/operated_solar_term.rb
 - lib/zakuro/calculation/range/transfer/gengou_scroller.rb
 - lib/zakuro/calculation/range/transfer/year_boundary.rb
-- lib/zakuro/calculation/specifier/internal/month.rb
-- lib/zakuro/calculation/specifier/multiple_day.rb
-- lib/zakuro/calculation/specifier/single_day.rb
 - lib/zakuro/calculation/stella/lunar/abstract_location.rb
 - lib/zakuro/calculation/stella/lunar/choukei_value.rb
 - lib/zakuro/calculation/stella/solar/abstract_average.rb
 - lib/zakuro/calculation/stella/solar/abstract_location.rb
 - lib/zakuro/calculation/stella/solar/choukei_value.rb
+- lib/zakuro/calculation/summary/internal/day.rb
+- lib/zakuro/calculation/summary/internal/month.rb
 - lib/zakuro/calculation/summary/internal/operation.rb
-- lib/zakuro/calculation/summary/range.rb
-- lib/zakuro/calculation/summary/single.rb
+- lib/zakuro/calculation/summary/internal/option.rb
+- lib/zakuro/calculation/summary/japan/range.rb
+- lib/zakuro/calculation/summary/japan/single.rb
+- lib/zakuro/calculation/summary/japan/specifier/single_day.rb
+- lib/zakuro/calculation/summary/japan/specifier/specified_range.rb
+- lib/zakuro/calculation/summary/western/range.rb
+- lib/zakuro/calculation/summary/western/single.rb
+- lib/zakuro/calculation/summary/western/specifier/multiple_day.rb
+- lib/zakuro/calculation/summary/western/specifier/single_day.rb
 - lib/zakuro/calculation/type/old_float.rb
+- lib/zakuro/calculation/type/optional.rb
 - lib/zakuro/condition.rb
+- lib/zakuro/context/context.rb
+- lib/zakuro/context/option.rb
+- lib/zakuro/context/version_class_resolver.rb
 - lib/zakuro/era/japan/calendar.rb
 - lib/zakuro/era/japan/gengou.rb
 - lib/zakuro/era/japan/gengou/alignment.rb
@@ -99,6 +127,16 @@ files:
 - lib/zakuro/era/japan/gengou/resource/yaml/set-003-modern.yaml
 - lib/zakuro/era/japan/version.rb
 - lib/zakuro/era/western/calendar.rb
+- lib/zakuro/exception/case/pattern.rb
+- lib/zakuro/exception/case/preset.rb
+- lib/zakuro/exception/case/template.rb
+- lib/zakuro/exception/cause.rb
+- lib/zakuro/exception/exception.rb
+- lib/zakuro/exception/zakuro_error.rb
+- lib/zakuro/gateway/locale/date.rb
+- lib/zakuro/gateway/locale/range.rb
+- lib/zakuro/gateway/range.rb
+- lib/zakuro/gateway/single.rb
 - lib/zakuro/merchant.rb
 - lib/zakuro/operation/month/parser.rb
 - lib/zakuro/operation/month/type.rb
@@ -109,19 +147,31 @@ files:
 - lib/zakuro/output/logger.rb
 - lib/zakuro/output/response.rb
 - lib/zakuro/result/core.rb
-- lib/zakuro/result/data.rb
+- lib/zakuro/result/data/day.rb
+- lib/zakuro/result/data/gengou.rb
+- lib/zakuro/result/data/month.rb
+- lib/zakuro/result/data/option/abstract_option.rb
+- lib/zakuro/result/data/option/dropped_date/calculation.rb
+- lib/zakuro/result/data/option/dropped_date/option.rb
+- lib/zakuro/result/data/option/dropped_date/solar_term.rb
+- lib/zakuro/result/data/single_day.rb
+- lib/zakuro/result/data/solar_term.rb
+- lib/zakuro/result/data/year.rb
 - lib/zakuro/result/operation.rb
+- lib/zakuro/result/operation/month.rb
+- lib/zakuro/result/operation/month/annotation.rb
+- lib/zakuro/result/operation/month/history.rb
 - lib/zakuro/result/result.rb
 - lib/zakuro/tools/stringifier.rb
 - lib/zakuro/tools/typeconv.rb
 - lib/zakuro/tools/typeof.rb
-- lib/zakuro/version/context.rb
 - lib/zakuro/version/daien/const/number.rb
 - lib/zakuro/version/daien/const/remainder.rb
 - lib/zakuro/version/daien/cycle/remainder.rb
 - lib/zakuro/version/daien/cycle/solar_term.rb
 - lib/zakuro/version/daien/daien.rb
 - lib/zakuro/version/daien/monthly/lunar_phase.rb
+- lib/zakuro/version/daien/option/dropped_date/parameter.rb
 - lib/zakuro/version/daien/range/annual_range.rb
 - lib/zakuro/version/daien/stella/lunar/adjustment.rb
 - lib/zakuro/version/daien/stella/lunar/localization.rb
@@ -141,6 +191,7 @@ files:
 - lib/zakuro/version/genka/cycle/solar_term.rb
 - lib/zakuro/version/genka/genka.rb
 - lib/zakuro/version/genka/monthly/lunar_phase.rb
+- lib/zakuro/version/genka/option/dropped_date/parameter.rb
 - lib/zakuro/version/genka/range/annual_range.rb
 - lib/zakuro/version/genka/stella/origin/first_term.rb
 - lib/zakuro/version/genka/stella/origin/january.rb
@@ -151,6 +202,7 @@ files:
 - lib/zakuro/version/gihou/cycle/solar_term.rb
 - lib/zakuro/version/gihou/gihou.rb
 - lib/zakuro/version/gihou/monthly/lunar_phase.rb
+- lib/zakuro/version/gihou/option/dropped_date/parameter.rb
 - lib/zakuro/version/gihou/range/annual_range.rb
 - lib/zakuro/version/gihou/stella/lunar/adjustment.rb
 - lib/zakuro/version/gihou/stella/lunar/localization.rb
@@ -174,6 +226,7 @@ files:
 - lib/zakuro/version/senmyou/cycle/remainder.rb
 - lib/zakuro/version/senmyou/cycle/solar_term.rb
 - lib/zakuro/version/senmyou/monthly/lunar_phase.rb
+- lib/zakuro/version/senmyou/option/dropped_date/parameter.rb
 - lib/zakuro/version/senmyou/range/annual_range.rb
 - lib/zakuro/version/senmyou/senmyou.rb
 - lib/zakuro/version/senmyou/stella/lunar/adjustment.rb
@@ -189,7 +242,6 @@ files:
 - lib/zakuro/version/senmyou/stella/solar/location.rb
 - lib/zakuro/version/senmyou/stella/solar/value.rb
 - lib/zakuro/version/tenpou/tenpou.rb
-- lib/zakuro/version/version_class_resolver.rb
 - zakuro.gemspec
 homepage: https://github.com/pldb/zakuro
 licenses:

data/lib/zakuro/calculation/range/operated_range.rb

@@ -1,193 +0,0 @@
-# frozen_string_literal: true
-
-require_relative './operated_solar_terms'
-require_relative '../../operation/operation'
-require_relative '../base/operated_year'
-require_relative '../../calculation/monthly/operated_month'
-require_relative './transfer/gengou_scroller'
-
-# :nodoc:
-module Zakuro
-  # :nodoc:
-  module Calculation
-    # :nodoc:
-    module Range
-      #
-      # OperatedRange 運用結果範囲
-      #
-      # 何らかの理由により、計算された暦とは異なる運用結果である場合、その結果に合わせて計算結果を上書きする
-      class OperatedRange
-        # @return [Array<Year>] 年データ（完全範囲）
-        attr_reader :years
-        # @return [OperatedSolarTerms] 運用時二十四節気
-        attr_reader :operated_solar_terms
-        # @return [Context] 暦コンテキスト
-        attr_reader :context
-
-        #
-        # 初期化
-        #
-        # @param [Context] context 暦コンテキスト
-        # @param [Western::Calendar] start_date 開始日
-        # @param [Western::Calendar] last_date 終了日
-        # @param [Array<Year>] years 年データ（完全範囲）
-        #
-        def initialize(context:, start_date: Western::Calendar.new, last_date: Western::Calendar.new,
-                       years: [])
-          @context = context
-          @years = years
-          @scroll = Gengou::Scroll.new(start_date: start_date, last_date: last_date)
-          @operated_solar_terms = OperatedSolarTerms.new(context: context, years: @years)
-          @operated_solar_terms.create
-        end
-
-        #
-        # 運用結果範囲を取得する
-        #
-        # @return [Array<Year>] 運用結果範囲
-        #
-        def get
-          operated_years = rewrite
-
-          OperatedRange.move(operated_years: operated_years)
-
-          OperatedRange.commit(operated_years: operated_years)
-
-          Transfer::GengouScroller.set(scroll: @scroll, years: operated_years)
-
-          operated_years
-        end
-
-        #
-        # 運用結果に書き換える
-        #
-        # @return [Array<OperatedYear>] 運用結果範囲
-        #
-        def rewrite
-          operated_years = []
-
-          years.each do |year|
-            operated_year = OperatedRange.rewrite_year(
-              year: year,
-              operated_solar_terms: @operated_solar_terms
-            )
-            operated_years.push(operated_year)
-          end
-
-          operated_years
-        end
-
-        #
-        # 運用情報で年を跨ぐ月をその年に寄せる
-        #
-        # @param [Array<OperatedYear>] operated_years 運用結果範囲
-        #
-        def self.move(operated_years:)
-          move_into_next_year(operated_years: operated_years)
-          move_into_last_year(operated_years: operated_years)
-        end
-
-        #
-        # 運用情報では来年に属する月を来年に寄せる
-        #
-        # @param [Array<OperatedYear>] operated_years 運用結果範囲
-        #
-        def self.move_into_next_year(operated_years:)
-          operated_years.each_cons(2) do |current_year, next_year|
-            months = current_year.pop_next_year_months
-
-            next_year.unshift_months(months)
-          end
-        end
-
-        #
-        # 運用情報では昨年に属する月を昨年に寄せる
-        #
-        # @param [Array<OperatedYear>] operated_years 運用結果範囲
-        #
-        def self.move_into_last_year(operated_years:)
-          rerversed_year = operated_years.reverse!
-          rerversed_year.each_cons(2) do |current_year, last_year|
-            months = current_year.shift_last_year_months
-            last_year.push_months(months)
-          end
-
-          rerversed_year.reverse!
-        end
-
-        #
-        # 年を確定させる
-        #
-        # @param [Array<OperatedYear>] operated_years 運用結果範囲
-        #
-        def self.commit(operated_years:)
-          operated_years.each(&:commit)
-        end
-
-        #
-        # 年を書き換える
-        #
-        # @param [Year] year 年
-        # @param [OperatedSolarTerms] operated_solar_terms 運用時二十四節気
-        #
-        # @return [OperatedYear] 年
-        #
-        def self.rewrite_year(year:, operated_solar_terms:)
-          context = year.context
-          result = Base::OperatedYear.new(context: context)
-          year.months.each do |month|
-            result.push(month: resolve_month(
-              context: context, month: month,
-              operated_solar_terms: operated_solar_terms
-            ))
-          end
-
-          result
-        end
-
-        #
-        # 履歴情報の有無に応じた月にする
-        #
-        # @param [Context] context 暦コンテキスト
-        # @param [Month] month 月
-        # @param [OperatedSolarTerms] operated_solar_terms 運用時二十四節気
-        #
-        # @return [Month] 月
-        #
-        def self.resolve_month(context:, month:, operated_solar_terms:)
-          history = Operation.specify_history(western_date: month.western_date)
-
-          OperatedRange.rewrite_month(
-            context: context, month: month, history: history,
-            operated_solar_terms: operated_solar_terms
-          )
-        end
-
-        # :reek:LongParameterList {max_params: 4}
-
-        #
-        # 月を運用結果に書き換える
-        #
-        # @param [Context] context 暦コンテキスト
-        # @param [Month] month 月
-        # @param [Operation::MonthHistory] history 変更履歴
-        # @param [OperatedSolarTerms] operated_solar_terms 運用時二十四節気
-        #
-        # @return [Month] 月（運用結果）
-        #
-        def self.rewrite_month(context:, month:, history:, operated_solar_terms:)
-          operated_month = Monthly::OperatedMonth.new(
-            context: context,
-            month_label: month.month_label, first_day: month.first_day,
-            solar_terms: month.solar_terms, history: history, gengou: month.gengou,
-            operated_solar_terms: operated_solar_terms
-          )
-
-          operated_month.rewrite unless history.invalid?
-
-          operated_month
-        end
-      end
-    end
-  end
-end