zakuro 0.1.5 → 0.5.0

data/lib/zakuro/version/gihou/stella/solar/location.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require_relative '../../../../calculation/stella/solar/abstract_location'
+
+require_relative '../../const/remainder'
+
+require_relative './interval'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Gihou
+    # :nodoc:
+    module Solar
+      #
+      # Location 入定気
+      #
+      class Location < Calculation::Solar::AbstractLocation
+        # @return [Cycle::Remainder] 弦
+        QUARTER = Const::Remainder::Solar::QUARTER
+
+        #
+        # 初期化
+        #
+        # @param [Cycle::Remainder] lunar_age 天正閏余（大余小余）
+        #
+        def initialize(lunar_age:)
+          super(lunar_age: lunar_age, quarter: QUARTER)
+        end
+
+        # :reek:UtilityFunction
+
+        #
+        # 二十四節気番号に対応する入気定日加減数を返す
+        #
+        # @note 継承のためクラスメソッドにしない
+        #
+        # @param [Integer] index 二十四節気番号
+        #
+        # @return [Cycle::Remainder] 入気定日加減数
+        #
+        def interval(index:)
+          Interval.index_of(index)
+        end
+
+        # :reek:UtilityFunction
+
+        #
+        # 入気定日加減数の要素数を返す
+        #
+        # @note 継承のためクラスメソッドにしない
+        #
+        # @return [Integer] 入気定日加減数の要素数
+        #
+        def interval_size
+          Interval.size
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require_relative '../../../../calculation/stella/solar/choukei_value'
+
+require_relative '../../const/number'
+
+require_relative './adjustment'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Gihou
+    # :nodoc:
+    module Solar
+      #
+      # Value 太陽補正値
+      #
+      module Value
+        #
+        # 太陽の運行による補正値を算出する
+        #
+        # @param [SolarTerm] solar_location 入定気
+        #
+        # @return [Integer] 補正値
+        #
+        def self.get(solar_location:)
+          remainder = solar_location.remainder
+
+          row = Adjustment.specify(index: solar_location.index)
+
+          Calculation::Solar::ChoukeiValue.get(remainder: remainder, row: row)
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/version/senmyou/const/number.rb

@@ -18,7 +18,7 @@ module Zakuro
         module Cycle
           # @return [Integer] 統法（1日=8400分）
           DAY = 8400
-          # @return [Integer] 暦周（1近日点）
+          # @return [Float] 暦周（1近点月）
           ANOMALISTIC_MONTH = 231_458.19
           # @return [Integer] 朔望月
           SYNODIC_MONTH = 248_057

data/lib/zakuro/version/senmyou/const/remainder.rb

@@ -20,6 +20,9 @@ module Zakuro
         module Solar
           # @return [Cycle::Remainder] 気策（24分の1年）
           SOLAR_TERM_AVERAGE = Cycle::Remainder.new(day: 15, minute: 1835, second: 5)
+          #
+          # @note 章月 248057 = 29-4457
+          #
           # @return [Cycle::Remainder] 弦（1分=8秒）
           QUARTER = Cycle::Remainder.new(day: 7, minute: 3214, second: 2)
         end
@@ -29,11 +32,12 @@ module Zakuro
         #
         module Lunar
           # @return [Cycle::LunarRemainder] 暦中日
-          # @note ANOMALISTIC_MONTH の半分に相当する
+          # @note ANOMALISTIC_MONTH （1近点月）の半分に相当する
           HALF_ANOMALISTIC_MONTH = \
             Cycle::LunarRemainder.new(day: 13, minute: 6529, second: 9.5)
-          # @return [Cycle::LunarRemainder] 入暦上限
-          LIMIT = Cycle::LunarRemainder.new(day: 14, minute: 6529, second: 0)
+          #
+          # @note 章月 248057 = 29-4457
+          #
           # @return [Cycle::LunarRemainder] 弦（1分=100秒）
           QUARTER = Cycle::LunarRemainder.new(day: 7, minute: 3214, second: 25)
         end

data/lib/zakuro/version/senmyou/cycle/remainder.rb

@@ -11,12 +11,7 @@ module Zakuro
     # :nodoc:
     module Cycle
       #
-      # Remainder 宣明暦の時刻情報（大余小余）
-      #
-      # * 「15日1835分5秒」のような形式で表される
-      # * 分は8400で一日に繰り上げる
-      # * 秒は基本的に1/8分で、8秒で1分に繰り上げる。ただし、月補正値は1分に100秒とするなど基数の変更がありえる
-      # * 十干十二支（60日）を上限とした「日時分秒」の情報で、日付（date）/時刻（time）と部分的に重なる概念
+      # Remainder 時刻情報（大余小余）
       #
       class Remainder < Calculation::Cycle::AbstractRemainder
         # @return [Integer] 分（1分=8秒）
@@ -34,6 +29,19 @@ module Zakuro
           super(base_day: Const::Number::Cycle::DAY, base_mitune: MINUTE,
                 day: day, minute: minute, second: second, total: total)
         end
+
+        #
+        # 特定の文字フォーマットにして出力する
+        #
+        # @param [String] form フォーマット（大余、小余、秒それぞれを%dで指定する）
+        #
+        # @return [String] フォーマットした結果
+        #
+        def format(form: '%d-%d')
+          return '' if invalid?
+
+          super(form, @day, @minute, @second)
+        end
       end
 
       #
@@ -55,6 +63,19 @@ module Zakuro
           super(base_day: Const::Number::Cycle::DAY, base_mitune: MINUTE,
                 day: day, minute: minute, second: second, total: total)
         end
+
+        #
+        # 特定の文字フォーマットにして出力する
+        #
+        # @param [String] form フォーマット（大余、小余、秒それぞれを%dで指定する）
+        #
+        # @return [String] フォーマットした結果
+        #
+        def format(form: '%d-%d')
+          return '' if invalid?
+
+          super(form, @day, @minute, @second)
+        end
       end
     end
   end

data/lib/zakuro/version/senmyou/cycle/solar_term.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 require_relative '../../../calculation/cycle/abstract_solar_term'
+
+require_relative '../const/remainder'
+
 require_relative './remainder'
 
 # :nodoc:
@@ -14,7 +17,7 @@ module Zakuro
       #
       class SolarTerm < Calculation::Cycle::AbstractSolarTerm
         # @return [Remainder] 気策（24分の1年）
-        SOLAR_TERM_AVERAGE = Remainder.new(day: 15, minute: 1835, second: 5)
+        SOLAR_TERM_AVERAGE = Const::Remainder::Solar::SOLAR_TERM_AVERAGE
 
         #
         # 初期化

data/lib/zakuro/version/senmyou/monthly/lunar_phase.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../../output/logger'
+require_relative '../../../calculation/monthly/abstract_lunar_phase'
 
 require_relative '../const/remainder'
 
@@ -21,108 +21,32 @@ module Zakuro
       #
       # LunarPhase 月の位相
       #
-      class LunarPhase
+      class LunarPhase < Calculation::Monthly::AbstractLunarPhase
         # @return [Cycle::Remainder] 弦
         QUARTER = Const::Remainder::Solar::QUARTER
 
-        # @return [Output::Logger] ロガー
-        LOGGER = Output::Logger.new(location: 'lunar_phase')
-
-        # @return [Array<String>] 月内の弦
-        PHASE_INDEXES = %w[朔日 上弦 望月 下弦].freeze
-
-        # @return [Remainder]] 経
-        attr_reader :average_remainder
-        # @return [SolarTerm] 二十四節気（入定気）
-        attr_reader :solar_term
-        # @return [Integer] 弦
-        attr_reader :phase_index
-
         #
         # 初期化
         #
         # @param [Integer] western_year 西暦年
         #
         def initialize(western_year:)
-          # 経
-          @average_remainder = Origin::AverageNovember.get(western_year: western_year)
           # 天正閏余
           lunar_age = Origin::LunarAge.get(western_year: western_year)
-          # 入定気
-          @solar_location = Solar::Location.new(lunar_age: lunar_age)
-          # 入暦
-          @lunar_location = Lunar::Location.new(
-            western_year: western_year,
-            lunar_age: Cycle::LunarRemainder.new(total: 0).add!(lunar_age)
-          )
-
-          # 弦
-          @phase_index = 0
-        end
-
-        #
-        # 次の弦に進める
-        #
-        # @return [Remainder] 定朔
-        #
-        def next_phase
-          adjusted = current_remainder
-
-          add_quarter_moon_size
 
-          adjusted
-        end
-
-        #
-        # 次の月に進める
-        # @note 進めた後の月の定朔ではなく、当月のものを返却する
-        #
-        # @return [Remainder] 当月初の定朔
-        #
-        def next_month
-          result = nil
-          PHASE_INDEXES.each_with_index do |_phase, index|
-            adjust = next_phase
-            result = adjust if index.zero?
-          end
-
-          result
+          super(
+            quater: QUARTER,
+            average_remainder: Origin::AverageNovember.get(western_year: western_year),
+            solar_location: Solar::Location.new(lunar_age: lunar_age),
+            lunar_location: Lunar::Location.new(
+              western_year: western_year,
+              lunar_age: Cycle::LunarRemainder.new(total: 0).add!(lunar_age)
+            )
+          )
         end
 
         private
 
-        #
-        # 次の弦に進める
-        #
-        # @return [Integer] 弦
-        #
-        def next_phase_index
-          @phase_index += 1
-          @phase_index = 0 if @phase_index >= PHASE_INDEXES.size
-          @phase_index
-        end
-
-        #
-        # 朔月（月初）であるか
-        #
-        # @return [True] 朔月である
-        # @return [False] 朔月ではない
-        #
-        def first_phase?
-          @phase_index.zero?
-        end
-
-        #
-        # 朔月のみログ出力する
-        #
-        # @param [String] messages メッセージ（可変長）
-        #
-        def debug(*messages)
-          return unless first_phase?
-
-          LOGGER.debug(*messages)
-        end
-
         # :reek:TooManyStatements { max_statements: 6 }
 
         #
@@ -144,22 +68,6 @@ module Zakuro
           adjusted
         end
 
-        #
-        # 補正値を得る
-        #
-        # @return [Integer] 補正値
-        #
-        def correction_value
-          sun = correction_solar_value
-          moon = correction_moon_value
-
-          sum = sun + moon
-
-          debug("sun: #{sun}", "moon: #{moon}", "sun + moon : #{sum}")
-
-          sum
-        end
-
         #
         # 太陽運動の補正値を得る
         #
@@ -183,7 +91,7 @@ module Zakuro
         def correction_moon_value
           @lunar_location.run
 
-          remainder = @lunar_location.remainder
+          remainder = @lunar_location.adjusted_remainder
           forward = @lunar_location.forward
 
           debug("[lunar]remainder.format: #{remainder.format}")
@@ -191,14 +99,6 @@ module Zakuro
 
           Lunar::Value.get(remainder: remainder, forward: forward)
         end
-
-        def add_quarter_moon_size
-          @average_remainder.add!(QUARTER)
-          @solar_location.add_quarter
-          @lunar_location.add_quarter
-
-          next_phase_index
-        end
       end
     end
   end

data/lib/zakuro/version/senmyou/range/annual_range.rb

@@ -1,17 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../../output/logger'
-require_relative '../cycle/remainder'
-require_relative '../cycle/solar_term'
-require_relative '../../../calculation/monthly/initialized_month'
+require_relative '../../../calculation/range/medieval_annual_range'
 require_relative '../monthly/lunar_phase'
-require_relative '../stella/lunar/location'
-require_relative '../stella/lunar/value'
 require_relative '../stella/solar/average'
-require_relative '../stella/solar/location'
-require_relative '../stella/solar/value'
-require_relative '../stella/origin/lunar_age'
-require_relative '../stella/origin/average_november'
 
 # :nodoc:
 module Zakuro
@@ -23,11 +14,6 @@ module Zakuro
       # AnnualRange 年間範囲
       #
       module AnnualRange
-        # @return [Output::Logger] ロガー
-        LOGGER = Output::Logger.new(location: 'annual_range')
-
-        # :reek:TooManyStatements { max_statements: 6 }
-
         #
         # 一覧取得する
         #
@@ -40,71 +26,13 @@ module Zakuro
         # @return [Array<Month>] 1年データ
         #
         def self.get(context:, western_year:)
-          annual_range = initialized_annual_range(context: context, western_year: western_year)
-
-          apply_big_and_small_of_the_month(annual_range: annual_range)
-
-          solar_average = Solar::Average.new(western_year: western_year)
-          solar_average.set(annual_range: annual_range)
-
-          # 月間隔を取得するためだけの末尾要素を削除
-          annual_range.pop
-
-          initialize_month_label(annual_range: annual_range)
-        end
-
-        #
-        # 1年データを取得する
-        #
-        # @param [Context] context 暦コンテキスト
-        # @param [Integer] western_year 西暦年
-        #
-        # @return [Array<Month>] 1年データ
-        #
-        def self.initialized_annual_range(context:, western_year:)
-          result = []
           lunar_phase = Monthly::LunarPhase.new(western_year: western_year)
+          solar_average = Solar::Average.new(western_year: western_year)
 
-          # 14ヶ月分を生成する（閏年で最大13ヶ月 + 末月の大小/二十四節気を求めるために必要な月）
-          (0..13).each do |_index|
-            adjusted = lunar_phase.next_month
-
-            result.push(
-              Calculation::Monthly::InitializedMonth.new(
-                context: context,
-                month_label: Calculation::Monthly::MonthLabel.new,
-                first_day: Calculation::Monthly::FirstDay.new(remainder: adjusted),
-                phase_index: 0
-              )
-            )
-          end
-
-          result
-        end
-        private_class_method :initialized_annual_range
-
-        #
-        # 1年データの各月に月の大小を設定する
-        #
-        # @param [Array<Month>] annual_range 1年データ
-        #
-        def self.apply_big_and_small_of_the_month(annual_range:)
-          # NOTE: 最後の月は処理できない（=計算外の余分な月が最後に必要である）
-          annual_range.each_cons(2) do |(current_month, next_month)|
-            current_month.eval_many_days(next_month_day: next_month.remainder.day)
-          end
-        end
-        private_class_method :apply_big_and_small_of_the_month
-
-        #
-        # 月表示情報を更新する
-        #
-        # @param [Array<Month>] annual_range 1年データ
-        #
-        def self.initialize_month_label(annual_range:)
-          annual_range.each(&:rename_month_label_by_solar_term)
+          Calculation::Range::MedievalAnnualRange.get(
+            context: context, lunar_phase: lunar_phase, solar_average: solar_average
+          )
         end
-        private_class_method :initialize_month_label
       end
     end
   end

data/lib/zakuro/version/senmyou/stella/lunar/localization.rb

@@ -12,7 +12,7 @@ module Zakuro
       # Localization 入暦特定
       #
       module Localization
-        # @return [Integer] 1近日点
+        # @return [Integer] 1近点月
         ANOMALISTIC_MONTH = Const::Number::Cycle::ANOMALISTIC_MONTH
         # @return [Integer] 積年
         TOTAL_YEAR = Const::Number::Stack::TOTAL_YEAR
@@ -34,8 +34,7 @@ module Zakuro
           total_year = TOTAL_YEAR + western_year - BEGIN_YEAR
 
           # 通積分 - 天正閏余
-          total_day = \
-            total_year * YEAR - lunar_age.to_minute
+          total_day = total_year * YEAR - lunar_age.to_minute
 
           Cycle::LunarRemainder.new(total: (total_day % ANOMALISTIC_MONTH))
         end

data/lib/zakuro/version/senmyou/stella/lunar/location.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../../../../calculation/stella/lunar/abstract_location'
+
 require_relative '../../const/remainder'
 
 require_relative './localization'
@@ -13,38 +15,26 @@ module Zakuro
       #
       # Location 入暦
       #
-      class Location
-        # @return [Cycle::LunarRemainder] 暦中日
+      class Location < Calculation::Lunar::AbstractLocation
+        # @return [Cycle::LunarRemainder] 暦中日（1近点月の半分）
         HALF_ANOMALISTIC_MONTH = Const::Remainder::Lunar::HALF_ANOMALISTIC_MONTH
-        # @return [Cycle::LunarRemainder] 入暦上限
-        LIMIT = Const::Remainder::Lunar::LIMIT
         # @return [Cycle::LunarRemainder] 弦
         QUARTER = Const::Remainder::Lunar::QUARTER
 
-        # @return [True] 計算済み（前回計算あり）
-        # @return [False] 未計算（初回計算）
-        attr_reader :calculated
-        # @return [Integer] 西暦年
-        attr_reader :western_year
-        # @return [True] 進（遠地点より数える）
-        # @return [False] 退（近地点より数える）
+        # @return [True] 進
+        # @return [False] 退
         attr_reader :forward
-        # @return [Cycle::LunarRemainder] 大余小余（初回：昨年天正閏余）
-        attr_reader :remainder
 
         #
         # 初期化
         #
         # @param [Cycle::LunarRemainder] lunar_age 天正閏余（大余小余）
         # @param [Integer] western_year 西暦年
-        # @param [True, False] forward 進（遠地点より数える）/退（近地点より数える）
         #
         def initialize(lunar_age:, western_year:)
-          @calculated = false
-          @western_year = western_year
+          super(lunar_age: lunar_age, western_year: western_year)
           # 進
           @forward = true
-          @remainder = lunar_age
         end
 
         #
@@ -52,8 +42,7 @@ module Zakuro
         #
         def run
           if calculated
-            # 1始まりで計算しているので、入暦上限を用いる
-            decrease(limit: LIMIT)
+            decrease(limit: HALF_ANOMALISTIC_MONTH)
             return
           end
 
@@ -64,7 +53,7 @@ module Zakuro
         # 弦の分だけ月地点を進める
         #
         def add_quarter
-          @remainder.add!(QUARTER)
+          remainder.add!(QUARTER)
         end
 
         private
@@ -74,12 +63,9 @@ module Zakuro
         #
         def first
           @remainder = Localization.first_remainder(
-            lunar_age: @remainder, western_year: @western_year
+            lunar_age: remainder, western_year: western_year
           )
-          # 初回は0始まりで計算しているので、暦中日を用いる
           decrease(limit: HALF_ANOMALISTIC_MONTH)
-          # 1始まりに改める
-          one_based
 
           @calculated = true
         end
@@ -90,17 +76,10 @@ module Zakuro
         # @param [Cycle::LunarRemainder] limit 上限
         #
         def decrease(limit:)
-          return if @remainder < limit
-
-          @remainder.sub!(HALF_ANOMALISTIC_MONTH)
-          @forward = !@forward
-        end
+          return if remainder < limit
 
-        #
-        # 1始まりにする
-        #
-        def one_based
-          @remainder.add!(Cycle::Remainder.new(day: 1, minute: 0, second: 0))
+          remainder.sub!(limit)
+          @forward = !forward
         end
       end
     end

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../../../../calculation/stella/lunar/choukei_value'
+
 require_relative '../../cycle/remainder'
 
 require_relative './adjustment'
@@ -27,19 +29,20 @@ module Zakuro
         def self.get(remainder:, forward:)
           valid?(remainder: remainder)
 
-          day = remainder.day
-          minute = remainder.floor_minute
+          day, minute = Calculation::Lunar::ChoukeiValue.remainder_without_second(
+            remainder: remainder
+          )
 
           # 引き当て
           row = Adjustment.specify(forward: forward, day: day, minute: minute)
 
           value = row.value
-          denominator = row.denominator
 
           minus_minute = Adjustment.minus_minute(day: day, minute: minute)
 
-          day = calc_day(per: value.per, denominator: denominator,
-                         minute: minus_minute)
+          day = Calculation::Lunar::ChoukeiValue.rounded_day(
+            per: value.per, denominator: row.denominator, minute: minus_minute
+          )
 
           value.stack + day
         end
@@ -58,31 +61,6 @@ module Zakuro
           raise ArgumentError, "unmatch parameter type: #{remainder.class}"
         end
         private_class_method :valid?
-
-        # :reek:TooManyStatements { max_statements: 9 }
-
-        #
-        # 累計値（大余）を作成する
-        #
-        # @param [Integer] per 入暦（1-14）
-        # @param [Integer] denominator 小余の分母
-        # @param [Integer] minute 小余
-        #
-        # @return [Integer] 累計値（大余）
-        #
-        def self.calc_day(per:, denominator:, minute:)
-          remainder_minute = (per * minute).to_f
-          day = remainder_minute / denominator
-          # 切り捨て（プラスマイナスに関わらず小数点以下切り捨て）
-          day = day.negative? ? day.ceil : day.floor
-          sign = remainder_minute.negative? ? -1 : 1
-          remainder_day = (sign * remainder_minute) % denominator
-          # 四捨五入（8400ならその半分の4200以上を繰り上げる）
-          day += sign if remainder_day >= (denominator / 2)
-
-          day
-        end
-        private_class_method :calc_day
       end
     end
   end