zakuro 0.7.0 → 0.9.0

data/lib/zakuro/version/senmyou/stella/origin/average_november.rb

@@ -13,20 +13,22 @@ module Zakuro
       # AverageNovember 11月経
       #
       module AverageNovember
-        #
-        # 11月経朔（冬至が含まれる月の1日）を求める
-        #
-        # @param [Integer] western_year 西暦年
-        #
-        # @return [Remainder] 11月経朔
-        #
-        def self.get(western_year:)
-          # 冬至
-          winter_solstice = WinterSolstice.get(western_year: western_year)
-          # 天正閏余
-          lunar_age = LunarAge.get(western_year: western_year)
+        class << self
+          #
+          # 11月経朔（冬至が含まれる月の1日）を求める
+          #
+          # @param [Integer] western_year 西暦年
+          #
+          # @return [Remainder] 11月経朔
+          #
+          def get(western_year:)
+            # 冬至
+            winter_solstice = WinterSolstice.get(western_year: western_year)
+            # 天正閏余
+            lunar_age = LunarAge.get(western_year: western_year)
 
-          winter_solstice.sub(lunar_age)
+            winter_solstice.sub(lunar_age)
+          end
         end
       end
     end

data/lib/zakuro/version/senmyou/stella/origin/lunar_age.rb

@@ -28,33 +28,35 @@ module Zakuro
 
         # :reek:TooManyStatements { max_statements: 7 }
 
-        #
-        # 対象年の天正閏余（冬至より前にある11月経朔との差 = 月齢）を算出する
-        # 太陽と月の運動による補正値を算出し、その補正結果を返す
-        #
-        # @param [Integer] western_year 西暦年
-        #
-        # @return [Remainder] 天正閏余
-        #
-        def self.get(western_year:)
-          # 積年の開始から対象年までの年数
-          total = TOTAL_YEAR + western_year - BEGIN_YEAR
+        class << self
+          #
+          # 対象年の天正閏余（冬至より前にある11月経朔との差 = 月齢）を算出する
+          # 太陽と月の運動による補正値を算出し、その補正結果を返す
+          #
+          # @param [Integer] western_year 西暦年
+          #
+          # @return [Remainder] 天正閏余
+          #
+          def get(western_year:)
+            # 積年の開始から対象年までの年数
+            total = TOTAL_YEAR + western_year - BEGIN_YEAR
 
-          # 12朔望月に対する1年の余り（単位:分）
-          remainder_minute = YEAR - (SYNODIC_MONTH * 12)
+            # 12朔望月に対する1年の余り（単位:分）
+            remainder_minute = YEAR - (SYNODIC_MONTH * 12)
 
-          # 朔望月に含まれなかった余り（単位:年）
-          remainder_year = total % SYNODIC_MONTH
+            # 朔望月に含まれなかった余り（単位:年）
+            remainder_year = total % SYNODIC_MONTH
 
-          LOGGER.debug("[01]: #{remainder_year}")
+            LOGGER.debug("[01]: #{remainder_year}")
 
-          # 天正閏余
-          lunar_age = remainder_minute * remainder_year % SYNODIC_MONTH
+            # 天正閏余
+            lunar_age = remainder_minute * remainder_year % SYNODIC_MONTH
 
-          LOGGER.debug("[02]: #{lunar_age}")
+            LOGGER.debug("[02]: #{lunar_age}")
 
-          # 大余・小余に変換する
-          Cycle::Remainder.new(total: lunar_age)
+            # 大余・小余に変換する
+            Cycle::Remainder.new(total: lunar_age)
+          end
         end
       end
     end

data/lib/zakuro/version/senmyou/stella/origin/winter_solstice.rb

@@ -28,26 +28,28 @@ module Zakuro
 
         # :reek:TooManyStatements { max_statements: 6 }
 
-        #
-        # 対象年の前年の冬至を求める
-        #
-        # @param [Integer] western_year 西暦年
-        #
-        # @return [Remainder] 前年の冬至
-        #
-        def self.get(western_year:)
-          # 積年の開始から対象年までの年数
-          total = TOTAL_YEAR + western_year - BEGIN_YEAR
-          remainder_year = total % SIXTY_DAYS
-
-          LOGGER.debug("[01]:#{remainder_year}")
-
-          # 通余を使う
-          winter_solstice_minute = (remainder_year * REMAINDER_ALL_YEAR) % SIXTY_DAYS
-
-          LOGGER.debug("[02]:#{winter_solstice_minute}")
-
-          Cycle::Remainder.new(total: winter_solstice_minute)
+        class << self
+          #
+          # 対象年の前年の冬至を求める
+          #
+          # @param [Integer] western_year 西暦年
+          #
+          # @return [Remainder] 前年の冬至
+          #
+          def get(western_year:)
+            # 積年の開始から対象年までの年数
+            total = TOTAL_YEAR + western_year - BEGIN_YEAR
+            remainder_year = total % SIXTY_DAYS
+
+            LOGGER.debug("[01]:#{remainder_year}")
+
+            # 通余を使う
+            winter_solstice_minute = (remainder_year * REMAINDER_ALL_YEAR) % SIXTY_DAYS
+
+            LOGGER.debug("[02]:#{winter_solstice_minute}")
+
+            Cycle::Remainder.new(total: winter_solstice_minute)
+          end
         end
       end
     end

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

@@ -76,16 +76,18 @@ module Zakuro
           taisetsu: Row.new(stack: -449.0, per_term: +28.4618, per_day: +0.3695)   # 大雪（たいせつ）
         }.freeze
 
-        #
-        # 24気損益眺朒（ちょうじく）数の行データを特定する
-        #
-        # @param [Integer] index 連番（二十四節気）
-        #
-        # @return [Row] 行データ
-        #
-        def self.specify(index:)
-          key = Cycle::SolarTerm::ORDER[index]
-          Adjustment::MAP[key].clone
+        class << self
+          #
+          # 24気損益眺朒（ちょうじく）数の行データを特定する
+          #
+          # @param [Integer] index 連番（二十四節気）
+          #
+          # @return [Row] 行データ
+          #
+          def specify(index:)
+            key = Cycle::SolarTerm::ORDER[index]
+            Adjustment::MAP[key].clone
+          end
         end
       end
     end

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.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - pldb
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-09-10 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
@@ -66,11 +69,15 @@ files:
 - 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/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
@@ -78,7 +85,7 @@ files:
 - lib/zakuro/calculation/range/medieval_annual_range.rb
 - lib/zakuro/calculation/range/named_full_range.rb
 - lib/zakuro/calculation/range/named_operation_range.rb
-- lib/zakuro/calculation/range/operated_solar_terms.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/stella/lunar/abstract_location.rb
@@ -86,17 +93,24 @@ files:
 - 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/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
@@ -136,24 +150,28 @@ files:
 - 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/bundle.rb
 - lib/zakuro/result/operation/month/history.rb
-- lib/zakuro/result/operation/operation.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
@@ -173,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
@@ -183,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
@@ -206,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
@@ -221,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: