mk_calendar 0.2.6 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4f34775b3df3ec2ebba44012f345cc06906b2853
-  data.tar.gz: 58ca4045e8e9f16f8fb3247ccfe9824c75ac6070
+SHA256:
+  metadata.gz: 72ee21c3849fe4ac84aea68f419574959e27efc5a2fd52a5cb34ed712d15d51d
+  data.tar.gz: b356c4ca081e134b9e768f383ca6cc7c7a3d981ab7f4421087ff06da184ffb97
 SHA512:
-  metadata.gz: f2d6f372168734f8abbcbf91e5db4d7ef6b31effef857d3239b9358229f3e75c2869a1f077a1bdb0ebb70ba608e8145ee20830cb16ca175395a848bbf8f9161e
-  data.tar.gz: 575e3934529d89f5693a4d3e809e4827df76d84c7352f267b129bcaef19b430a07871889f8cee348df335599f80c080a29cf96a33f34054e7a0e8efa29d3cfe9
+  metadata.gz: 75e7b4c5ffb10884c894d120541e54ea6193d5f85edf1877c6e2d711f4bbf7b86cd5d1253576b8f41da2d9d74f2b8405001bb3fc5dbd24e3b214e63894eab891
+  data.tar.gz: f929806a326e445d0ac51840026ee7d56b0e4158052c470c243c5208d0ef9992de9d4190ba95ba5fb3487655c03ed82edad726143d55106cb129167e50af0774

data/README.md

@@ -4,10 +4,12 @@
 
 This is the gem library which calculates calendar datas, including old-calendar.
 
+**当リポジトリは更新停止。（2018年11月4日）**
+
 ### Computable items
 
 julian day(utc), julian day(jst), holiday, sekki_24, zassetsu,  
-yobi, kanshi, sekku, lambda_sun, lambda_moon, moonage,  
+yobi, kanshi, sekku, lambda(sun), alpha(moon), moonage,  
 old-calendar(year, month, day, leap flag), rokuyo
 
 ### Original Text
@@ -40,30 +42,26 @@ Or install it yourself as:
 
 ### Instantiation
 
-``` ruby
-require 'mk_calendar'
-
-obj = MkCalendar.new
-
-# Otherwise
-obj = MkCalendar.new("20160608")
-```
+    require 'mk_calendar'
+    
+    obj = MkCalendar.new
+    
+    # Otherwise
+    obj = MkCalendar.new("20160608")
 
 ### Calculation
 
-``` ruby
-p o.year, o.month, o.day, o.jd, o.jd_jst
-p o.holiday
-p o.sekki_24
-p o.zassetsu
-p o.yobi
-p o.kanshi
-p o.sekku
-p o.lambda_sun
-p o.lambda_moon
-p o.moonage
-p o.oc  # <= [year, leap_flag, month, day]
-```
+    p o.year, o.month, o.day, o.jd, o.jd_jst
+    p o.holiday
+    p o.sekki_24
+    p o.zassetsu
+    p o.yobi
+    p o.kanshi
+    p o.sekku
+    p o.lambda
+    p o.alpha
+    p o.moonage
+    p o.oc  # <= [year, leap_flag, month, day]
 
 ## Development
 

data/exe/mk_calendar

@@ -17,16 +17,17 @@ exit unless o
 #p o.moonage
 #p o.oc
 
+oc = o.oc
 str =  sprintf("%04d-%02d-%02d", o.year, o.month, o.day)
 str << " #{o.yobi}曜日"
 str << " #{o.holiday}" unless o.holiday == ""
 str << " #{o.jd}UTC(#{o.jd_jst}JST) #{o.kanshi} "
-str << sprintf("%04d-%02d-%02d", o.oc[0], o.oc[2], o.oc[3])
-str << "(閏)" if o.oc[1] == 1
-str << " #{o.oc[4]}"
+str << sprintf("%04d-%02d-%02d", oc[0], oc[2], oc[3])
+str << "(閏)" if oc[1] == 1
+str << " #{oc[4]}"
 str << " #{o.sekki_24}" unless o.sekki_24 == ""
 str << " #{o.zassetsu}" unless o.zassetsu == ""
 str << " #{o.sekku}" unless o.sekku == ""
-str << " #{o.lambda_sun} #{o.lambda_moon} #{o.moonage}"
+str << " #{o.lambda} #{o.alpha} #{o.moonage}"
 puts str
 

data/lib/mk_calendar/calendar.rb

@@ -57,15 +57,15 @@ module MkCalendar
     #=========================================================================
     # 視黄経（太陽）
     #=========================================================================
-    def lambda_sun
-      return compute_lambda_sun(@jd_jst)
+    def lambda
+      return compute_lambda(@jd_jst)
     end
 
     #=========================================================================
     # 視黄経（月）
     #=========================================================================
-    def lambda_moon
-      return compute_lambda_moon(@jd_jst)
+    def alpha
+      return compute_alpha(@jd_jst)
     end
 
     #=========================================================================

data/lib/mk_calendar/compute.rb

@@ -1,3 +1,5 @@
+require 'mk_time'
+
 module MkCalendar
   module Compute
     module_function
@@ -131,8 +133,8 @@ module MkCalendar
     # @return: sekki_24 (二十四節気の文字列)
     #=========================================================================
     def compute_sekki_24(jd)
-      lsun_today     = compute_lambda_sun(jd)
-      lsun_tomorrow  = compute_lambda_sun(jd + 1)
+      lsun_today     = compute_lambda(jd)
+      lsun_tomorrow  = compute_lambda(jd + 1)
       lsun_today0    = 15 * (lsun_today / 15.0).truncate
       lsun_tomorrow0 = 15 * (lsun_tomorrow / 15.0).truncate
       return lsun_today0 == lsun_tomorrow0 ? "" : Const::SEKKI_24[lsun_tomorrow0 / 15]
@@ -148,17 +150,17 @@ module MkCalendar
       zassetsu = Array.new
 
       # 計算対象日の太陽の黄経
-      lsun_today = compute_lambda_sun(jd)
+      lsun_today = compute_lambda(jd)
       # 計算対象日の翌日の太陽の黄経
-      lsun_tomorrow = compute_lambda_sun(jd + 1)
+      lsun_tomorrow = compute_lambda(jd + 1)
       # 計算対象日の5日前の太陽の黄経(社日計算用)
-      lsun_before_5 = compute_lambda_sun(jd - 5)
+      lsun_before_5 = compute_lambda(jd - 5)
       # 計算対象日の4日前の太陽の黄経(社日計算用)
-      lsun_before_4 = compute_lambda_sun(jd - 4)
+      lsun_before_4 = compute_lambda(jd - 4)
       # 計算対象日の5日後の太陽の黄経(社日計算用)
-      lsun_after_5  = compute_lambda_sun(jd + 5)
+      lsun_after_5  = compute_lambda(jd + 5)
       # 計算対象日の6日後の太陽の黄経(社日計算用)
-      lsun_after_6  = compute_lambda_sun(jd + 6)
+      lsun_after_6  = compute_lambda(jd + 6)
       # 太陽の黄経の整数部分( 土用, 入梅, 半夏生 計算用 )
       lsun_today0    = lsun_today.truncate
       lsun_tomorrow0 = lsun_tomorrow.truncate
@@ -330,7 +332,7 @@ module MkCalendar
     # @param:  jd (ユリウス日(JST))
     # @return: lambda
     #=========================================================================
-    def compute_lambda_sun(jd)
+    def compute_lambda(jd)
       year, month, day, hour, min, sec = jd2ymd(jd - Const::JST_D)
       dt = compute_dt(year, month, day)  # deltaT
       jy = (jd - Const::JST_D + dt / 86400.0 - 2451545.0) / 365.25  # Julian Year
@@ -363,7 +365,7 @@ module MkCalendar
     # @param:  jd (ユリウス日(JST))
     # @return: lambda
     #=========================================================================
-    def compute_lambda_moon(jd)
+    def compute_alpha(jd)
       year, month, day, hour, min, sec = jd2ymd(jd - Const::JST_D)
       dt = compute_dt(year, month, day)  # deltaT
       jy = (jd - Const::JST_D + dt / 86400.0 - 2451545.0) / 365.25  # Julian Year
@@ -667,7 +669,7 @@ module MkCalendar
       tm2 -= Const::JST_D
 
       # 直前の二分二至の黄経 λsun0 を求める
-      rm_sun  = compute_lambda_sun(jd + 0.5)
+      rm_sun  = compute_lambda(jd + 0.5)
       rm_sun0 = kbn * (rm_sun / kbn.to_f).truncate
 
       # 繰り返し計算によって直前の二分二至の時刻を計算する
@@ -676,7 +678,7 @@ module MkCalendar
       while (delta_t1 + delta_t2).abs > (1.0 / 86400.0)
         # λsun を計算
         t = tm1 + tm2 + Const::JST_D + 0.5
-        rm_sun = compute_lambda_sun(t)
+        rm_sun = compute_lambda(t)
 
         # 黄経差 Δλ＝λsun －λsun0
         delta_rm = rm_sun - rm_sun0
@@ -749,8 +751,8 @@ module MkCalendar
       while (delta_t1 + delta_t2).abs > (1.0 / 86400.0)
         # 太陽の黄経λsun ,月の黄経λmoon を計算
         t = tm1 + tm2 + Const::JST_D + 0.5
-        rm_sun  = compute_lambda_sun(t)
-        rm_moon = compute_lambda_moon(t)
+        rm_sun  = compute_lambda(t)
+        rm_moon = compute_alpha(t)
         # 月と太陽の黄経差Δλ
         # Δλ＝λmoon－λsun
         delta_rm = rm_moon - rm_sun
@@ -808,160 +810,9 @@ module MkCalendar
     # @return: dt
     #=========================================================================
     def compute_dt(year, month, day)
-      ym = sprintf("%04d-%02d", year, month)
-      y = year + (month - 0.5) / 12
-      case
-      when year < -500
-        t = (y - 1820) / 100.0
-        dt  = -20 + 32 * t ** 2
-      when -500 <= year && year < 500
-        t = y / 100.0
-        dt  = 10583.6
-             (-1014.41        + \
-             (   33.78311     + \
-             (   -5.952053    + \
-             (   -0.1798452   + \
-             (    0.022174192 + \
-             (    0.0090316521) \
-             * t) * t) * t) * t) * t) * t
-      when 500 <= year && year < 1600
-        t = (y - 1000) / 100.0
-        dt  = 1574.2         + \
-             (-556.01        + \
-             (  71.23472     + \
-             (   0.319781    + \
-             (  -0.8503463   + \
-             (  -0.005050998 + \
-             (   0.0083572073) \
-             * t) * t) * t) * t) * t) * t
-      when 1600 <= year && year < 1700
-        t = y - 1600
-        dt  = 120           + \
-             ( -0.9808      + \
-             ( -0.01532     + \
-             (  1.0 / 7129.0) \
-             * t) * t) * t
-      when 1700 <= year && year < 1800
-        t = y - 1700
-        dt  =  8.83           + \
-             ( 0.1603         + \
-             (-0.0059285      + \
-             ( 0.00013336     + \
-             (-1.0 / 1174000.0) \
-             * t) * t) * t) * t
-      when 1800 <= year && year < 1860
-        t = y - 1800
-        dt  = 13.72          + \
-             (-0.332447      + \
-             ( 0.0068612     + \
-             ( 0.0041116     + \
-             (-0.00037436    + \
-             ( 0.0000121272  + \
-             (-0.0000001699  + \
-             ( 0.000000000875) \
-             * t) * t) * t) * t) * t) * t) * t
-      when 1860 <= year && year < 1900
-        t = y - 1860
-        dt  =  7.62          + \
-             ( 0.5737        + \
-             (-0.251754      + \
-             ( 0.01680668    + \
-             (-0.0004473624  + \
-             ( 1.0 / 233174.0) \
-             * t) * t) * t) * t) * t
-      when 1900 <= year && year < 1920
-        t = y - 1900
-        dt  = -2.79      + \
-             ( 1.494119  + \
-             (-0.0598939 + \
-             ( 0.0061966 + \
-             (-0.000197  ) \
-             * t) * t) * t) * t
-      when 1920 <= year && year < 1941
-        t = y - 1920
-        dt  = 21.20     + \
-             ( 0.84493  + \
-             (-0.076100 + \
-             ( 0.0020936) \
-             * t) * t) * t
-      when 1941 <= year && year < 1961
-        t = y - 1950
-        dt  = 29.07      + \
-             ( 0.407     + \
-             (-1 / 233.0 + \
-             ( 1 / 2547.0) \
-             * t) * t) * t
-      when 1961 <= year && year < 1986
-        case
-        when ym < sprintf("%04d-%02d", 1972, 1)
-          t = y - 1975
-          dt = 45.45      + \
-              ( 1.067     + \
-              (-1 / 260.0 + \
-              (-1 / 718.0)  \
-              * t) * t) * t
-        # NICT Ver.
-        when ym < sprintf("%04d-%02d", 1972, 7); dt = Const::TT_TAI + 10
-        when ym < sprintf("%04d-%02d", 1973, 1); dt = Const::TT_TAI + 11
-        when ym < sprintf("%04d-%02d", 1974, 1); dt = Const::TT_TAI + 12
-        when ym < sprintf("%04d-%02d", 1975, 1); dt = Const::TT_TAI + 13
-        when ym < sprintf("%04d-%02d", 1976, 1); dt = Const::TT_TAI + 14
-        when ym < sprintf("%04d-%02d", 1977, 1); dt = Const::TT_TAI + 15
-        when ym < sprintf("%04d-%02d", 1978, 1); dt = Const::TT_TAI + 16
-        when ym < sprintf("%04d-%02d", 1979, 1); dt = Const::TT_TAI + 17
-        when ym < sprintf("%04d-%02d", 1980, 1); dt = Const::TT_TAI + 18
-        when ym < sprintf("%04d-%02d", 1981, 7); dt = Const::TT_TAI + 19
-        when ym < sprintf("%04d-%02d", 1982, 7); dt = Const::TT_TAI + 20
-        when ym < sprintf("%04d-%02d", 1983, 7); dt = Const::TT_TAI + 21
-        when ym < sprintf("%04d-%02d", 1985, 7); dt = Const::TT_TAI + 22
-        when ym < sprintf("%04d-%02d", 1988, 1); dt = Const::TT_TAI + 23
-        end
-      when 1986 <= year && year < 2005
-        #t = y - 2000
-        #dt  = 63.86         + \
-        #     ( 0.3345       + \
-        #     (-0.060374     + \
-        #     ( 0.0017275    + \
-        #     ( 0.000651814  + \
-        #     ( 0.00002373599) \
-        #     * t) * t) * t) * t) * t
-        # NICT Ver.
-        case
-        when ym < sprintf("%04d-%02d", 1988, 1); dt = Const::TT_TAI + 23
-        when ym < sprintf("%04d-%02d", 1990, 1); dt = Const::TT_TAI + 24
-        when ym < sprintf("%04d-%02d", 1991, 1); dt = Const::TT_TAI + 25
-        when ym < sprintf("%04d-%02d", 1992, 7); dt = Const::TT_TAI + 26
-        when ym < sprintf("%04d-%02d", 1993, 7); dt = Const::TT_TAI + 27
-        when ym < sprintf("%04d-%02d", 1994, 7); dt = Const::TT_TAI + 28
-        when ym < sprintf("%04d-%02d", 1996, 1); dt = Const::TT_TAI + 29
-        when ym < sprintf("%04d-%02d", 1997, 7); dt = Const::TT_TAI + 30
-        when ym < sprintf("%04d-%02d", 1999, 1); dt = Const::TT_TAI + 31
-        when ym < sprintf("%04d-%02d", 2006, 1); dt = Const::TT_TAI + 32
-        end
-      when 2005 <= year && year < 2050
-        case
-        when ym < sprintf("%04d-%02d", 2006, 1); dt = Const::TT_TAI + 32
-        when ym < sprintf("%04d-%02d", 2009, 1); dt = Const::TT_TAI + 33
-        when ym < sprintf("%04d-%02d", 2012, 7); dt = Const::TT_TAI + 34
-        when ym < sprintf("%04d-%02d", 2015, 7); dt = Const::TT_TAI + 35
-        when ym < sprintf("%04d-%02d", 2017, 1); dt = Const::TT_TAI + 36
-        when ym < sprintf("%04d-%02d", 2019, 1); dt = Const::TT_TAI + 37  # <= 第28回うるう秒実施までの暫定措置
-        else
-          t = y - 2000
-          dt  = 62.92    + \
-               ( 0.32217 + \
-               ( 0.005589) \
-               * t) * t
-        end
-      when 2050 <= year && year <= 2150
-        dt  = -20 \
-            + 32 * ((y - 1820) / 100.0) ** 2
-            - 0.5628 * (2150 - y)
-      when 2150 < year
-        t = (y - 1820) / 100.0
-        dt  = -20 + 32 * t ** 2
-      end
-      return dt
+      ymd = sprintf("%04d%02d%02d", year, month, day)
+      tm = MkTime.new(ymd)
+      return tm.dt
     end
 
     #=========================================================================

data/lib/mk_calendar/version.rb

@@ -1,3 +1,3 @@
 module MkCalendar
-  VERSION = "0.2.6"
+  VERSION = "0.3.2"
 end

data/mk_calendar.gemspec

@@ -27,7 +27,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "mk_time"
+  #spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  #spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: mk_calendar
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.2
 platform: ruby
 authors:
 - komasaru
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mk_time
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +95,7 @@ homepage: https://github.com/komasaru/mk_calendar
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -96,9 +110,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.6
-signing_key: 
+rubygems_version: 3.2.9
+signing_key:
 specification_version: 4
 summary: Calendar library including Japan's old-calendar.
 test_files: []