zakuro 0.9.0 → 0.9.1

data/lib/zakuro/calculation/summary/internal/option.rb

@@ -3,8 +3,10 @@
 require_relative '../../../context/option'
 require_relative '../../../result/data/option/dropped_date/option'
 require_relative '../../../result/data/solar_term'
+require_relative '../../../result/data/option/vanished_date/option'
 
 require_relative '../../option/dropped_date/location'
+require_relative '../../option/vanished_date/location'
 
 # :nodoc:
 module Zakuro
@@ -26,6 +28,8 @@ module Zakuro
           # @return [Hash<String, Result::Data::Option::AbstractOption>] オプション結果
           #
           def create(month:, day:)
+            # TODO: refactor
+
             options = {}
             context = month.context
 
@@ -38,6 +42,15 @@ module Zakuro
               options[Context::Option::DROPPED_DATE_KEY] = option
             end
 
+            if context.option.vanished_date?
+              remainder = day.remainder
+              average_remainder = month.first_day.average_remainder
+              option = vanished_date(
+                context: context, remainder: remainder, average_remainder: average_remainder
+              )
+              options[Context::Option::VANISHED_DATE_KEY] = option
+            end
+
             options
           end
 
@@ -53,10 +66,7 @@ module Zakuro
           # @return [Result::Data::Option::DroppedDate::Option] 没日
           #
           def dropped_date(context:, remainder:, solar_terms:)
-            option = Result::Data::Option::DroppedDate::Option.new(
-              matched: false,
-              calculation: Result::Data::Option::DroppedDate::Calculation.new
-            )
+            option = Result::Data::Option::DroppedDate::Option.new
 
             return option if remainder.invalid?
 
@@ -94,6 +104,51 @@ module Zakuro
               )
             )
           end
+
+          #
+          # 滅日を求める
+          #
+          # @param [<Type>] context <description>
+          # @param [<Type>] remainder <description>
+          # @param [<Type>] average_remainder <description>
+          #
+          # @return [<Type>] <description>
+          #
+          def vanished_date(context:, remainder:, average_remainder:)
+            option = Result::Data::Option::VanishedDate::Option.new
+
+            return option if average_remainder.invalid?
+
+            location = Calculation::Option::VanishedDate::Location.new(
+              context: context, average_remainder: average_remainder
+            )
+
+            return option unless location.exist?
+
+            vanished_date = location.get
+
+            return option unless remainder.day == vanished_date.day
+
+            vanished_date_option(location: location)
+          end
+
+          #
+          # 滅日オプション値を生成する
+          #
+          # @param [Calculation::Option::DroppedDate::Location] location 滅日位置
+          #
+          # @return [Result::Data::Option::DroppedDate::Option] 滅日オプション値
+          #
+          def vanished_date_option(location:)
+            vanished_date = location.get
+            Result::Data::Option::VanishedDate::Option.new(
+              matched: true,
+              calculation: Result::Data::Option::VanishedDate::Calculation.new(
+                remainder: vanished_date.format,
+                average_remainder: location.average_remainder
+              )
+            )
+          end
         end
       end
     end

data/lib/zakuro/context/option.rb

@@ -16,6 +16,9 @@ module Zakuro
       # @return [String] 没日オプションキー名
       DROPPED_DATE_KEY = 'dropped_date'
 
+      # @return [String] 滅日オプションキー名
+      VANISHED_DATE_KEY = 'vanished_date'
+
       # @return [Hash<String, Object>] オプション値
       attr_reader :hash
       # @return [String] デフォルト暦名
@@ -82,6 +85,20 @@ module Zakuro
         false
       end
 
+      #
+      # 滅日か
+      #
+      # @return [True] 滅日あり
+      # @return [False] 滅日なし
+      #
+      def vanished_date?
+        value = @hash[VANISHED_DATE_KEY]
+
+        return true if value.is_a?(TrueClass)
+
+        false
+      end
+
       class << self
         #
         # 暦名を返す

data/lib/zakuro/context/version_class_resolver.rb

@@ -4,21 +4,25 @@ require_relative '../version/genka/cycle/remainder'
 require_relative '../version/genka/cycle/solar_term'
 require_relative '../version/genka/range/annual_range'
 require_relative '../version/genka/option/dropped_date/parameter'
+require_relative '../version/genka/option/vanished_date/parameter'
 
 require_relative '../version/gihou/cycle/remainder'
 require_relative '../version/gihou/cycle/solar_term'
 require_relative '../version/gihou/range/annual_range'
 require_relative '../version/gihou/option/dropped_date/parameter'
+require_relative '../version/gihou/option/vanished_date/parameter'
 
 require_relative '../version/daien/cycle/remainder'
 require_relative '../version/daien/cycle/solar_term'
 require_relative '../version/daien/range/annual_range'
 require_relative '../version/daien/option/dropped_date/parameter'
+require_relative '../version/daien/option/vanished_date/parameter'
 
 require_relative '../version/senmyou/cycle/remainder'
 require_relative '../version/senmyou/cycle/solar_term'
 require_relative '../version/senmyou/range/annual_range'
 require_relative '../version/senmyou/option/dropped_date/parameter'
+require_relative '../version/senmyou/option/vanished_date/parameter'
 
 # :nodoc:
 module Zakuro
@@ -36,7 +40,8 @@ module Zakuro
         'remainder' => 'Zakuro::$VERSION::Cycle::Remainder',
         'solar_term' => 'Zakuro::$VERSION::Cycle::SolarTerm',
         'annual_range' => 'Zakuro::$VERSION::Range::AnnualRange',
-        'dropped_date_parameter' => 'Zakuro::$VERSION::Option::DroppedDate::Parameter'
+        'dropped_date_parameter' => 'Zakuro::$VERSION::Option::DroppedDate::Parameter',
+        'vanished_date_parameter' => 'Zakuro::$VERSION::Option::VanishedDate::Parameter'
       }.freeze
 
       #
@@ -86,6 +91,17 @@ module Zakuro
         )
       end
 
+      #
+      # 滅日引数を返す
+      #
+      # @return [Class] 没日引数クラス
+      #
+      def vanished_date_parameter
+        self.class.get_class(
+          version_name: @version_name, class_name: 'vanished_date_parameter'
+        )
+      end
+
       class << self
         #
         # 該当の暦のクラスを取得する

data/lib/zakuro/result/data/option/vanished_date/calculation.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+# :nodoc:
+module Zakuro
+  #
+  # Result 演算結果
+  #
+  module Result
+    #
+    # データ部
+    #
+    module Data
+      #
+      # Option オプション
+      #
+      module Option
+        #
+        # VanishedDate 滅日
+        #
+        module VanishedDate
+          #
+          # Calculation 演算値
+          #
+          class Calculation
+            # @return [String] 大余小余（滅余）
+            attr_reader :remainder
+            # @return [String] 経朔
+            attr_reader :average_remainder
+
+            #
+            # 初期化
+            #
+            # @param [String] remainder 大余小余（滅余）
+            # @param [String] average_remainder 経朔
+            #
+            def initialize(remainder: '', average_remainder: '')
+              @remainder = remainder
+              @average_remainder = average_remainder
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/result/data/option/vanished_date/option.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require_relative '../abstract_option'
+
+require_relative './calculation'
+
+# :nodoc:
+module Zakuro
+  #
+  # Result 演算結果
+  #
+  module Result
+    #
+    # データ部
+    #
+    module Data
+      #
+      # Option オプション
+      #
+      module Option
+        #
+        # VanishedDate 滅日
+        #
+        module VanishedDate
+          #
+          # Option 滅日集約
+          #
+          class Option < AbstractOption
+            # @return [Calculation] 演算値
+            attr_reader :calculation
+
+            #
+            # 初期化
+            #
+            # @param [True, False] matched オプション値有無
+            # @param [Calculation] calculation 演算値
+            #
+            def initialize(matched: false, calculation: Calculation.new)
+              super(matched: matched)
+              @calculation = calculation
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/result/data/single_day.rb

@@ -6,6 +6,8 @@ require_relative './option/abstract_option'
 
 require_relative './option/dropped_date/option'
 
+require_relative './option/vanished_date/option'
+
 require_relative 'year'
 
 require_relative 'month'

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

@@ -38,6 +38,8 @@ module Zakuro
           REMAINDER_ALL_YEAR = 15_943
           # @return [Integer] 旬周（60日） DAY * 60
           SIXTY_DAYS = 182_400
+          # @return [Integer] 朔虚分: (30 * 3040) % (29 * 3040 + 1613)
+          REMAINDER_IDEAL_MONTH = 1427
         end
 
         #

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

@@ -29,6 +29,12 @@ module Zakuro
           #
           # @return [Cycle::Remainder] 弦（1分=80秒）
           QUARTER = Cycle::Remainder.new(day: 7, minute: 1163, second: 6)
+
+          # @return [Cycle::Remainder] 有没判定
+          DROPPED_DATE_LIMIT = Cycle::Remainder.new(day: 0, minute: 2375, second: 17)
+
+          # @return [Cycle::Remainder] 有滅判定
+          VANISHED_DATE_LIMIT = Cycle::Remainder.new(day: 0, minute: 1427, second: 0)
         end
 
         #
@@ -44,8 +50,7 @@ module Zakuro
           #   * 0.25 * 80（1分=80秒） = 20
           #
           # @return [Cycle::LunarRemainder] 弦（1分=80秒）
-          # TODO: 秒が20では通らない。少なくとも0.01247は必要になる
-          QUARTER = Cycle::LunarRemainder.new(day: 7, minute: 1163, second: 20.01247)
+          QUARTER = Cycle::LunarRemainder.new(day: 7, minute: 1163, second: 20)
         end
       end
     end

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

@@ -32,19 +32,6 @@ module Zakuro
           super(base_day: Const::Number::Cycle::DAY, base_minute: 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
 
       #
@@ -66,18 +53,49 @@ module Zakuro
           super(base_day: Const::Number::Cycle::DAY, base_minute: MINUTE,
                 day: day, minute: minute, second: second, total: total)
         end
+      end
+
+      #
+      # DroppedRemainder 没日の計算向け時刻情報（没余）
+      #
+      class DroppedRemainder < Calculation::Cycle::AbstractRemainder
+        # @return [Integer] 分（1分=24秒）
+        MINUTE = 24
 
         #
-        # 特定の文字フォーマットにして出力する
-        #
-        # @param [String] form フォーマット（大余、小余、秒それぞれを%dで指定する）
+        # 初期化
         #
-        # @return [String] フォーマットした結果
+        # @param [Integer] day 大余（"日"に相当）
+        # @param [Integer] minute 小余（"分"に相当）
+        # @param [Integer] second 秒
+        # @param [Integer] total 繰り上げなしの小余
         #
-        def format(form: '%d-%d')
-          return '' if invalid?
+        def initialize(day: -1, minute: -1, second: -1, total: -1)
+          # 小余 = 通余
+          super(base_day: Const::Number::Derivation::REMAINDER_ALL_YEAR, base_minute: MINUTE,
+                day: day, minute: minute, second: second, total: total)
+        end
+      end
+
+      #
+      # VanishedRemainder 滅日の計算向け時刻情報（滅余）
+      #
+      class VanishedRemainder < Calculation::Cycle::AbstractRemainder
+        # @return [Integer] 分（1分=24秒）
+        MINUTE = 24
 
-          super(form, @day, @minute, @second)
+        #
+        # 初期化
+        #
+        # @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::Derivation::REMAINDER_IDEAL_MONTH, base_minute: MINUTE,
+                day: day, minute: minute, second: second, total: total)
         end
       end
     end

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

@@ -64,7 +64,7 @@ module Zakuro
           # NOTE: 大衍暦では進朔しない
           # adjusted.up_on_new_moon!
 
-          debug("result: #{adjusted.format}")
+          debug("result: #{adjusted.format(form: '%d-%d.%.5f')}")
 
           adjusted
         end
@@ -92,9 +92,7 @@ module Zakuro
 
           remainder = lunar_location.adjusted_remainder
 
-          # debug("[lunar]remainder.format: #{remainder.format(form: '%d-%d-%.5f')}")
-          # debug("[lunar]remainder.day: #{remainder.day}")
-          # debug("[lunar]remainder.minute: #{remainder.minute}")
+          debug("[lunar]remainder.format: #{remainder.format(form: '%d-%d-%.5f')}")
 
           Lunar::Value.get(remainder: remainder)
         end

data/lib/zakuro/version/daien/option/dropped_date/parameter.rb

@@ -9,9 +9,9 @@ require_relative '../../cycle/remainder'
 # :nodoc:
 module Zakuro
   # :nodoc:
-  module Senmyou
+  module Daien
     # :nodoc:
-    module Daien
+    module Option
       # :nodoc:
       module DroppedDate
         #
@@ -22,7 +22,9 @@ module Zakuro
           # 初期化
           #
           def initialize
-            super(valid: false)
+            super(valid: true, year: Const::Number::Cycle::YEAR,
+                  limit: Const::Remainder::Solar::DROPPED_DATE_LIMIT,
+                  remainder_class: Cycle::DroppedRemainder)
           end
         end
       end

data/lib/zakuro/version/daien/option/vanished_date/parameter.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative '../../../../calculation/option/vanished_date/abstract_parameter'
+
+require_relative '../../const/number'
+require_relative '../../const/remainder'
+require_relative '../../cycle/remainder'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Daien
+    # :nodoc:
+    module Option
+      # :nodoc:
+      module VanishedDate
+        #
+        # Parameter 引数
+        #
+        class Parameter < Calculation::Option::VanishedDate::AbstractParameter
+          #
+          # 初期化
+          #
+          def initialize
+            super(valid: true,
+                  limit: Const::Remainder::Solar::VANISHED_DATE_LIMIT,
+                  remainder_class: Cycle::VanishedRemainder)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -28,7 +28,11 @@ module Zakuro
         # @param [Integer] western_year 西暦年
         #
         def initialize(lunar_age:, western_year:)
-          super(lunar_age: lunar_age, western_year: western_year)
+          super(
+            lunar_age: lunar_age,
+            quarter: QUARTER,
+            western_year: western_year
+          )
         end
 
         #
@@ -43,13 +47,6 @@ module Zakuro
           first
         end
 
-        #
-        # 弦の分だけ月地点を進める
-        #
-        def add_quarter
-          remainder.add!(QUARTER)
-        end
-
         private
 
         #

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

@@ -43,7 +43,9 @@ module Zakuro
           return '' if invalid?
 
           decimal = day + minute / base_day.to_f
-          super(form, decimal.round(digit))
+
+          # NOTE: 親クラスを迂回する
+          Kernel.instance_method(:format).bind(self).call(form, decimal.round(digit))
         end
       end
 
@@ -84,7 +86,9 @@ module Zakuro
           # 具体的には、468年の中気は '55.7813' だが '55.7812' になる
           # これは '55.7812500' を4桁にした際に、境界値の少数点以下5桁目の '5' が切り捨てを受けたためである
           # format による四捨五入は避け、roundによる四捨五入を採用する
-          super(form, decimal.round(digit))
+
+          # NOTE: 親クラスを迂回する
+          Kernel.instance_method(:format).bind(self).call(form, decimal.round(digit))
         end
       end
     end

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

@@ -47,7 +47,7 @@ module Zakuro
         #
         # 次の弦に進める
         #
-        # @return [Remainder] 定朔
+        # @return [Remainder] 経朔
         #
         def next_phase
           adjusted = remainder.clone
@@ -59,9 +59,9 @@ module Zakuro
 
         #
         # 次の月に進める
-        # @note 進めた後の月の定朔ではなく、当月のものを返却する
+        # @note 進めた後の月の経朔ではなく、当月のものを返却する
         #
-        # @return [Remainder] 当月初の定朔
+        # @return [Remainder] 当月初の経朔
         #
         def next_month
           result = nil
@@ -73,6 +73,17 @@ module Zakuro
           result
         end
 
+        #
+        # 経朔を返す
+        #
+        #  元嘉暦には経朔しかないが他の暦と揃える
+        #
+        # @return [Remainder] 経朔
+        #
+        def average_remainder
+          @remainder
+        end
+
         private
 
         #

data/lib/zakuro/version/genka/option/vanished_date/parameter.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require_relative '../../../../calculation/option/vanished_date/abstract_parameter'
+
+require_relative '../../const/number'
+require_relative '../../const/remainder'
+require_relative '../../cycle/remainder'
+
+# :nodoc:
+module Zakuro
+  # :nodoc:
+  module Genka
+    # :nodoc:
+    module Option
+      # :nodoc:
+      module VanishedDate
+        #
+        # Parameter 引数
+        #
+        class Parameter < Calculation::Option::VanishedDate::AbstractParameter
+          #
+          # 初期化
+          #
+          def initialize
+            super(valid: false)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -42,11 +42,7 @@ module Zakuro
           #   * 0.75 * 12（1分=12秒） = 9
           #
           # @return [Cycle::LunarRemainder] 弦（1分=12秒）
-          # TODO: 9秒だと通らない。 0.00378 〜 0.0208 の範囲内で通る
-          # QUARTER = Cycle::LunarRemainder.new(day: 7, minute: 512, second: 9)
-          # QUARTER = Cycle::LunarRemainder.new(day: 7, minute: 512, second: 9.00378)
-          # QUARTER = Cycle::LunarRemainder.new(day: 7, minute: 512, second: 9.0208)
-          QUARTER = Cycle::LunarRemainder.new(day: 7, minute: 512, second: 9.00378)
+          QUARTER = Cycle::LunarRemainder.new(day: 7, minute: 512, second: 9)
         end
       end
     end

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

@@ -29,19 +29,6 @@ module Zakuro
           super(base_day: Const::Number::Cycle::DAY, base_minute: 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
 
       #
@@ -63,19 +50,6 @@ module Zakuro
           super(base_day: Const::Number::Cycle::DAY, base_minute: 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/gihou/monthly/lunar_phase.rb

@@ -64,7 +64,7 @@ module Zakuro
           # NOTE: 儀鳳暦では進朔しない
           # adjusted.up_on_new_moon!
 
-          debug("result: #{adjusted.format}")
+          debug("result: #{adjusted.format(form: '%d-%d.%.5f')}")
 
           adjusted
         end
@@ -94,9 +94,7 @@ module Zakuro
 
           remainder = lunar_location.adjusted_remainder
 
-          # debug("[lunar]remainder.format: #{remainder.format(form: '%d-%d-%.5f')}")
-          # debug("[lunar]remainder.day: #{remainder.day}")
-          # debug("[lunar]remainder.minute: #{remainder.minute}")
+          debug("[lunar]remainder.format: #{remainder.format(form: '%d-%d-%.5f')}")
 
           Lunar::Value.get(remainder: remainder)
         end