mk_calendar 0.2.2 → 0.2.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/mk_calendar/compute.rb +50 -76
  3. data/lib/mk_calendar/const.rb +1 -0
  4. data/lib/mk_calendar/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 245ec15d039ea7e99949d6e8a1e38ef3e40ea990
4
- data.tar.gz: 48a3389966bbc7f4e67e276ebe6930ee59c78e37
3
+ metadata.gz: 5cbc93d3bd0b4d92eb0f039debe290c13ba57e18
4
+ data.tar.gz: b17ca80b4708dc24c6af667156e05a13b0475ae6
5
5
  SHA512:
6
- metadata.gz: 01f1304cd1263e3d1603f25d8c37bbb1a9f6fa1bfc16f828656908d7426390aa974f6ee665b7153a1ddd8ebd59a898f8aa604195eb597656e71a7781e5274fb9
7
- data.tar.gz: 400d22a3116766854a19acc318bb18d1507cbae780d4aa2726ba90cc32d32c9e8c292c11b5d2393727e916fb342c593a9150125446b548b9e9e3264b470e6c96
6
+ metadata.gz: 191b3e7c000f09f57dc4cb04026c24ff615d091e3f91195191ab56c7a7ad3ab30ad01cd9dc0084ef8d95741d2dd7a7432e9446094e44e65dfd7400aafd8be1f7
7
+ data.tar.gz: cc6bf5c2146e08148b6b5fd29575419d078718dd84812af299c173639e231205aad5d44126fb5b33faafd422097b306d2bb6db17a3cfbdd7b59f9e586d466f64
data/lib/mk_calendar/compute.rb CHANGED
@@ -809,13 +809,14 @@ module MkCalendar
809
809
  # @return: dt
810
810
  #=========================================================================
811
811
  def compute_dt(year, month, day)
812
- ymd = sprintf("%04d-%02d-%02d", year, month, day)
812
+ ym = sprintf("%04d-%02d", year, month)
813
+ y = year + (month - 0.5) / 12
813
814
  case
814
815
  when year < -500
815
- t = (year-1820) / 100.0
816
+ t = (y - 1820) / 100.0
816
817
  dt = -20 + 32 * t ** 2
817
818
  when -500 <= year && year < 500
818
- t = year / 100.0
819
+ t = y / 100.0
819
820
  dt = 10583.6
820
821
  (-1014.41 + \
821
822
  ( 33.78311 + \
@@ -825,7 +826,7 @@ module MkCalendar
825
826
  ( 0.0090316521) \
826
827
  * t) * t) * t) * t) * t) * t
827
828
  when 500 <= year && year < 1600
828
- t = (year - 1000) / 100.0
829
+ t = (y - 1000) / 100.0
829
830
  dt = 1574.2 + \
830
831
  (-556.01 + \
831
832
  ( 71.23472 + \
@@ -835,14 +836,14 @@ module MkCalendar
835
836
  ( 0.0083572073) \
836
837
  * t) * t) * t) * t) * t) * t
837
838
  when 1600 <= year && year < 1700
838
- t = year - 1600
839
+ t = y - 1600
839
840
  dt = 120 + \
840
841
  ( -0.9808 + \
841
842
  ( -0.01532 + \
842
843
  ( 1.0 / 7129.0) \
843
844
  * t) * t) * t
844
845
  when 1700 <= year && year < 1800
845
- t = year - 1700
846
+ t = y - 1700
846
847
  dt = 8.83 + \
847
848
  ( 0.1603 + \
848
849
  (-0.0059285 + \
@@ -850,7 +851,7 @@ module MkCalendar
850
851
  (-1.0 / 1174000.0) \
851
852
  * t) * t) * t) * t
852
853
  when 1800 <= year && year < 1860
853
- t = year - 1800
854
+ t = y - 1800
854
855
  dt = 13.72 + \
855
856
  (-0.332447 + \
856
857
  ( 0.0068612 + \
@@ -861,7 +862,7 @@ module MkCalendar
861
862
  ( 0.000000000875) \
862
863
  * t) * t) * t) * t) * t) * t) * t
863
864
  when 1860 <= year && year < 1900
864
- t = year - 1860
865
+ t = y - 1860
865
866
  dt = 7.62 + \
866
867
  ( 0.5737 + \
867
868
  (-0.251754 + \
@@ -870,7 +871,7 @@ module MkCalendar
870
871
  ( 1.0 / 233174.0) \
871
872
  * t) * t) * t) * t) * t
872
873
  when 1900 <= year && year < 1920
873
- t = year - 1900
874
+ t = y - 1900
874
875
  dt = -2.79 + \
875
876
  ( 1.494119 + \
876
877
  (-0.0598939 + \
@@ -878,14 +879,14 @@ module MkCalendar
878
879
  (-0.000197 ) \
879
880
  * t) * t) * t) * t
880
881
  when 1920 <= year && year < 1941
881
- t = year - 1920
882
+ t = y - 1920
882
883
  dt = 21.20 + \
883
884
  ( 0.84493 + \
884
885
  (-0.076100 + \
885
886
  ( 0.0020936) \
886
887
  * t) * t) * t
887
888
  when 1941 <= year && year < 1961
888
- t = year - 1950
889
+ t = y - 1950
889
890
  dt = 29.07 + \
890
891
  ( 0.407 + \
891
892
  (-1 / 233.0 + \
@@ -893,44 +894,31 @@ module MkCalendar
893
894
  * t) * t) * t
894
895
  when 1961 <= year && year < 1986
895
896
  case
896
- when ymd < sprintf("%04d-%02d-%02d", 1972, 1, 1)
897
- t = year - 1975
897
+ when ym < sprintf("%04d-%02d-%02d", 1972, 1, 1)
898
+ t = y - 1975
898
899
  dt = 45.45 + \
899
900
  ( 1.067 + \
900
901
  (-1 / 260.0 + \
901
902
  (-1 / 718.0) \
902
903
  * t) * t) * t
903
- when ymd < sprintf("%04d-%02d-%02d", 1972, 7, 1)
904
- dt = 32.184 + 10
905
- when ymd < sprintf("%04d-%02d-%02d", 1973, 1, 1)
906
- dt = 32.184 + 11
907
- when ymd < sprintf("%04d-%02d-%02d", 1974, 1, 1)
908
- dt = 32.184 + 12
909
- when ymd < sprintf("%04d-%02d-%02d", 1975, 1, 1)
910
- dt = 32.184 + 13
911
- when ymd < sprintf("%04d-%02d-%02d", 1976, 1, 1)
912
- dt = 32.184 + 14
913
- when ymd < sprintf("%04d-%02d-%02d", 1977, 1, 1)
914
- dt = 32.184 + 15
915
- when ymd < sprintf("%04d-%02d-%02d", 1978, 1, 1)
916
- dt = 32.184 + 16
917
- when ymd < sprintf("%04d-%02d-%02d", 1979, 1, 1)
918
- dt = 32.184 + 17
919
- when ymd < sprintf("%04d-%02d-%02d", 1980, 1, 1)
920
- dt = 32.184 + 18
921
- when ymd < sprintf("%04d-%02d-%02d", 1981, 7, 1)
922
- dt = 32.184 + 19
923
- when ymd < sprintf("%04d-%02d-%02d", 1982, 7, 1)
924
- dt = 32.184 + 20
925
- when ymd < sprintf("%04d-%02d-%02d", 1983, 7, 1)
926
- dt = 32.184 + 21
927
- when ymd < sprintf("%04d-%02d-%02d", 1985, 7, 1)
928
- dt = 32.184 + 22
929
- when ymd < sprintf("%04d-%02d-%02d", 1988, 1, 1)
930
- dt = 32.184 + 23
904
+ # NICT Ver.
905
+ when ym < sprintf("%04d-%02d", 1972, 7); dt = Const::TT_TAI + 10
906
+ when ym < sprintf("%04d-%02d", 1973, 1); dt = Const::TT_TAI + 11
907
+ when ym < sprintf("%04d-%02d", 1974, 1); dt = Const::TT_TAI + 12
908
+ when ym < sprintf("%04d-%02d", 1975, 1); dt = Const::TT_TAI + 13
909
+ when ym < sprintf("%04d-%02d", 1976, 1); dt = Const::TT_TAI + 14
910
+ when ym < sprintf("%04d-%02d", 1977, 1); dt = Const::TT_TAI + 15
911
+ when ym < sprintf("%04d-%02d", 1978, 1); dt = Const::TT_TAI + 16
912
+ when ym < sprintf("%04d-%02d", 1979, 1); dt = Const::TT_TAI + 17
913
+ when ym < sprintf("%04d-%02d", 1980, 1); dt = Const::TT_TAI + 18
914
+ when ym < sprintf("%04d-%02d", 1981, 7); dt = Const::TT_TAI + 19
915
+ when ym < sprintf("%04d-%02d", 1982, 7); dt = Const::TT_TAI + 20
916
+ when ym < sprintf("%04d-%02d", 1983, 7); dt = Const::TT_TAI + 21
917
+ when ym < sprintf("%04d-%02d", 1985, 7); dt = Const::TT_TAI + 22
918
+ when ym < sprintf("%04d-%02d", 1988, 1); dt = Const::TT_TAI + 23
931
919
  end
932
920
  when 1986 <= year && year < 2005
933
- # t = year - 2000
921
+ #t = y - 2000
934
922
  #dt = 63.86 + \
935
923
  # ( 0.3345 + \
936
924
  # (-0.060374 + \
@@ -938,42 +926,28 @@ module MkCalendar
938
926
  # ( 0.000651814 + \
939
927
  # ( 0.00002373599) \
940
928
  # * t) * t) * t) * t) * t
929
+ # NICT Ver.
941
930
  case
942
- when ymd < sprintf("%04d-%02d-%02d", 1988, 1, 1)
943
- dt = 32.184 + 23
944
- when ymd < sprintf("%04d-%02d-%02d", 1990, 1, 1)
945
- dt = 32.184 + 24
946
- when ymd < sprintf("%04d-%02d-%02d", 1991, 1, 1)
947
- dt = 32.184 + 25
948
- when ymd < sprintf("%04d-%02d-%02d", 1992, 7, 1)
949
- dt = 32.184 + 26
950
- when ymd < sprintf("%04d-%02d-%02d", 1993, 7, 1)
951
- dt = 32.184 + 27
952
- when ymd < sprintf("%04d-%02d-%02d", 1994, 7, 1)
953
- dt = 32.184 + 28
954
- when ymd < sprintf("%04d-%02d-%02d", 1996, 1, 1)
955
- dt = 32.184 + 29
956
- when ymd < sprintf("%04d-%02d-%02d", 1997, 7, 1)
957
- dt = 32.184 + 30
958
- when ymd < sprintf("%04d-%02d-%02d", 1999, 1, 1)
959
- dt = 32.184 + 31
960
- when ymd < sprintf("%04d-%02d-%02d", 2006, 1, 1)
961
- dt = 32.184 + 32
931
+ when ym < sprintf("%04d-%02d", 1988, 1); dt = Const::TT_TAI + 23
932
+ when ym < sprintf("%04d-%02d", 1990, 1); dt = Const::TT_TAI + 24
933
+ when ym < sprintf("%04d-%02d", 1991, 1); dt = Const::TT_TAI + 25
934
+ when ym < sprintf("%04d-%02d", 1992, 7); dt = Const::TT_TAI + 26
935
+ when ym < sprintf("%04d-%02d", 1993, 7); dt = Const::TT_TAI + 27
936
+ when ym < sprintf("%04d-%02d", 1994, 7); dt = Const::TT_TAI + 28
937
+ when ym < sprintf("%04d-%02d", 1996, 1); dt = Const::TT_TAI + 29
938
+ when ym < sprintf("%04d-%02d", 1997, 7); dt = Const::TT_TAI + 30
939
+ when ym < sprintf("%04d-%02d", 1999, 1); dt = Const::TT_TAI + 31
940
+ when ym < sprintf("%04d-%02d", 2006, 1); dt = Const::TT_TAI + 32
962
941
  end
963
942
  when 2005 <= year && year < 2050
964
943
  case
965
- when ymd < sprintf("%04d-%02d-%02d", 2006, 1, 1)
966
- dt = 32.184 + 32
967
- when ymd < sprintf("%04d-%02d-%02d", 2009, 1, 1)
968
- dt = 32.184 + 33
969
- when ymd < sprintf("%04d-%02d-%02d", 2012, 7, 1)
970
- dt = 32.184 + 34
971
- when ymd < sprintf("%04d-%02d-%02d", 2015, 7, 1)
972
- dt = 32.184 + 35
973
- when ymd < sprintf("%04d-%02d-%02d", 2017, 7, 1) # <= 第27回うるう秒実施までの暫定措置
974
- dt = 32.184 + 36
944
+ when ym < sprintf("%04d-%02d", 2006, 1); dt = Const::TT_TAI + 32
945
+ when ym < sprintf("%04d-%02d", 2009, 1); dt = Const::TT_TAI + 33
946
+ when ym < sprintf("%04d-%02d", 2012, 7); dt = Const::TT_TAI + 34
947
+ when ym < sprintf("%04d-%02d", 2015, 7); dt = Const::TT_TAI + 35
948
+ when ym < sprintf("%04d-%02d", 2018, 1); dt = Const::TT_TAI + 36 # <= 第27回うるう秒実施までの暫定措置
975
949
  else
976
- t = year - 2000
950
+ t = y - 2000
977
951
  dt = 62.92 + \
978
952
  ( 0.32217 + \
979
953
  ( 0.005589) \
@@ -981,10 +955,10 @@ module MkCalendar
981
955
  end
982
956
  when 2050 <= year && year <= 2150
983
957
  dt = -20 \
984
- + 32 * ((year - 1820) / 100.0) ** 2
985
- - 0.5628 * (2150 - year)
958
+ + 32 * ((y - 1820) / 100.0) ** 2
959
+ - 0.5628 * (2150 - y)
986
960
  when 2150 < year
987
- t = (year - 1820) / 100.0
961
+ t = (y - 1820) / 100.0
988
962
  dt = -20 + 32 * t ** 2
989
963
  end
990
964
  return dt
data/lib/mk_calendar/const.rb CHANGED
@@ -5,6 +5,7 @@ module MkCalendar
5
5
  PI = 3.141592653589793238462
6
6
  K = 0.017453292519943295
7
7
  JST_D = 0.375 # = 9.0 / 24.0
8
+ TT_TAI = 32.184
8
9
  YOBI = ["日", "月", "火", "水", "木", "金", "土"]
9
10
  ROKUYO = ["大安", "赤口", "先勝", "友引", "先負", "仏滅"]
10
11
  KANSHI = [
data/lib/mk_calendar/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module MkCalendar
2
- VERSION = "0.2.2"
2
+ VERSION = "0.2.3"
3
3
  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.2
4
+ version: 0.2.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - komasaru
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-06-10 00:00:00.000000000 Z
11
+ date: 2016-06-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler