zakuro 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b346e15da34df44ce5692780edbd4b73a46161f8ab9c52a0a3b5e11708f60c9
-  data.tar.gz: 664d457a7e3a5a271073633bba9d2b85c94c1edc35d2ceaa5a0649d10c628202
+  metadata.gz: a5bbb00f73830eff0f9e912c0fa0c10d49d7849b3f46395c19de8ec1f71f8012
+  data.tar.gz: e95b80813e7ce382e0c5fce6a62382d3c26383db6f0b7e64e82bd1f005a6f15c
 SHA512:
-  metadata.gz: 95779bea84d41f42027b8974742a924050c9b668f258a116d564b94991987ff5ac81554a6d8e518f8d7cc2bcd018eb9f082df6a997819d43fa475bfd3cd6f1bd
-  data.tar.gz: 4624affe06f638a930c36f80c357deb8ce311af730a67e2a296491efab1b3c648e3a5f5473b3f5fbfd6e9e088644bc7a29741204a9aac71517d1b4aef2dc3568
+  metadata.gz: a3bb973f87a0bb6e3d3caffca76e9cc57cf5748e16bb3e9f87b3e9ffe2307682646aa08077ad6685a04ec282d255aa0f3ecf5992d2595f89bcd00b364aa22f45
+  data.tar.gz: f85ca93529ec87eb15e97f2564509429b95d8433c22d3141bdef26fa79154689030d9552ca38e8e81812289d5adf272b8445e510a21967cd9b517c805e6956a5

data/lib/zakuro/calculation/cycle/abstract_remainder.rb

@@ -331,6 +331,18 @@ module Zakuro
           @day * @base_day + @minute
         end
 
+        #
+        # 小余（秒切り捨て）を返す
+        #
+        # @note 切り捨て前に繰り上げる
+        #
+        # @return [Integer] 小余（秒切り捨て）
+        #
+        def floor_minute
+          result = @minute + @second / @base_minute
+          result.floor
+        end
+
         #
         # 大余に四捨五入した結果を返す（秒は除外する）
         #

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

@@ -111,7 +111,7 @@ module Zakuro
           years = []
           ((oldest_date.year)..(newest_date.year + 2)).each do |year|
             years.push(
-              annual_range.collect_annual_range_after_last_november_1st(
+              annual_range.get(
                 context: @context, western_year: year
               )
             )

data/lib/zakuro/version.rb

@@ -3,5 +3,5 @@
 # :nodoc:
 module Zakuro
   # @return [String] library version
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Senmyou
+    #
+    # Const 定数
+    #
+    module Const
+      #
+      # Number 数値
+      #
+      module Number
+        #
+        # Cycle 周期
+        #
+        module Cycle
+          # @return [Integer] 統法（1日=8400分）
+          DAY = 8400
+          # @return [Integer] 暦周（1近日点）
+          ANOMALISTIC_MONTH = 231_458.19
+          # @return [Integer] 朔望月
+          SYNODIC_MONTH = 248_057
+          # @return [Integer] 一年
+          YEAR = 3_068_055
+        end
+
+        #
+        # Derivation 導出
+        #
+        module Derivation
+          # @return [Integer] 通余:  (YEAR - DAY * 12 * 30)  = 44055
+          REMAINDER_ALL_YEAR = 44_055
+          # @return [Integer] 旬周（60日） DAY * 60
+          SIXTY_DAYS = 504_000
+        end
+
+        #
+        # 累積
+        #
+        module Stack
+          # @return [Integer] 積年（甲子夜半朔旦冬至〜暦の開始前）
+          TOTAL_YEAR = 7_070_138
+          # @return [Integer] 暦の開始年（長慶2年）
+          BEGIN_YEAR = 822
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative '../cycle/remainder'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Senmyou
+    #
+    # Const 定数
+    #
+    module Const
+      #
+      # Remainder 大余小余
+      #
+      module Remainder
+        #
+        # Solar 太陽
+        #
+        module Solar
+          # @return [Cycle::Remainder] 気策（24分の1年）
+          SOLAR_TERM_AVERAGE = Cycle::Remainder.new(day: 15, minute: 1835, second: 5)
+          # @return [Cycle::Remainder] 弦（1分=8秒）
+          QUARTER = Cycle::Remainder.new(day: 7, minute: 3214, second: 2)
+        end
+
+        #
+        # Lunar 月
+        #
+        module Lunar
+          # @return [Cycle::LunarRemainder] 暦中日
+          # @note ANOMALISTIC_MONTH の半分に相当する
+          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)
+          # @return [Cycle::LunarRemainder] 弦（1分=100秒）
+          QUARTER = Cycle::LunarRemainder.new(day: 7, minute: 3214, second: 25)
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,8 @@
 
 require_relative '../../../calculation/cycle/abstract_remainder'
 
+require_relative '../const/number'
+
 # :nodoc:
 module Zakuro
   # :nodoc:
@@ -17,8 +19,6 @@ module Zakuro
       # * 十干十二支（60日）を上限とした「日時分秒」の情報で、日付（date）/時刻（time）と部分的に重なる概念
       #
       class Remainder < Calculation::Cycle::AbstractRemainder
-        # @return [Integer] 統法（1日=8400分）
-        DAY = 8400
         # @return [Integer] 分（1分=8秒）
         MINUTE = 8
 
@@ -31,7 +31,7 @@ module Zakuro
         # @param [Integer] total 繰り上げなしの小余
         #
         def initialize(day: -1, minute: -1, second: -1, total: -1)
-          super(base_day: DAY, base_mitune: MINUTE,
+          super(base_day: Const::Number::Cycle::DAY, base_mitune: MINUTE,
                 day: day, minute: minute, second: second, total: total)
         end
       end
@@ -40,8 +40,6 @@ module Zakuro
       # LunarRemainder 月の位相計算向け時刻情報（大余小余）
       #
       class LunarRemainder < Calculation::Cycle::AbstractRemainder
-        # @return [Integer] 統法（1日=8400分）
-        DAY = 8400
         # @return [Integer] 分（1分=100秒）
         MINUTE = 100
 
@@ -54,7 +52,7 @@ module Zakuro
         # @param [Integer] total 繰り上げなしの小余
         #
         def initialize(day: -1, minute: -1, second: -1, total: -1)
-          super(base_day: DAY, base_mitune: MINUTE,
+          super(base_day: Const::Number::Cycle::DAY, base_mitune: MINUTE,
                 day: day, minute: minute, second: second, total: total)
         end
       end

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

@@ -2,7 +2,15 @@
 
 require_relative '../../../output/logger'
 
-require_relative '../stella/winter_solstice'
+require_relative '../const/remainder'
+
+require_relative '../stella/solar/location'
+require_relative '../stella/solar/value'
+require_relative '../stella/lunar/location'
+require_relative '../stella/lunar/value'
+
+require_relative '../stella/origin/lunar_age'
+require_relative '../stella/origin/average_november'
 
 # :nodoc:
 module Zakuro
@@ -10,21 +18,12 @@ module Zakuro
   module Senmyou
     # :nodoc:
     module Monthly
-      # :reek:TooManyInstanceVariables { max_instance_variables: 7 }
-
       #
       # LunarPhase 月の位相
       #
       class LunarPhase
-        #
-        # QuarterMoon 弦
-        #
-        module QuarterMoon
-          # @return [Remainder] 弦（1分=8秒）
-          DEFAULT = Cycle::Remainder.new(day: 7, minute: 3214, second: 2)
-          # @return [Remainder] 弦（1分=100秒）
-          BASE_HUNDRED = Cycle::LunarRemainder.new(day: 7, minute: 3214, second: 25)
-        end
+        # @return [Cycle::Remainder] 弦
+        QUARTER = Const::Remainder::Solar::QUARTER
 
         # @return [Output::Logger] ロガー
         LOGGER = Output::Logger.new(location: 'lunar_phase')
@@ -32,20 +31,10 @@ module Zakuro
         # @return [Array<String>] 月内の弦
         PHASE_INDEXES = %w[朔日 上弦 望月 下弦].freeze
 
-        # @return [Integer] 西暦年
-        attr_reader :western_year
         # @return [Remainder]] 経
         attr_reader :average_remainder
-        # @return [True] 初回計算
-        # @return [False] 次回以降計算
-        attr_reader :first
         # @return [SolarTerm] 二十四節気（入定気）
         attr_reader :solar_term
-        # @return [Remainder] 入暦
-        attr_reader :moon_remainder
-        # @return [True] 進（遠地点より数える）
-        # @return [False] 退（近地点より数える）
-        attr_reader :is_forward
         # @return [Integer] 弦
         attr_reader :phase_index
 
@@ -55,21 +44,17 @@ module Zakuro
         # @param [Integer] western_year 西暦年
         #
         def initialize(western_year:)
-          @western_year = western_year
           # 経
-          @average_remainder = WinterSolstice.calc_averaged_last_november_1st(
-            western_year: @western_year
-          )
+          @average_remainder = Origin::AverageNovember.get(western_year: western_year)
           # 天正閏余
-          winter_solstice_age = \
-            WinterSolstice.calc_moon_age(western_year: @western_year)
+          lunar_age = Origin::LunarAge.get(western_year: western_year)
           # 入定気
-          @solar_term = Cycle::SolarTerm.new(remainder: winter_solstice_age)
+          @solar_location = Solar::Location.new(lunar_age: lunar_age)
           # 入暦
-          @moon_remainder = Cycle::LunarRemainder.new(total: 0).add!(winter_solstice_age)
-
-          @is_forward = false
-          @first = true
+          @lunar_location = Lunar::Location.new(
+            western_year: western_year,
+            lunar_age: Cycle::LunarRemainder.new(total: 0).add!(lunar_age)
+          )
 
           # 弦
           @phase_index = 0
@@ -83,8 +68,6 @@ module Zakuro
         def next_phase
           adjusted = current_remainder
 
-          @first = false if @first
-
           add_quarter_moon_size
 
           adjusted
@@ -120,7 +103,7 @@ module Zakuro
         end
 
         #
-        # 朔月（月初）かを確認する
+        # 朔月（月初）であるか
         #
         # @return [True] 朔月である
         # @return [False] 朔月ではない
@@ -183,38 +166,36 @@ module Zakuro
         # @return [Integer] 太陽運動の補正値
         #
         def correction_solar_value
-          @solar_term = SolarLocation.get(
-            solar_term: @solar_term
-          )
-          debug("@solar_term.remainder: #{@solar_term.remainder.format(form: '%d-%d.%d')}")
-          debug("@solar_term.index: #{@solar_term.index}")
+          @solar_location.run
+          debug("@solar_term.remainder: #{@solar_location.remainder.format(form: '%d-%d.%d')}")
+          debug("@solar_term.index: #{@solar_location.index}")
 
-          SolarOrbit.calc_sun_orbit_value(solar_term: @solar_term)
+          Solar::Value.get(solar_location: @solar_location)
         end
 
+        # :reek:TooManyStatements { max_statements: 6 }
+
         #
         # 月運動の補正値を得る
         #
         # @return [Integer] 月運動の補正値
         #
         def correction_moon_value
-          @moon_remainder, @is_forward = \
-            LunarOrbit.calc_moon_point(remainder: @moon_remainder,
-                                       western_year: @western_year,
-                                       is_forward: @is_forward,
-                                       first: @first)
+          @lunar_location.run
+
+          remainder = @lunar_location.remainder
+          forward = @lunar_location.forward
 
-          debug("@moon_remainder.format: #{@moon_remainder.format}")
-          debug("@is_forward: #{@is_forward}")
+          debug("[lunar]remainder.format: #{remainder.format}")
+          debug("[lunar]forward: #{forward}")
 
-          LunarOrbit.calc_moon_orbit_value(remainder_month: @moon_remainder,
-                                           is_forward: @is_forward)
+          Lunar::Value.get(remainder: remainder, forward: forward)
         end
 
         def add_quarter_moon_size
-          @average_remainder.add!(QuarterMoon::DEFAULT)
-          @solar_term.remainder.add!(QuarterMoon::DEFAULT)
-          @moon_remainder.add!(QuarterMoon::BASE_HUNDRED)
+          @average_remainder.add!(QUARTER)
+          @solar_location.add_quarter
+          @lunar_location.add_quarter
 
           next_phase_index
         end

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

@@ -5,10 +5,13 @@ require_relative '../cycle/remainder'
 require_relative '../cycle/solar_term'
 require_relative '../../../calculation/monthly/initialized_month'
 require_relative '../monthly/lunar_phase'
-require_relative '../stella/solar_orbit'
-require_relative '../stella/solar_average'
-require_relative '../stella/solar_location'
-require_relative '../stella/lunar_orbit'
+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
@@ -25,37 +28,6 @@ module Zakuro
 
         # :reek:TooManyStatements { max_statements: 6 }
 
-        #
-        # 11月定朔（冬至が含まれる月の1日：補正済）を求める
-        #
-        # @param [Integer] western_year 西暦年
-        #
-        # @return [Remainder] 11月定朔
-        #
-        def self.calc_last_november_1st(western_year:)
-          # 天正閏余
-          winter_solstice_age = \
-            WinterSolstice.calc_moon_age(western_year: western_year)
-          # 11月経朔
-          november_1st = \
-            WinterSolstice.calc_averaged_last_november_1st(western_year: western_year)
-          # 11月定朔
-
-          # 補正
-          correction_value = correction_value_on_last_november_1st(
-            winter_solstice_age: winter_solstice_age,
-            western_year: western_year
-          )
-
-          result = november_1st.add(Cycle::Remainder.new(day: 0, minute: correction_value,
-                                                         second: 0))
-          # 進朔
-          result.up_on_new_moon!
-          result
-        end
-
-        # :reek:TooManyStatements { max_statements: 6 }
-
         #
         # 一覧取得する
         #
@@ -67,12 +39,12 @@ module Zakuro
         #
         # @return [Array<Month>] 1年データ
         #
-        def self.collect_annual_range_after_last_november_1st(context:, western_year:)
+        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 = SolarAverage.new(western_year: western_year)
+          solar_average = Solar::Average.new(western_year: western_year)
           solar_average.set(annual_range: annual_range)
 
           # 月間隔を取得するためだけの末尾要素を削除
@@ -81,34 +53,6 @@ module Zakuro
           initialize_month_label(annual_range: annual_range)
         end
 
-        #
-        # 11月定朔の補正値を求める
-        #
-        # @param [Remainder] winter_solstice_age 天正閏余
-        # @param [Integer] western_year 西暦年
-        #
-        # @return [Integer] 補正値
-        #
-        def self.correction_value_on_last_november_1st(winter_solstice_age:, western_year:)
-          # 補正
-          solar_term = Cycle::SolarTerm.new(
-            remainder: winter_solstice_age
-          )
-          solar_term = \
-            SolarLocation.get(
-              solar_term: solar_term
-            )
-
-          moon_remainder, is_forward = LunarOrbit.calc_moon_point(
-            remainder: winter_solstice_age, western_year: western_year
-          )
-
-          SolarOrbit.calc_sun_orbit_value(solar_term: solar_term) +
-            LunarOrbit.calc_moon_orbit_value(remainder_month: moon_remainder,
-                                             is_forward: is_forward)
-        end
-        private_class_method :correction_value_on_last_november_1st
-
         #
         # 1年データを取得する
         #