mk_calendar 0.2.6 → 0.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/mk_calendar/compute.rb +5 -154
  3. data/lib/mk_calendar/version.rb +1 -1
  4. data/mk_calendar.gemspec +1 -0
  5. metadata +16 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4f34775b3df3ec2ebba44012f345cc06906b2853
4
- data.tar.gz: 58ca4045e8e9f16f8fb3247ccfe9824c75ac6070
3
+ metadata.gz: 069045dd853219500d0236397e10ade713ca858c
4
+ data.tar.gz: 8e4a72cc6c0e6c9450bf07b5a3acacfbb0c16e89
5
5
  SHA512:
6
- metadata.gz: f2d6f372168734f8abbcbf91e5db4d7ef6b31effef857d3239b9358229f3e75c2869a1f077a1bdb0ebb70ba608e8145ee20830cb16ca175395a848bbf8f9161e
7
- data.tar.gz: 575e3934529d89f5693a4d3e809e4827df76d84c7352f267b129bcaef19b430a07871889f8cee348df335599f80c080a29cf96a33f34054e7a0e8efa29d3cfe9
6
+ metadata.gz: dd7d60a99986aadfb728b4256a8e84b0b3f8d807b1e25b7b261f84025a8e2bfdd0a6ec8028425b1addb3fd121b3503176863c3eb7248f688bae82dc29e4a68fc
7
+ data.tar.gz: 650a1187e9ddaa9b1f0c77fff900a900ffac7a543178b67d994f16813dd964dd347a83175ec0940d8fe19edefc93da3ec7a26f2e67e0dd4f8cd710a2f99e6733
data/lib/mk_calendar/compute.rb CHANGED
@@ -1,3 +1,5 @@
1
+ require 'mk_time'
2
+
1
3
  module MkCalendar
2
4
  module Compute
3
5
  module_function
@@ -808,160 +810,9 @@ module MkCalendar
808
810
  # @return: dt
809
811
  #=========================================================================
810
812
  def compute_dt(year, month, day)
811
- ym = sprintf("%04d-%02d", year, month)
812
- y = year + (month - 0.5) / 12
813
- case
814
- when year < -500
815
- t = (y - 1820) / 100.0
816
- dt = -20 + 32 * t ** 2
817
- when -500 <= year && year < 500
818
- t = y / 100.0
819
- dt = 10583.6
820
- (-1014.41 + \
821
- ( 33.78311 + \
822
- ( -5.952053 + \
823
- ( -0.1798452 + \
824
- ( 0.022174192 + \
825
- ( 0.0090316521) \
826
- * t) * t) * t) * t) * t) * t
827
- when 500 <= year && year < 1600
828
- t = (y - 1000) / 100.0
829
- dt = 1574.2 + \
830
- (-556.01 + \
831
- ( 71.23472 + \
832
- ( 0.319781 + \
833
- ( -0.8503463 + \
834
- ( -0.005050998 + \
835
- ( 0.0083572073) \
836
- * t) * t) * t) * t) * t) * t
837
- when 1600 <= year && year < 1700
838
- t = y - 1600
839
- dt = 120 + \
840
- ( -0.9808 + \
841
- ( -0.01532 + \
842
- ( 1.0 / 7129.0) \
843
- * t) * t) * t
844
- when 1700 <= year && year < 1800
845
- t = y - 1700
846
- dt = 8.83 + \
847
- ( 0.1603 + \
848
- (-0.0059285 + \
849
- ( 0.00013336 + \
850
- (-1.0 / 1174000.0) \
851
- * t) * t) * t) * t
852
- when 1800 <= year && year < 1860
853
- t = y - 1800
854
- dt = 13.72 + \
855
- (-0.332447 + \
856
- ( 0.0068612 + \
857
- ( 0.0041116 + \
858
- (-0.00037436 + \
859
- ( 0.0000121272 + \
860
- (-0.0000001699 + \
861
- ( 0.000000000875) \
862
- * t) * t) * t) * t) * t) * t) * t
863
- when 1860 <= year && year < 1900
864
- t = y - 1860
865
- dt = 7.62 + \
866
- ( 0.5737 + \
867
- (-0.251754 + \
868
- ( 0.01680668 + \
869
- (-0.0004473624 + \
870
- ( 1.0 / 233174.0) \
871
- * t) * t) * t) * t) * t
872
- when 1900 <= year && year < 1920
873
- t = y - 1900
874
- dt = -2.79 + \
875
- ( 1.494119 + \
876
- (-0.0598939 + \
877
- ( 0.0061966 + \
878
- (-0.000197 ) \
879
- * t) * t) * t) * t
880
- when 1920 <= year && year < 1941
881
- t = y - 1920
882
- dt = 21.20 + \
883
- ( 0.84493 + \
884
- (-0.076100 + \
885
- ( 0.0020936) \
886
- * t) * t) * t
887
- when 1941 <= year && year < 1961
888
- t = y - 1950
889
- dt = 29.07 + \
890
- ( 0.407 + \
891
- (-1 / 233.0 + \
892
- ( 1 / 2547.0) \
893
- * t) * t) * t
894
- when 1961 <= year && year < 1986
895
- case
896
- when ym < sprintf("%04d-%02d", 1972, 1)
897
- t = y - 1975
898
- dt = 45.45 + \
899
- ( 1.067 + \
900
- (-1 / 260.0 + \
901
- (-1 / 718.0) \
902
- * t) * t) * t
903
- # NICT Ver.
904
- when ym < sprintf("%04d-%02d", 1972, 7); dt = Const::TT_TAI + 10
905
- when ym < sprintf("%04d-%02d", 1973, 1); dt = Const::TT_TAI + 11
906
- when ym < sprintf("%04d-%02d", 1974, 1); dt = Const::TT_TAI + 12
907
- when ym < sprintf("%04d-%02d", 1975, 1); dt = Const::TT_TAI + 13
908
- when ym < sprintf("%04d-%02d", 1976, 1); dt = Const::TT_TAI + 14
909
- when ym < sprintf("%04d-%02d", 1977, 1); dt = Const::TT_TAI + 15
910
- when ym < sprintf("%04d-%02d", 1978, 1); dt = Const::TT_TAI + 16
911
- when ym < sprintf("%04d-%02d", 1979, 1); dt = Const::TT_TAI + 17
912
- when ym < sprintf("%04d-%02d", 1980, 1); dt = Const::TT_TAI + 18
913
- when ym < sprintf("%04d-%02d", 1981, 7); dt = Const::TT_TAI + 19
914
- when ym < sprintf("%04d-%02d", 1982, 7); dt = Const::TT_TAI + 20
915
- when ym < sprintf("%04d-%02d", 1983, 7); dt = Const::TT_TAI + 21
916
- when ym < sprintf("%04d-%02d", 1985, 7); dt = Const::TT_TAI + 22
917
- when ym < sprintf("%04d-%02d", 1988, 1); dt = Const::TT_TAI + 23
918
- end
919
- when 1986 <= year && year < 2005
920
- #t = y - 2000
921
- #dt = 63.86 + \
922
- # ( 0.3345 + \
923
- # (-0.060374 + \
924
- # ( 0.0017275 + \
925
- # ( 0.000651814 + \
926
- # ( 0.00002373599) \
927
- # * t) * t) * t) * t) * t
928
- # NICT Ver.
929
- case
930
- when ym < sprintf("%04d-%02d", 1988, 1); dt = Const::TT_TAI + 23
931
- when ym < sprintf("%04d-%02d", 1990, 1); dt = Const::TT_TAI + 24
932
- when ym < sprintf("%04d-%02d", 1991, 1); dt = Const::TT_TAI + 25
933
- when ym < sprintf("%04d-%02d", 1992, 7); dt = Const::TT_TAI + 26
934
- when ym < sprintf("%04d-%02d", 1993, 7); dt = Const::TT_TAI + 27
935
- when ym < sprintf("%04d-%02d", 1994, 7); dt = Const::TT_TAI + 28
936
- when ym < sprintf("%04d-%02d", 1996, 1); dt = Const::TT_TAI + 29
937
- when ym < sprintf("%04d-%02d", 1997, 7); dt = Const::TT_TAI + 30
938
- when ym < sprintf("%04d-%02d", 1999, 1); dt = Const::TT_TAI + 31
939
- when ym < sprintf("%04d-%02d", 2006, 1); dt = Const::TT_TAI + 32
940
- end
941
- when 2005 <= year && year < 2050
942
- case
943
- when ym < sprintf("%04d-%02d", 2006, 1); dt = Const::TT_TAI + 32
944
- when ym < sprintf("%04d-%02d", 2009, 1); dt = Const::TT_TAI + 33
945
- when ym < sprintf("%04d-%02d", 2012, 7); dt = Const::TT_TAI + 34
946
- when ym < sprintf("%04d-%02d", 2015, 7); dt = Const::TT_TAI + 35
947
- when ym < sprintf("%04d-%02d", 2017, 1); dt = Const::TT_TAI + 36
948
- when ym < sprintf("%04d-%02d", 2019, 1); dt = Const::TT_TAI + 37 # <= 第28回うるう秒実施までの暫定措置
949
- else
950
- t = y - 2000
951
- dt = 62.92 + \
952
- ( 0.32217 + \
953
- ( 0.005589) \
954
- * t) * t
955
- end
956
- when 2050 <= year && year <= 2150
957
- dt = -20 \
958
- + 32 * ((y - 1820) / 100.0) ** 2
959
- - 0.5628 * (2150 - y)
960
- when 2150 < year
961
- t = (y - 1820) / 100.0
962
- dt = -20 + 32 * t ** 2
963
- end
964
- return dt
813
+ ymd = sprintf("%04d%02d%02d", year, month, day)
814
+ tm = MkTime.new(ymd)
815
+ return tm.dt
965
816
  end
966
817
 
967
818
  #=========================================================================
data/lib/mk_calendar/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module MkCalendar
2
- VERSION = "0.2.6"
2
+ VERSION = "0.2.7"
3
3
  end
data/mk_calendar.gemspec CHANGED
@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
30
30
  spec.add_development_dependency "bundler", "~> 1.11"
31
31
  spec.add_development_dependency "rake", "~> 10.0"
32
32
  spec.add_development_dependency "rspec", "~> 3.0"
33
+ spec.add_development_dependency "mk_time", "~> 0.1"
33
34
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mk_calendar
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.6
4
+ version: 0.2.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - komasaru
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-07-20 00:00:00.000000000 Z
11
+ date: 2016-07-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -52,6 +52,20 @@ dependencies:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: '3.0'
55
+ - !ruby/object:Gem::Dependency
56
+ name: mk_time
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - "~>"
60
+ - !ruby/object:Gem::Version
61
+ version: '0.1'
62
+ type: :development
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - "~>"
67
+ - !ruby/object:Gem::Version
68
+ version: '0.1'
55
69
  description: MkCalendar is a calendar library including Japan's old-calendar.
56
70
  email:
57
71
  - masaru@mk-mode.com