zakuro 0.9.0 → 0.9.2

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

data/lib/zakuro/version/gihou/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 Gihou
+    # :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/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/senmyou/const/number.rb

@@ -30,10 +30,12 @@ module Zakuro
         # Derivation 導出
         #
         module Derivation
-          # @return [Integer] 通余:  (YEAR - DAY * 12 * 30)  = 44055
+          # @return [Integer] 通余: (YEAR - DAY * 12 * 30)  = 44055
           REMAINDER_ALL_YEAR = 44_055
           # @return [Integer] 旬周（60日） DAY * 60
           SIXTY_DAYS = 504_000
+          # @return [Integer] 朔虚分: (30 * 8400) % 248057
+          REMAINDER_IDEAL_MONTH = 3943
         end
 
         #

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

@@ -30,6 +30,9 @@ module Zakuro
           # * 中盈（小余3671秒2）/ 2 = 小余1835秒5
           # * 日（小余8400） - 小余1835秒5 = 小余6564秒3
           DROPPED_DATE_LIMIT = Cycle::Remainder.new(day: 0, minute: 6564, second: 3)
+
+          # @return [Cycle::Remainder] 有滅判定
+          VANISHED_DATE_LIMIT = Cycle::Remainder.new(day: 0, minute: 3943, second: 0)
         end
 
         #
@@ -44,8 +47,7 @@ module Zakuro
           # @note 章月 248057 = 29-4457
           #
           # @return [Cycle::LunarRemainder] 弦（1分=100秒）
-          # TODO: 秒が25では通らない。少なくとも0.00546は必要になる（最大 0.01863）
-          QUARTER = Cycle::LunarRemainder.new(day: 7, minute: 3214, second: 25.00546)
+          QUARTER = Cycle::LunarRemainder.new(day: 7, minute: 3214, second: 25)
         end
       end
     end

data/lib/zakuro/version/senmyou/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
 
       #
@@ -98,18 +72,27 @@ module Zakuro
           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分=8秒）
+        MINUTE = 8
 
         #
-        # 特定の文字フォーマットにして出力する
-        #
-        # @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?
-
-          super(form, @day, @minute, @second)
+        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/senmyou/monthly/lunar_phase.rb

@@ -55,7 +55,7 @@ module Zakuro
         # @return [Remainder] 定朔
         #
         def current_remainder
-          debug("average_remainder.format: #{average_remainder.format}")
+          # debug("average_remainder.format: #{average_remainder.format}")
 
           sum = correction_value
           adjusted = average_remainder.add(
@@ -63,7 +63,7 @@ module Zakuro
           )
           adjusted.up_on_new_moon!
 
-          debug("result: #{adjusted.format}")
+          debug("result: #{adjusted.format(form: '%d-%d.%.5f')}")
 
           adjusted
         end
@@ -75,8 +75,8 @@ module Zakuro
         #
         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}")
+          # debug("solar_term.remainder: #{solar_location.remainder.format(form: '%d-%d.%.5f')}")
+          # debug("solar_term.index: #{solar_location.index}")
 
           Solar::Value.get(solar_location: solar_location)
         end
@@ -94,7 +94,7 @@ module Zakuro
           remainder = lunar_location.adjusted_remainder
           forward = lunar_location.forward
 
-          debug("[lunar]remainder.format: #{remainder.format}")
+          debug("[lunar]remainder.format: #{remainder.format(form: '%d-%d.%.5f')}")
           debug("[lunar]forward: #{forward}")
 
           Lunar::Value.get(remainder: remainder, forward: forward)

data/lib/zakuro/version/senmyou/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 Senmyou
+    # :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/senmyou/stella/lunar/location.rb

@@ -32,7 +32,12 @@ 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
+          )
+
           # 進
           @forward = true
         end
@@ -49,13 +54,6 @@ module Zakuro
           first
         end
 
-        #
-        # 弦の分だけ月地点を進める
-        #
-        def add_quarter
-          remainder.add!(QUARTER)
-        end
-
         private
 
         #

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

@@ -16,6 +16,9 @@ module Zakuro
       # Value 月補正値
       #
       module Value
+        # @return [Output::Logger] ロガー
+        LOGGER = Output::Logger.new(location: 'lunar_value')
+
         # :reek:TooManyStatements { max_statements: 9 }
 
         class << self
@@ -39,12 +42,18 @@ module Zakuro
 
             value = row.value
 
+            # LOGGER.debug("value.per: #{value.per}")
+            # LOGGER.debug("row.denominator: #{row.denominator}")
+            # LOGGER.debug("value.stack: #{value.stack}")
+
             minus_minute = Adjustment.minus_minute(day: day, minute: minute)
 
             day = Calculation::Lunar::ChoukeiValue.rounded_day(
               per: value.per, denominator: row.denominator, minute: minus_minute
             )
 
+            # LOGGER.debug("day: #{day}")
+
             value.stack + day
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zakuro
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - pldb
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-10 00:00:00.000000000 Z
+date: 2022-12-29 00:00:00.000000000 Z
 dependencies: []
 description: mainly lunar solar calendar
 email:
@@ -29,13 +29,27 @@ files:
 - VERSION
 - bin/console
 - bin/setup
+- doc/condition.md
 - doc/dropped_date.md
 - doc/error.md
+- doc/expection.md
 - doc/gengou.md
 - doc/operation.md
 - doc/operation/csv/month.csv
 - doc/operation/operation.xlsx
 - doc/operation/transfer.rb
+- doc/usage.md
+- doc/vanished_date.md
+- doc/version/daien.md
+- doc/version/genka.md
+- doc/version/gihou.md
+- doc/version/section/common_post_process.md
+- doc/version/section/common_pre_process.md
+- doc/version/section/const.md
+- doc/version/section/decimal.md
+- doc/version/section/lunisolar_calendar.md
+- doc/version/section/senmyou_november_1st.md
+- doc/version/senmyou.md
 - images/12月以降の入定気.png
 - images/12月以降の月の進退.png
 - images/source/description.numbers
@@ -78,6 +92,8 @@ files:
 - 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/option/vanished_date/abstract_parameter.rb
+- lib/zakuro/calculation/option/vanished_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
@@ -127,6 +143,7 @@ files:
 - lib/zakuro/era/japan/gengou/resource/yaml/set-003-modern.yaml
 - lib/zakuro/era/japan/version.rb
 - lib/zakuro/era/western/calendar.rb
+- lib/zakuro/era/western/date_text.rb
 - lib/zakuro/exception/case/pattern.rb
 - lib/zakuro/exception/case/preset.rb
 - lib/zakuro/exception/case/template.rb
@@ -154,6 +171,8 @@ files:
 - 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/option/vanished_date/calculation.rb
+- lib/zakuro/result/data/option/vanished_date/option.rb
 - lib/zakuro/result/data/single_day.rb
 - lib/zakuro/result/data/solar_term.rb
 - lib/zakuro/result/data/year.rb
@@ -172,6 +191,7 @@ files:
 - 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/option/vanished_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
@@ -192,6 +212,7 @@ files:
 - 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/option/vanished_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
@@ -203,6 +224,7 @@ files:
 - 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/option/vanished_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
@@ -220,13 +242,13 @@ files:
 - lib/zakuro/version/houryaku/houryaku.rb
 - lib/zakuro/version/joukyou/joukyou.rb
 - lib/zakuro/version/kansei/kansei.rb
-- lib/zakuro/version/senmyou/README.md
 - lib/zakuro/version/senmyou/const/number.rb
 - lib/zakuro/version/senmyou/const/remainder.rb
 - 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/option/vanished_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