mk_calendar 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2c45a2007fdbe17f043f0375b885f6e8b92417e
-  data.tar.gz: b333fed96d844199c13f6e0e68204da8e2187f50
+  metadata.gz: 245ec15d039ea7e99949d6e8a1e38ef3e40ea990
+  data.tar.gz: 48a3389966bbc7f4e67e276ebe6930ee59c78e37
 SHA512:
-  metadata.gz: fb2fb586573c6e92bd68f2cb7346bdf1689abdfedd84097e3209ba326c16d5313e5d8617d5d96c8730daa6a1b070d186d3113797835d54df971e5eaf14960d8c
-  data.tar.gz: 4547b3125a524af62326c2769975b321eb569814e2b34fd3025deeb5df8fc65fd388a77a0718f9bd9e05c4cb0465576bfe79d47900768a81f4d54f4f638d300a
+  metadata.gz: 01f1304cd1263e3d1603f25d8c37bbb1a9f6fa1bfc16f828656908d7426390aa974f6ee665b7153a1ddd8ebd59a898f8aa604195eb597656e71a7781e5274fb9
+  data.tar.gz: 400d22a3116766854a19acc318bb18d1507cbae780d4aa2726ba90cc32d32c9e8c292c11b5d2393727e916fb342c593a9150125446b548b9e9e3264b470e6c96

data/lib/mk_calendar/compute.rb

@@ -331,11 +331,9 @@ module MkCalendar
     # @return: lambda
     #=========================================================================
     def compute_lambda_sun(jd)
-      year, month, day, hour, min, sec = jd2ymd(jd - 0.5)
-      t = (hour * 3600 + min * 60 + sec) / 86400.0
+      year, month, day, hour, min, sec = jd2ymd(jd - Const::JST_D)
       dt = compute_dt(year, month, day)  # deltaT
-      dp = gc2j2000(year, month, day)  # 2000年1月1日力学時正午からの経過日数(日)計算
-      jy = (t + dp + dt / 86400.0) / 365.25  # Julian Year
+      jy = (jd - Const::JST_D + dt / 86400.0 - 2451545.0) / 365.25  # Julian Year
       rm  = 0.0003 * Math.sin(Const::K * norm_angle(329.7  +   44.43  * jy))
       rm += 0.0003 * Math.sin(Const::K * norm_angle(352.5  + 1079.97  * jy))
       rm += 0.0004 * Math.sin(Const::K * norm_angle( 21.1  +  720.02  * jy))
@@ -366,11 +364,9 @@ module MkCalendar
     # @return: lambda
     #=========================================================================
     def compute_lambda_moon(jd)
-      year, month, day, hour, min, sec = jd2ymd(jd - 0.5)
-      t = (hour * 60 * 60 + min * 60 + sec) / 86400.0
+      year, month, day, hour, min, sec = jd2ymd(jd - Const::JST_D)
       dt = compute_dt(year, month, day)  # deltaT
-      dp = gc2j2000(year, month, day)  # 2000年1月1日力学時正午からの経過日数(日)計算
-      jy = (t + dp + dt / 86400.0) / 365.25  # Julian Year
+      jy = (jd - Const::JST_D + dt / 86400.0 - 2451545.0) / 365.25  # Julian Year
       am  = 0.0006 * Math.sin(Const::K * norm_angle( 54.0 + 19.3  * jy))
       am += 0.0006 * Math.sin(Const::K * norm_angle( 71.0 +  0.2  * jy))
       am += 0.0020 * Math.sin(Const::K * norm_angle( 55.0 + 19.34 * jy))
@@ -994,27 +990,6 @@ module MkCalendar
       return dt
     end
 
-    #=========================================================================
-    # 2000年1月1日力学時正午からの経過日数の計算
-    #
-    # @param:  year
-    # @param:  month
-    # @param:  day
-    # @return: dp (= day progress)
-    #=========================================================================
-    def gc2j2000(year, month, day)
-      year -= 2000
-      # 1月,2月は前年の13月,14月とする
-      if month < 3
-        year  -= 1
-        month += 12
-      end
-      dp  = 365 * year + 30 * month + day - 33.5 - Const::JST_D
-      dp += (3 * (month + 1) / 5.0).truncate
-      dp += (year / 4.0).truncate
-      return dp
-    end
-
     #=========================================================================
     # 六曜の計算
     #

data/lib/mk_calendar/version.rb

@@ -1,3 +1,3 @@
 module MkCalendar
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mk_calendar
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - komasaru