zakuro 0.1.0 → 0.1.5

data/lib/zakuro/result/operation.rb

@@ -17,7 +17,7 @@ module Zakuro
         # @return [True] 運用あり
         # @return [False] 運用なし
         attr_reader :operated
-        # @return [Month] 月別履歴情報
+        # @return [Month::Bundle] 月別履歴情報
         attr_reader :month
         # @return [Data::SingleDay] 計算値
         attr_reader :original
@@ -26,7 +26,7 @@ module Zakuro
         # 初期化
         #
         # @param [True, False] operated 運用有無
-        # @param [Month] month 月別履歴情報
+        # @param [Month::Bundle] month 月別履歴情報
         # @param [Data::SingleDay] original 計算値
         #
         def initialize(operated:, month:, original:)
@@ -37,48 +37,76 @@ module Zakuro
       end
 
       #
-      # Month 月別履歴情報
+      # Month 運用情報（月）
       #
-      class Month
-        # @return [Integer] 原文頁数
-        attr_reader :page
-        # @return [Integer] 原文注釈番号
-        attr_reader :number
-        # @return [Array<Zakuro::Result::Operation::Annotation>] 注釈
-        attr_reader :annotations
-
-        #
-        # 初期化
+      module Month
         #
-        # @param [Integer] page 原文頁数
-        # @param [Integer] number 原文注釈番号
-        # @param [Array<Zakuro::Result::Operation::Annotation>] annotations 注釈
+        # Bundle 月履歴集約情報
         #
-        def initialize(page: -1, number: -1, annotations: [])
-          @page = page
-          @number = number
-          @annotations = annotations
-        end
-      end
+        class Bundle
+          # @return [History] 月別履歴情報（当月）
+          attr_reader :current
+          # @return [History] 月別履歴情報（影響を与えた月）
+          attr_reader :parent
 
-      #
-      # Annotation 注釈
-      #
-      class Annotation
-        # @return [String] 注釈内容
-        attr_reader :description
-        # @return [String] 注釈補記
-        attr_reader :note
+          def initialize(current: History.new, parent: History.new)
+            @current = current
+            @parent = parent
+          end
+        end
 
         #
-        # 初期化
+        # History 月別履歴情報
         #
-        # @param [String] description 注釈内容
-        # @param [<Type>] note 注釈補記
+        class History
+          # @return [String] ID
+          attr_reader :id
+          # @return [String] 月初日の西暦日
+          attr_reader :western_date
+          # @return [Integer] 原文頁数
+          attr_reader :page
+          # @return [Integer] 原文注釈番号
+          attr_reader :number
+          # @return [Array<Zakuro::Result::Operation::Annotation>] 注釈
+          attr_reader :annotations
+
+          #
+          # 初期化
+          #
+          # @param [String] id ID
+          # @param [String] western_date 月初日の西暦日
+          # @param [Integer] page 原文頁数
+          # @param [Integer] number 原文注釈番号
+          # @param [Array<Annotation>] annotations 注釈
+          #
+          def initialize(id: '', western_date: '', page: -1, number: -1, annotations: [])
+            @id = id
+            @western_date = western_date
+            @page = page
+            @number = number
+            @annotations = annotations
+          end
+        end
+
+        #
+        # Annotation 注釈
         #
-        def initialize(description:, note:)
-          @description = description
-          @note = note
+        class Annotation
+          # @return [String] 注釈内容
+          attr_reader :description
+          # @return [String] 注釈補記
+          attr_reader :note
+
+          #
+          # 初期化
+          #
+          # @param [String] description 注釈内容
+          # @param [<Type>] note 注釈補記
+          #
+          def initialize(description:, note:)
+            @description = description
+            @note = note
+          end
         end
       end
     end

data/lib/zakuro/tools/stringifier.rb

@@ -31,7 +31,7 @@ module Zakuro
         hash
       end
 
-      # :reek:TooManyStatements { max_statements: 7 } and :reek:NilCheck
+      # :reek:TooManyStatements { max_statements: 7 }
 
       #
       # 対象インスタンスをハッシュ化する（再帰処理）
@@ -42,7 +42,7 @@ module Zakuro
       # @return [Hash<String, Objcet>] ハッシュ
       #
       def self.value_to_hash(obj:, class_prefix:, formatted:)
-        return obj if obj.nil?
+        return obj unless obj
 
         # 日付をフォーマットする
         return obj.format if formatted && Tools::Typeof.time?(obj: obj)

data/lib/zakuro/tools/typeof.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../cycle/abstract_remainder'
+require_relative '../calculation/cycle/abstract_remainder'
 require_relative '../era/western'
 
 # :nodoc:
@@ -24,7 +24,7 @@ module Zakuro
       def self.time?(obj:)
         return true if obj.is_a?(Western::Calendar)
 
-        return true if obj.is_a?(Cycle::AbstractRemainder)
+        return true if obj.is_a?(Calculation::Cycle::AbstractRemainder)
 
         false
       end

data/lib/zakuro/version.rb

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

data/lib/zakuro/version/abstract_version.rb

@@ -17,7 +17,7 @@ module Zakuro
     #
     # @param [Date] western_date 西暦日
     #
-    # @return [Result::SingleDay] 和暦日
+    # @return [Result::Single] 和暦日
     #
     # @raise [NotImplementedError] オーバーライドなし
     #

data/lib/zakuro/version/context.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative './version_class_resolver'
+
+# :nodoc:
+module Zakuro
+  #
+  # Context 暦コンテキスト
+  #
+  class Context
+    attr_reader :version_name
+    attr_reader :resolver
+
+    VERSION_NAMES = %w[Genka Gihou Taien Senmyou Joukyou Kansei Tenpou Gregorio].freeze
+
+    def initialize(version_name:)
+      raise ArgumentError.new, 'invalid version' unless VERSION_NAMES.include?(version_name)
+
+      @version_name = version_name
+      @resolver = VersionClassResolver.new(version_name: version_name)
+    end
+  end
+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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require_relative '../../../calculation/cycle/abstract_remainder'
+
+require_relative '../const/number'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Senmyou
+    # :nodoc:
+    module Cycle
+      #
+      # Remainder 宣明暦の時刻情報（大余小余）
+      #
+      # * 「15日1835分5秒」のような形式で表される
+      # * 分は8400で一日に繰り上げる
+      # * 秒は基本的に1/8分で、8秒で1分に繰り上げる。ただし、月補正値は1分に100秒とするなど基数の変更がありえる
+      # * 十干十二支（60日）を上限とした「日時分秒」の情報で、日付（date）/時刻（time）と部分的に重なる概念
+      #
+      class Remainder < Calculation::Cycle::AbstractRemainder
+        # @return [Integer] 分（1分=8秒）
+        MINUTE = 8
+
+        #
+        # 初期化
+        #
+        # @param [Integer] day 大余（"日"に相当）
+        # @param [Integer] minute 小余（"分"に相当）
+        # @param [Integer] second 秒
+        # @param [Integer] total 繰り上げなしの小余
+        #
+        def initialize(day: -1, minute: -1, second: -1, total: -1)
+          super(base_day: Const::Number::Cycle::DAY, base_mitune: MINUTE,
+                day: day, minute: minute, second: second, total: total)
+        end
+      end
+
+      #
+      # LunarRemainder 月の位相計算向け時刻情報（大余小余）
+      #
+      class LunarRemainder < Calculation::Cycle::AbstractRemainder
+        # @return [Integer] 分（1分=100秒）
+        MINUTE = 100
+
+        #
+        # 初期化
+        #
+        # @param [Integer] day 大余（"日"に相当）
+        # @param [Integer] minute 小余（"分"に相当）
+        # @param [Integer] second 秒
+        # @param [Integer] total 繰り上げなしの小余
+        #
+        def initialize(day: -1, minute: -1, second: -1, total: -1)
+          super(base_day: Const::Number::Cycle::DAY, base_mitune: MINUTE,
+                day: day, minute: minute, second: second, total: total)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative '../../../calculation/cycle/abstract_solar_term'
+require_relative './remainder'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Senmyou
+    # :nodoc:
+    module Cycle
+      #
+      # SolarTerm 二十四節気
+      #
+      class SolarTerm < Calculation::Cycle::AbstractSolarTerm
+        # @return [Remainder] 気策（24分の1年）
+        SOLAR_TERM_AVERAGE = Remainder.new(day: 15, minute: 1835, second: 5)
+
+        #
+        # 初期化
+        #
+        # @param [Integer] index 連番
+        # @param [Remainder] remainder 時刻情報（大余小余）
+        #
+        def initialize(index: -1, remainder: Remainder.new)
+          super(index: index, remainder: remainder, average: SOLAR_TERM_AVERAGE)
+        end
+      end
+    end
+  end
+end

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

@@ -2,218 +2,203 @@
 
 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
   # :nodoc:
   module Senmyou
-    # :reek:TooManyStatements { max_statements: 7 }
-    # :reek:TooManyInstanceVariables { max_instance_variables: 7 }
+    # :nodoc:
+    module Monthly
+      #
+      # LunarPhase 月の位相
+      #
+      class LunarPhase
+        # @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
 
-    #
-    # LunarPhase 月の位相
-    #
-    class LunarPhase
-      #
-      # QuarterMoon 弦
-      #
-      module QuarterMoon
-        # @return [Remainder] 弦（1分=8秒）
-        DEFAULT = Remainder.new(day: 7, minute: 3214, second: 2)
-        # @return [Remainder] 弦（1分=100秒）
-        BASE_HUNDRED = LunarRemainder.new(day: 7, minute: 3214, second: 25)
-      end
+        #
+        # 次の弦に進める
+        #
+        # @return [Remainder] 定朔
+        #
+        def next_phase
+          adjusted = current_remainder
 
-      # @return [Logger] ロガー
-      LOGGER = Logger.new(location: 'lunar_phase')
-
-      # @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
+          add_quarter_moon_size
 
-      #
-      # 初期化
-      #
-      # @param [Integer] western_year 西暦年
-      #
-      def initialize(western_year:)
-        @western_year = western_year
-        # 経
-        @average_remainder = WinterSolstice.calc_averaged_last_november_1st(
-          western_year: @western_year
-        )
-        # 天正冬至
-        winter_solstice_age = \
-          WinterSolstice.calc_moon_age(western_year: @western_year)
-        # 入定気
-        @solar_term = SolarTerm.new(remainder: winter_solstice_age)
-        # 入暦
-        @moon_remainder = LunarRemainder.new(total: 0).add!(winter_solstice_age)
-
-        @is_forward = false
-        @first = true
-
-        # 弦
-        @phase_index = 0
-      end
+          adjusted
+        end
 
-      #
-      # 次の弦に進める
-      #
-      # @return [Remainder] 定朔
-      #
-      def next_phase
-        adjusted = current_remainder
+        #
+        # 次の月に進める
+        # @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
+        end
 
-        @first = false if @first
+        private
+
+        #
+        # 次の弦に進める
+        #
+        # @return [Integer] 弦
+        #
+        def next_phase_index
+          @phase_index += 1
+          @phase_index = 0 if @phase_index >= PHASE_INDEXES.size
+          @phase_index
+        end
 
-        add_quarter_moon_size
+        #
+        # 朔月（月初）であるか
+        #
+        # @return [True] 朔月である
+        # @return [False] 朔月ではない
+        #
+        def first_phase?
+          @phase_index.zero?
+        end
 
-        adjusted
-      end
+        #
+        # 朔月のみログ出力する
+        #
+        # @param [String] messages メッセージ（可変長）
+        #
+        def debug(*messages)
+          return unless first_phase?
 
-      #
-      # 次の月に進める
-      # @note 進めた後の月の定朔ではなく、当月のものを返却する
-      #
-      # @return [Remainder] 当月初の定朔
-      #
-      def next_month
-        result = nil
-        PHASE_INDEXES.each_with_index do |_phase, index|
-          adjust = next_phase
-          result = adjust if index.zero?
+          LOGGER.debug(*messages)
         end
 
-        result
-      end
+        # :reek:TooManyStatements { max_statements: 6 }
 
-      private
+        #
+        # 現在の定朔を取得する
+        #
+        # @return [Remainder] 定朔
+        #
+        def current_remainder
+          debug("@average_remainder.format: #{@average_remainder.format}")
 
-      #
-      # 次の弦に進める
-      #
-      # @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
+          sum = correction_value
+          adjusted = @average_remainder.add(
+            Cycle::Remainder.new(day: 0, minute: sum, second: 0)
+          )
+          adjusted.up_on_new_moon!
 
-      #
-      # 朔月のみログ出力する
-      #
-      # @param [String] messages メッセージ（可変長）
-      #
-      def debug(*messages)
-        return unless first_phase?
+          debug("result: #{adjusted.format}")
 
-        LOGGER.debug(*messages)
-      end
+          adjusted
+        end
 
-      #
-      # 現在の定朔を取得する
-      #
-      # @return [Remainder] 定朔
-      #
-      def current_remainder
-        debug("@average_remainder.format: #{@average_remainder.format}")
+        #
+        # 補正値を得る
+        #
+        # @return [Integer] 補正値
+        #
+        def correction_value
+          sun = correction_solar_value
+          moon = correction_moon_value
 
-        sum = correction_value
-        adjusted = @average_remainder.add(
-          Remainder.new(day: 0, minute: sum, second: 0)
-        )
-        adjusted.up_on_new_moon!
+          sum = sun + moon
 
-        debug("result: #{adjusted.format}")
+          debug("sun: #{sun}", "moon: #{moon}", "sun + moon : #{sum}")
 
-        adjusted
-      end
+          sum
+        end
 
-      #
-      # 補正値を得る
-      #
-      # @return [Integer] 補正値
-      #
-      def correction_value
-        sun = correction_solar_value
-        moon = correction_moon_value
+        #
+        # 太陽運動の補正値を得る
+        #
+        # @return [Integer] 太陽運動の補正値
+        #
+        def correction_solar_value
+          @solar_location.run
+          debug("@solar_term.remainder: #{@solar_location.remainder.format(form: '%d-%d.%d')}")
+          debug("@solar_term.index: #{@solar_location.index}")
+
+          Solar::Value.get(solar_location: @solar_location)
+        end
 
-        sum = sun + moon
+        # :reek:TooManyStatements { max_statements: 6 }
 
-        debug("sun: #{sun}", "moon: #{moon}", "sun + moon : #{sum}")
+        #
+        # 月運動の補正値を得る
+        #
+        # @return [Integer] 月運動の補正値
+        #
+        def correction_moon_value
+          @lunar_location.run
 
-        sum
-      end
+          remainder = @lunar_location.remainder
+          forward = @lunar_location.forward
 
-      #
-      # 太陽運動の補正値を得る
-      #
-      # @return [Integer] 太陽運動の補正値
-      #
-      def correction_solar_value
-        @solar_term = SolarOrbit.calc_solar_term_by_remainder(
-          solar_term: @solar_term
-        )
-        debug("@solar_term.remainder: #{@solar_term.remainder.format(form: '%d-%d.%d')}")
-        debug("@solar_term.index: #{@solar_term.index}")
-
-        SolarOrbit.calc_sun_orbit_value(solar_term: @solar_term)
-      end
+          debug("[lunar]remainder.format: #{remainder.format}")
+          debug("[lunar]forward: #{forward}")
 
-      #
-      # 月運動の補正値を得る
-      #
-      # @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)
-
-        debug("@moon_remainder.format: #{@moon_remainder.format}")
-        debug("@is_forward: #{@is_forward}")
-
-        LunarOrbit.calc_moon_orbit_value(remainder_month: @moon_remainder,
-                                         is_forward: @is_forward)
-      end
+          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)
+        def add_quarter_moon_size
+          @average_remainder.add!(QUARTER)
+          @solar_location.add_quarter
+          @lunar_location.add_quarter
 
-        next_phase_index
+          next_phase_index
+        end
       end
     end
   end