zakuro 0.2.0 → 0.3.0

data/lib/zakuro/version/daien/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 Daien
+    # :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/daien/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 Daien
+    # :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/gihou/const/remainder.rb

@@ -36,8 +36,6 @@ module Zakuro
           # @return [Cycle::LunarRemainder] 変日（1近点月）
           ANOMALISTIC_MONTH = \
             Cycle::LunarRemainder.new(day: 27, minute: 743, second: 1)
-          # @return [Cycle::LunarRemainder] 入暦上限
-          LIMIT = Cycle::LunarRemainder.new(day: 28, minute: 743, second: 0)
           #
           # @note 常朔実 39571 = 29-711
           #   * 39571 / 4 = 9892.75 / 1340 = 7 余り 512.75

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

@@ -11,12 +11,7 @@ module Zakuro
     # :nodoc:
     module Cycle
       #
-      # Remainder 宣明暦の時刻情報（大余小余）
-      #
-      # * 「15日1012分5秒」のような形式で表される
-      # * 分は1340で一日に繰り上げる
-      # * 秒は基本的に1/6分で、6秒で1分に繰り上げる。ただし、月補正値は1分に100秒とするなど基数の変更がありえる
-      # * 十干十二支（60日）を上限とした「日時分秒」の情報で、日付（date）/時刻（time）と部分的に重なる概念
+      # Remainder 時刻情報（大余小余）
       #
       class Remainder < Calculation::Cycle::AbstractRemainder
         # @return [Integer] 分（1分=6秒）

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

@@ -92,7 +92,7 @@ module Zakuro
         def correction_moon_value
           @lunar_location.run
 
-          remainder = @lunar_location.remainder
+          remainder = @lunar_location.adjusted_remainder
 
           # debug("[lunar]remainder.format: #{remainder.format(form: '%d-%d-%.5f')}")
           # debug("[lunar]remainder.day: #{remainder.day}")

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

@@ -18,8 +18,6 @@ module Zakuro
       class Location < Calculation::Lunar::AbstractLocation
         # @return [Cycle::LunarRemainder] 1近点月
         ANOMALISTIC_MONTH = Const::Remainder::Lunar::ANOMALISTIC_MONTH
-        # @return [Cycle::LunarRemainder] 入暦上限
-        LIMIT = Const::Remainder::Lunar::LIMIT
         # @return [Cycle::LunarRemainder] 弦
         QUARTER = Const::Remainder::Lunar::QUARTER
 
@@ -38,8 +36,7 @@ module Zakuro
         #
         def run
           if calculated
-            # 1始まりで計算しているので、入暦上限を用いる
-            decrease(limit: LIMIT)
+            decrease(limit: ANOMALISTIC_MONTH)
             return
           end
 
@@ -62,10 +59,7 @@ module Zakuro
           @remainder = Localization.first_remainder(
             lunar_age: remainder, western_year: western_year
           )
-          # 初回は0始まりで計算しているので、入暦上限ではなく1近点月を用いる
           decrease(limit: ANOMALISTIC_MONTH)
-          # 1始まりに改める
-          one_based
 
           @calculated = true
         end
@@ -78,7 +72,7 @@ module Zakuro
         def decrease(limit:)
           return if remainder < limit
 
-          remainder.sub!(ANOMALISTIC_MONTH)
+          remainder.sub!(limit)
         end
       end
     end

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

@@ -31,8 +31,9 @@ module Zakuro
         def self.get(remainder:)
           valid?(remainder: remainder)
 
-          day = remainder.day
-          minute = remainder.floor_minute
+          day, minute = Calculation::Lunar::ChoukeiValue.remainder_without_second(
+            remainder: remainder
+          )
 
           # 引き当て
           row = Adjustment.specify(day: day, minute: minute)

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

@@ -87,7 +87,7 @@ module Zakuro
           solar_term_index = solar_location.index
 
           # 入定気の一つ後の二十四節気まで戻す（ただし11月経朔が二十四節気上にある場合は戻さない）
-          solar_term_index += 1 unless solar_location.remainder == Cycle::Remainder.new(total: 0)
+          solar_term_index += 1 unless solar_location.remainder.day.zero?
 
           solar_term_index
         end

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

@@ -35,8 +35,6 @@ module Zakuro
           # @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
           #

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秒）

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

@@ -91,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}")

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

@@ -18,8 +18,6 @@ module Zakuro
       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
 
@@ -44,8 +42,7 @@ module Zakuro
         #
         def run
           if calculated
-            # 1始まりで計算しているので、入暦上限を用いる
-            decrease(limit: LIMIT)
+            decrease(limit: HALF_ANOMALISTIC_MONTH)
             return
           end
 
@@ -68,10 +65,7 @@ module Zakuro
           @remainder = Localization.first_remainder(
             lunar_age: remainder, western_year: western_year
           )
-          # 初回は0始まりで計算しているので、入暦上限ではなく暦中日を用いる
           decrease(limit: HALF_ANOMALISTIC_MONTH)
-          # 1始まりに改める
-          one_based
 
           @calculated = true
         end
@@ -84,7 +78,7 @@ module Zakuro
         def decrease(limit:)
           return if remainder < limit
 
-          remainder.sub!(HALF_ANOMALISTIC_MONTH)
+          remainder.sub!(limit)
           @forward = !forward
         end
       end

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

@@ -29,8 +29,9 @@ 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)

data/lib/zakuro/version/senmyou/stella/solar/average.rb

@@ -87,7 +87,7 @@ module Zakuro
           solar_term_index = solar_location.index
 
           # 入定気の一つ後の二十四節気まで戻す（ただし11月経朔が二十四節気上にある場合は戻さない）
-          solar_term_index += 1 unless solar_location.remainder == Cycle::Remainder.new(total: 0)
+          solar_term_index += 1 unless solar_location.remainder.day.zero?
 
           solar_term_index
         end

data/lib/zakuro/version/version_class_resolver.rb

@@ -4,6 +4,10 @@ require_relative './gihou/cycle/remainder'
 require_relative './gihou/cycle/solar_term'
 require_relative './gihou/range/annual_range'
 
+require_relative './daien/cycle/remainder'
+require_relative './daien/cycle/solar_term'
+require_relative './daien/range/annual_range'
+
 require_relative './senmyou/cycle/remainder'
 require_relative './senmyou/cycle/solar_term'
 require_relative './senmyou/range/annual_range'

data/lib/zakuro/version_factory.rb

@@ -4,7 +4,7 @@ require_relative './era/japan/reki'
 require_relative './era/western'
 require_relative './version/genka/genka'
 require_relative './version/gihou/gihou'
-require_relative './version/taien/taien'
+require_relative './version/daien/daien'
 require_relative './version/senmyou/senmyou'
 require_relative './version/joukyou/joukyou'
 require_relative './version/houryaku/houryaku'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zakuro
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - pldb
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-06 00:00:00.000000000 Z
+date: 2021-07-09 00:00:00.000000000 Z
 dependencies: []
 description: mainly lunar solar calendar
 email:
@@ -94,6 +94,25 @@ files:
 - lib/zakuro/version.rb
 - lib/zakuro/version/abstract_version.rb
 - lib/zakuro/version/context.rb
+- lib/zakuro/version/daien/const/number.rb
+- lib/zakuro/version/daien/const/remainder.rb
+- lib/zakuro/version/daien/cycle/remainder.rb
+- lib/zakuro/version/daien/cycle/solar_term.rb
+- lib/zakuro/version/daien/daien.rb
+- lib/zakuro/version/daien/monthly/lunar_phase.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
+- lib/zakuro/version/daien/stella/lunar/location.rb
+- lib/zakuro/version/daien/stella/lunar/value.rb
+- lib/zakuro/version/daien/stella/origin/average_november.rb
+- lib/zakuro/version/daien/stella/origin/lunar_age.rb
+- lib/zakuro/version/daien/stella/origin/winter_solstice.rb
+- lib/zakuro/version/daien/stella/solar/adjustment.rb
+- lib/zakuro/version/daien/stella/solar/average.rb
+- lib/zakuro/version/daien/stella/solar/interval.rb
+- lib/zakuro/version/daien/stella/solar/location.rb
+- lib/zakuro/version/daien/stella/solar/value.rb
 - lib/zakuro/version/genka/genka.rb
 - lib/zakuro/version/gihou/const/number.rb
 - lib/zakuro/version/gihou/const/remainder.rb
@@ -138,7 +157,6 @@ files:
 - lib/zakuro/version/senmyou/stella/solar/interval.rb
 - lib/zakuro/version/senmyou/stella/solar/location.rb
 - lib/zakuro/version/senmyou/stella/solar/value.rb
-- lib/zakuro/version/taien/taien.rb
 - lib/zakuro/version/tenpou/tenpou.rb
 - lib/zakuro/version/version_class_resolver.rb
 - lib/zakuro/version_factory.rb
@@ -151,7 +169,7 @@ metadata:
   homepage_uri: https://github.com/pldb/zakuro
   source_code_uri: https://github.com/pldb/zakuro
   changelog_uri: https://github.com/pldb/zakuro
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -166,8 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: japanese calendar library.
 test_files: []

data/lib/zakuro/version/taien/taien.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../abstract_version'
-
-# :nodoc:
-module Zakuro
-  #
-  # Taien 大衍暦
-  #
-  module Taien
-    #
-    # Gateway アクセサメソッド群
-    #
-    class Gateway < AbstractVersion
-      # @return [False] リリースなし
-      RELEASE = false
-    end
-  end
-end