mk_calendar 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c9771070413970572ce4a5e2029afc10085208a
-  data.tar.gz: c495adcfa35c922922e3a19e4f65619dfc23e14e
+  metadata.gz: 68ad1bdf744dcdcfefa895c339f8b04dff417700
+  data.tar.gz: 4152d0bb721349c84df811fc65a51d674436a34d
 SHA512:
-  metadata.gz: 4c44d5d22849c1fd2b4f3d042ced2b23689f00e93a63703bd81bb6644b37e31519e9b77f28d9707463a941f8382f1c578b1db9e80ea8fca874faca6e071df3c0
-  data.tar.gz: b145f855bfb43fc779544970b73fa519ab6733d3ed895af8b72dad638648db1d83e539d4a8858be7853adffd0c90e656128c52f7841e735880057f007bd9e94e
+  metadata.gz: 31ac7d54213e102d1f859337a72567996f4a3c85dafc3bfac9c2b5b890fa4c6257773dbf015faa24a888bfe4527c69507664e2d60c4aaad549a1780dc56886a4
+  data.tar.gz: 581ce65f6a573648963457099c3ed05168edac0cb3c3acce634808e5ad9c1fdf11d1323d9f9254729c1e8155d78c74f761934c75ee5574793aa461162db5f244

data/README.md

@@ -7,7 +7,7 @@ This is the gem library which calculates calendar datas, including old-calendar.
 ### 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 +40,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

@@ -133,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]
@@ -150,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
@@ -332,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
@@ -365,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
@@ -669,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
 
       # 繰り返し計算によって直前の二分二至の時刻を計算する
@@ -678,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
@@ -751,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

data/lib/mk_calendar/version.rb

@@ -1,3 +1,3 @@
 module MkCalendar
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mk_calendar
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - komasaru
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mk_time