when_exe 0.4.6 → 0.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (61) hide show
  1. checksums.yaml +5 -5
  2. data/LICENSE.ja.txt +8 -21
  3. data/LICENSE.txt +5 -27
  4. data/README.md +8 -63
  5. data/bin/make_ttl.rb +3 -2
  6. data/bin/make_ttl.rb.config +3 -3
  7. data/lib/when_exe.rb +8 -3
  8. data/lib/when_exe/basictypes.rb +1 -2
  9. data/lib/when_exe/calendarnote.rb +9 -5
  10. data/lib/when_exe/calendartypes.rb +4 -4
  11. data/lib/when_exe/coordinates.rb +14 -18
  12. data/lib/when_exe/ephemeris.rb +5 -6
  13. data/lib/when_exe/events.rb +7 -7
  14. data/lib/when_exe/google_api.rb +26 -31
  15. data/lib/when_exe/icalendar.rb +8 -8
  16. data/lib/when_exe/inspect.rb +3 -3
  17. data/lib/when_exe/linkeddata.rb +10 -2
  18. data/lib/when_exe/locales/locale.rb +2 -2
  19. data/lib/when_exe/parts/enumerator.rb +3 -3
  20. data/lib/when_exe/parts/geometric_complex.rb +2 -2
  21. data/lib/when_exe/parts/resource.rb +2 -2
  22. data/lib/when_exe/parts/timezone.rb +17 -29
  23. data/lib/when_exe/region/balinese.rb +5 -3
  24. data/lib/when_exe/region/chinese.rb +25 -3
  25. data/lib/when_exe/region/chinese/twins.rb +128 -5
  26. data/lib/when_exe/region/dee.rb +4 -4
  27. data/lib/when_exe/region/geologicalage.rb +137 -126
  28. data/lib/when_exe/region/hanke_henry.rb +4 -4
  29. data/lib/when_exe/region/indian.rb +73 -4
  30. data/lib/when_exe/region/international_fixed.rb +3 -3
  31. data/lib/when_exe/region/japanese.rb +9 -5
  32. data/lib/when_exe/region/japanese/epochs.rb +8 -4
  33. data/lib/when_exe/region/japanese/notes.rb +25 -7
  34. data/lib/when_exe/region/japanese/residues.rb +32 -10
  35. data/lib/when_exe/region/japanese/weeks.rb +7 -7
  36. data/lib/when_exe/region/korean.rb +17 -17
  37. data/lib/when_exe/region/saudi_arabian.rb +57 -0
  38. data/lib/when_exe/region/world.rb +3 -3
  39. data/lib/when_exe/timestandard.rb +7 -5
  40. data/lib/when_exe/tmobjects.rb +2 -2
  41. data/lib/when_exe/tmposition.rb +6 -4
  42. data/lib/when_exe/tmreference.rb +3 -3
  43. data/lib/when_exe/version.rb +3 -3
  44. data/test/events/example-datasets +0 -1
  45. data/test/events/japanese-holiday.csv +23 -6
  46. data/test/events/japanese-holiday.ttl +321 -151
  47. data/test/test/basictypes.rb +2 -2
  48. data/test/test/calendarnote.rb +2 -2
  49. data/test/test/coordinates.rb +6 -4
  50. data/test/test/ephemeris.rb +2 -2
  51. data/test/test/google_api.rb +45 -32
  52. data/test/test/inspect.rb +2 -2
  53. data/test/test/parts.rb +5 -5
  54. data/test/test/region/christian.rb +7 -7
  55. data/test/test/region/indian.rb +14 -1
  56. data/test/test/region/islamic.rb +11 -1
  57. data/test/test/region/japanese.rb +3 -3
  58. data/test/test/region/m17n.rb +2 -2
  59. data/test/test/region/reforms.rb +2 -2
  60. data/test/test/tmposition.rb +7 -7
  61. metadata +7 -8
data/lib/when_exe/region/chinese.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  =begin
3
- Copyright (C) 2011-2016 Takashi SUGA
3
+ Copyright (C) 2011-2021 Takashi SUGA
4
4
 
5
5
  You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
6
6
  =end
@@ -636,6 +636,28 @@ module When
636
636
  end
637
637
  end
638
638
 
639
+ # 経朔 - 定朔 ( U 方式 - Chinese-Uighur)
640
+ def _anomaly_u(mean_lunation, year, solar_unit, mean_motion)
641
+
642
+ # 遅速差(月の中心差) / (日 / 1_0000)
643
+ @approx_anomalistic_month_length ||= (@anomalistic_month_length / @lunar_unit) / 9
644
+ l_lunar = mean_lunation - @year_length / 6 # 暦元を雨水に変更
645
+ l_lunar = (l_lunar + @anomalistic_month_shift - @anomalistic_month_length * 13 *
646
+ (l_lunar / @year_length).floor) % @approx_anomalistic_month_length
647
+ sign, angle = (l_lunar * 9).divmod(124)
648
+ angle = angle.floor
649
+ lunar_anomaly = angle * (124 - angle)
650
+ lunar_anomaly = -lunar_anomaly unless sign == 1
651
+
652
+ # 盈縮差(太陽の中心差) / (日 / 1_0000)
653
+ l_solar = mean_lunation % @year_length
654
+ sign, angle = l_solar.floor.divmod(182)
655
+ solar_anomaly = (angle * (182 - angle) * 2.0 / 9).floor
656
+ solar_anomaly = -solar_anomaly unless sign == 1
657
+
658
+ (solar_anomaly + lunar_anomaly) / 10000.0
659
+ end
660
+
639
661
  # 中心差およびその時間微分
640
662
  def equation_of_centre(mean_anomaly, table, differential=0)
641
663
  table.each do |range, base, *coefficients|
@@ -663,8 +685,8 @@ module When
663
685
  @anomaly_precision = (@anomaly_precision || 1.0E-5).to_f # c 方式 での収束判定誤差 / 日
664
686
  @solar_weight = (@solar_weight || 0 ).to_i # (経朔-定朔)の計算で用いる実行差での太陽盈縮の重み(0:非考慮,1:考慮)
665
687
  @lunar_unit = @lunar_unit.to_f # 太陰遅速計算用招差法定数の時間の単位(限)
666
- @m = _rissei_j(@m) # 太陰遅速計算用招差法定数
667
- @s = _rissei_j(@s) # 太陽盈縮計算用招差法定数
688
+ @m = _rissei_j(@m) if @m # 太陰遅速計算用招差法定数
689
+ @s = _rissei_j(@s) if @s # 太陽盈縮計算用招差法定数
668
690
  end
669
691
 
670
692
  # 招差法用の表の生成
data/lib/when_exe/region/chinese/twins.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  =begin
3
- Copyright (C) 2011-2015 Takashi SUGA
3
+ Copyright (C) 2011-2021 Takashi SUGA
4
4
 
5
5
  You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
6
6
  =end
@@ -37,7 +37,8 @@ module When
37
37
  ['[正元暦=]784.01.01', '@CR', '784-01-01^ChineseTwin::正元暦', '807-01-01'],
38
38
  ['[宣明暦]822.01.01', '@CR', '822-01-01^ChineseTwin::宣明暦'],
39
39
  ['[崇玄暦=]893.01.01', '@CR', '893-01-01^ChineseTwin::崇玄暦', '956-01-01'],
40
- ['[授時暦]1281.01.01', '@CR','1281-01-01^ChineseTwin::授時暦'],
40
+ ['[古授時暦=]1281.01.01','@CR','1281-01-01^ChineseTwin::古授時暦'],
41
+ ['[授時暦]1284.01.01', '@CR','1284-01-01^ChineseTwin::授時暦'],
41
42
  ['[大統暦]1368.01.01', '@CR','1368-01-01^ChineseTwin::大統暦', '1645-01-01']
42
43
  ]]
43
44
 
@@ -68,7 +69,8 @@ module When
68
69
  ['[正元暦=]783.12.26', '@CR', '783-12-26^ChineseTwin::正元暦(節月)', '807-01-11'],
69
70
  ['[宣明暦]821.01.01', '@CR', '821-01-01^ChineseTwin::宣明暦(節月)'], # 年の始めに遡って開始(実際は12.27)
70
71
  ['[崇玄暦=]892.12.22', '@CR', '892-12-22^ChineseTwin::崇玄暦(節月)', '956-01-15'],
71
- ['[授時暦]1280.01.01', '@CR', '1280-01-01^ChineseTwin::授時暦(節月)'],
72
+ ['[古授時暦=]1280.01.01','@CR','1280-01-01^ChineseTwin::古授時暦(節月)'],
73
+ ['[授時暦]1283.12.21', '@CR', '1283-12-21^ChineseTwin::授時暦(節月)'],
72
74
  ['[大統暦]1367.12.24', '@CR', '1367-12-24^ChineseTwin::大統暦(節月)', '1644-12-24']
73
75
  ]]
74
76
  end
@@ -103,6 +105,24 @@ module When
103
105
  ]
104
106
  }
105
107
 
108
+ _chinese_revision ={
109
+ 'lunation_shift' => 20.2050, # 閏應(暦元前経朔から暦元天正冬至までの日数)
110
+ 'anomalistic_month_shift' => 13.0205 # 転應(暦元前近/遠地点通過から暦元天正冬至までの日数)
111
+ }
112
+
113
+ _chinese_uighur ={
114
+ 'day_epoch' => 2182717.1106, # 暦元天正冬至のユリウス日
115
+ 'year_epoch' => 1264, # 暦元の西暦年
116
+ 'year_length' => 365.2436, # 暦元の冬至年 / 日
117
+ 'lunation_length' => 29.5306, # 朔実(朔望月)
118
+ 'lunation_shift' => 12.6549, # 閏應(暦元前経朔から暦元天正冬至までの日数)
119
+ 'anomalistic_month_length' => 27.5546, # 転終(近点月)
120
+ 'anomalistic_month_shift' => 23.2836, # 転終應(暦元雨水前近地点通過から暦元雨水前経朔までの日数)
121
+ 'anomaly_method' => 'u', # (経朔-定朔)の計算方法(u:Chinese-Uighur)
122
+ 'lunar_unit' => 27.5546 / 248, # 太陰遅速計算用招差法定数の時間の単位(限)
123
+ 'solar_weight' => 0, # (経朔-定朔)の計算で用いる実行差での太陽盈縮の重み(0:非考慮,1:考慮)
124
+ }
125
+
106
126
  ChineseTwin = [{}, When::BasicTypes::M17n, ChineseSolar.twin('ChineseTwin', [
107
127
  "locale:[=ja:, en=en:, alias]",
108
128
  "area:[中国,China]",
@@ -776,7 +796,98 @@ module When
776
796
  ],
777
797
 
778
798
  [ChineseLuniSolar,
779
- 'name:[授時暦]',
799
+ 'name:[重修大明暦=]',
800
+ 'time_basis:+00,+#{P:06:30}',
801
+ {'formula'=>['12S', '1L'].map {|f| [
802
+ Ephemeris::ChineseTrueLunation, {
803
+ 'formula' => f,
804
+ 'day_epoch' => -32372914549,
805
+ 'year_length' => '1910224/5230', # 365.0+1274/5230(日法)
806
+ 'lunation_length' => '154445/5230', # 29.0+2775/5230
807
+ 'anomalistic_month_length' => '1441106066/52300000', # 27.0+2900.6066(轉終日)/5230
808
+ 'denominator' => 5230,
809
+ 'rissei' => 'c',
810
+ 's' => [
811
+ # 盈縮分 朓朒積
812
+ [ 0*0.523, 0], # 冬至
813
+ [ -7059*0.523, +276], # 小寒
814
+ [-12979*0.523, +508], # 大寒
815
+ [-17697*0.523, +693], # 立春
816
+ [-21150*0.523, +828], # 雨水
817
+ [-23276*0.523, +911], # 啓蟄
818
+ [-24015*0.523, +940], # 春分
819
+ [-23276*0.523, +911], # 清明
820
+ [-21150*0.523, +828], # 穀雨
821
+ [-17697*0.523, +693], # 立夏
822
+ [-12979*0.523, +508], # 小満
823
+ [ -7059*0.523, +276], # 芒種
824
+ [ 0*0.523, 0], # 夏至
825
+ [ +7059*0.523, -276], # 小暑
826
+ [+12979*0.523, -508], # 大暑
827
+ [+17697*0.523, -693], # 立秋
828
+ [+21150*0.523, -828], # 処暑
829
+ [+23276*0.523, -911], # 白露
830
+ [+24015*0.523, -940], # 秋分
831
+ [+23276*0.523, -911], # 寒露
832
+ [+21150*0.523, -828], # 霜降
833
+ [+17697*0.523, -693], # 立冬
834
+ [+12979*0.523, -508], # 小雪
835
+ [ +7059*0.523, -276], # 大雪
836
+ ],
837
+ 'm' => [
838
+ #(変日差) 損益率
839
+ [ 5230.0, -513], # １日
840
+ [ 5230.0, -469], # ２日
841
+ [ 5230.0, -411], # ３日
842
+ [ 5230.0, -332], # ４日
843
+ [ 5230.0, -343], # ５日
844
+ [ 5230.0, -141], # ６日
845
+ [ 4647.65, -43], # ７日
846
+ [ 582.35, +4], # ７日
847
+ [ 5230.0, +63], # ８日
848
+ [ 5230.0, +164], # ９日
849
+ [ 5230.0, +258], # 10日
850
+ [ 5230.0, +352], # 11日
851
+ [ 5230.0, +427], # 12日
852
+ [ 5230.0, +481], # 13日
853
+ [ 4065.30, +403], # 14日
854
+ [ 1164.70, +117], # 14日
855
+ [ 5230.0, +505], # 15日
856
+ [ 5230.0, +462], # 16日
857
+ [ 5230.0, +395], # 17日
858
+ [ 5230.0, +309], # 18日
859
+ [ 5230.0, +219], # 19日
860
+ [ 5230.0, +117], # 20日
861
+ [ 3482.95, +27], # 21日
862
+ [ 1747.05, -11], # 21日
863
+ [ 5230.0, -86], # 22日
864
+ [ 5230.0, -184], # 23日
865
+ [ 5230.0, -278], # 24日
866
+ [ 5230.0, -368], # 25日
867
+ [ 5230.0, -438], # 26日
868
+ [ 5230.0, -493], # 27日
869
+ [ 2900.6066,-293] # 28日
870
+ ]
871
+ }]
872
+ }
873
+ }
874
+ ],
875
+
876
+ [ChineseLuniSolar,
877
+ 'name:[キタイ暦=https://www2.nao.ac.jp/~mitsurusoma/gendai5/26_suga.pdf]',
878
+ 'time_basis:+00,+#{P:06}',
879
+ {'formula'=>['12S', '1L'].map {|f| [
880
+ Ephemeris::ChineseTrueLunation, _chinese_uighur.merge({
881
+ 'formula' => f,
882
+ 'year_delta' => 0, # 冬至年の変化率 / (10^(-6)日/年)
883
+ 'year_span' => 1 # 冬至年の改訂周期 / 年
884
+ })]
885
+ }
886
+ }
887
+ ],
888
+
889
+ [ChineseLuniSolar,
890
+ 'name:[古授時暦]',
780
891
  {'formula'=>['12S', '1L'].map {|f| [
781
892
  Ephemeris::ChineseTrueLunation, _chinese_common.merge({
782
893
  'formula' => f,
@@ -787,10 +898,22 @@ module When
787
898
  }
788
899
  ],
789
900
 
901
+ [ChineseLuniSolar,
902
+ 'name:[授時暦]',
903
+ {'formula'=>['12S', '1L'].map {|f| [
904
+ Ephemeris::ChineseTrueLunation, _chinese_common.merge(_chinese_revision).merge({
905
+ 'formula' => f,
906
+ 'year_delta' => 1, # 冬至年の変化率 / (10^(-6)日/年)
907
+ 'year_span' => 100 # 冬至年の改訂周期 / 年
908
+ })]
909
+ }
910
+ }
911
+ ],
912
+
790
913
  [ChineseLuniSolar,
791
914
  'name:[大統暦]',
792
915
  {'formula'=>['12S', '1L'].map {|f| [
793
- Ephemeris::ChineseTrueLunation, _chinese_common.merge({
916
+ Ephemeris::ChineseTrueLunation, _chinese_common.merge(_chinese_revision).merge({
794
917
  'formula' => f,
795
918
  'year_delta' => 0, # 冬至年の変化率 / (10^(-6)日/年)
796
919
  'year_span' => 1 # 冬至年の改訂周期 / 年
data/lib/when_exe/region/dee.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  =begin
3
- Copyright (C) 2014 Takashi SUGA
3
+ Copyright (C) 2014-2016 Takashi SUGA
4
4
 
5
5
  You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
6
6
  =end
@@ -10,10 +10,10 @@ module When
10
10
  class BasicTypes::M17n
11
11
 
12
12
  Dee = [self, [
13
- "namespace:[en=http://www.hermetic.ch/cal_stud/]",
13
+ "namespace:[en=http://calendars.wikia.com/wiki/]",
14
14
  "locale:[=en:, ja]",
15
- "names:[Dee=en:dee-cecil-calendar.htm, ディー暦=]",
16
- "[DeeCecil=en:dee-cecil-calendar.htm, ディー-セシル暦=]"
15
+ "names:[Dee=en:Dee_calendar, ディー暦=]",
16
+ "[DeeCecil=en:Dee-Cecil_calendar, ディー-セシル暦=]"
17
17
  ]]
18
18
  end
19
19
 
data/lib/when_exe/region/geologicalage.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  =begin
3
- Copyright (C) 2011-2015 Takashi SUGA
3
+ Copyright (C) 2011-2020 Takashi SUGA
4
4
 
5
5
  You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
6
6
  =end
@@ -8,7 +8,7 @@
8
8
  class When::TM::OrdinalReferenceSystem
9
9
 
10
10
  #
11
- # Geological Ages
11
+ # Geological Ages - http://www.stratigraphy.org/ICSchart/ChronostratChart2020-01.pdf
12
12
  #
13
13
  GeologicalAge = [self, [
14
14
  "locale:[=ja:, *en=en:]",
@@ -82,10 +82,10 @@ class When::TM::OrdinalReferenceSystem
82
82
  ],
83
83
  [When::TM::OrdinalEra,
84
84
  "*period:[クリオジェニアン,Cryogenian]",
85
- "begin:-850_000_000-"
85
+ "begin:-720_000_000-"
86
86
  ],
87
87
  [When::TM::OrdinalEra,
88
- "*period:[エディアカラ紀,Ediacaran]",
88
+ "*period:[エディアカラン,Ediacaran]",
89
89
  "begin:-635_000_000-"
90
90
  ]
91
91
  ]
@@ -97,55 +97,55 @@ class When::TM::OrdinalReferenceSystem
97
97
  [When::TM::OrdinalEra,
98
98
  "*period:[カンブリア紀,Cambrian]",
99
99
  [When::TM::OrdinalEra,
100
- "*epoch:[テレニュービアン=,Terreneuvian=]",
100
+ "*epoch:[テレニュービアン=,Terreneuvian]",
101
101
  [When::TM::OrdinalEra,
102
- "*age:[フォルツニアン=,Fortunian=]",
103
- "begin:-542_000_000-"
102
+ "*age:[フォルツニアン=,Fortunian]",
103
+ "begin:-541_000_000-"
104
104
  ],
105
105
  [When::TM::OrdinalEra,
106
- "*age:[第2期=,Age_2=]",
107
- "begin:-528_000_000-"
106
+ "*age:[第2期=,Age_2=en_wiki:Cambrian_Stage_2]",
107
+ "begin:-529_000_000-"
108
108
  ]
109
109
  ],
110
110
  [When::TM::OrdinalEra,
111
- "*epoch:[第2世=,Epoch_2=]",
111
+ "*epoch:[第2世=,Epoch_2=en_wiki:Cambrian_Series_2]",
112
112
  [When::TM::OrdinalEra,
113
- "*age:[第3期=,Age_3=]",
113
+ "*age:[第3期=,Age_3=en_wiki:Cambrian_Stage_3]",
114
114
  "begin:-521_000_000-"
115
115
  ],
116
116
  [When::TM::OrdinalEra,
117
- "*age:[第4期=,Age_4=]",
118
- "begin:-515_000_000-"
117
+ "*age:[第4期=,Age_4=en_wiki:Cambrian_Stage_4]",
118
+ "begin:-514_000_000-"
119
119
  ],
120
120
  ],
121
121
  [When::TM::OrdinalEra,
122
- "*epoch:[第3世=,Epoch_3=]",
122
+ "*epoch:[ミャオリンギアン=,Miaolingian]",
123
123
  [When::TM::OrdinalEra,
124
- "*age:[第5期=,Age_5=]",
125
- "begin:-510_000_000-"
124
+ "*age:[ウリウアン=,Wuliuan]",
125
+ "begin:-509_000_000-"
126
126
  ],
127
127
  [When::TM::OrdinalEra,
128
- "*age:[ドルミアン=,Drumian=]",
129
- "begin:-506_500_000-"
128
+ "*age:[ドルミアン=,Drumian]",
129
+ "begin:-504_500_000-"
130
130
  ],
131
131
  [When::TM::OrdinalEra,
132
- "*age:[グザンギアン=,Guzhangian=]",
133
- "begin:-500_300_000-"
132
+ "*age:[グザンギアン=,Guzhangian]",
133
+ "begin:-500_500_000-"
134
134
  ]
135
135
  ],
136
136
  [When::TM::OrdinalEra,
137
137
  "*epoch:[フロンギアン=,Furongian]",
138
138
  [When::TM::OrdinalEra,
139
139
  "*age:[パイビアン=,Paibian]",
140
- "begin:-499_000_000-"
140
+ "begin:-497_000_000-"
141
141
  ],
142
142
  [When::TM::OrdinalEra,
143
- "*age:[第9期=,Age_9=]",
144
- "begin:-496_000_000-"
143
+ "*age:[ジャングシャニアン=,Jiangshanian]",
144
+ "begin:-494_000_000-"
145
145
  ],
146
146
  [When::TM::OrdinalEra,
147
- "*age:[第10期=,Age_10=]",
148
- "begin:-492_000_000-"
147
+ "*age:[第10期=,Age_10=en_wiki:Cambrian_Stage_10]",
148
+ "begin:-489_500_000-"
149
149
  ]
150
150
  ]
151
151
  ],
@@ -155,37 +155,37 @@ class When::TM::OrdinalReferenceSystem
155
155
  "*epoch:[前期=,Early_Ordovician]",
156
156
  [When::TM::OrdinalEra,
157
157
  "*age:[トレマドック=,Tremadocian]",
158
- "begin:-488_300_000-"
158
+ "begin:-485_400_000-"
159
159
  ],
160
160
  [When::TM::OrdinalEra,
161
161
  "*age:[フロイアン=,Floian]",
162
- "begin:-478_600_000-"
162
+ "begin:-477_700_000-"
163
163
  ]
164
164
  ],
165
165
  [When::TM::OrdinalEra,
166
166
  "*epoch:[中期=,Middle_Ordovician]",
167
167
  [When::TM::OrdinalEra,
168
168
  "*age:[ダピンギアン=,Dapingian]",
169
- "begin:-471_800_000-"
169
+ "begin:-470_000_000-"
170
170
  ],
171
171
  [When::TM::OrdinalEra,
172
172
  "*age:[ダーリウィリアン=,Darriwilian]",
173
- "begin:-468_100_000-"
173
+ "begin:-467_300_000-"
174
174
  ]
175
175
  ],
176
176
  [When::TM::OrdinalEra,
177
177
  "*epoch:[後期=,Late_Ordovician]",
178
178
  [When::TM::OrdinalEra,
179
179
  "*age:[サンドビアン=,Sandbian]",
180
- "begin:-460_900_000-"
180
+ "begin:-458_400_000-"
181
181
  ],
182
182
  [When::TM::OrdinalEra,
183
183
  "*age:[カティアン=,Katian]",
184
- "begin:-455_800_000-"
184
+ "begin:-453_000_000-"
185
185
  ],
186
186
  [When::TM::OrdinalEra,
187
187
  "*age:[ヒルナンティアン=,Hirnantian]",
188
- "begin:-445_600_000-"
188
+ "begin:-445_200_000-"
189
189
  ]
190
190
  ]
191
191
  ],
@@ -195,42 +195,42 @@ class When::TM::OrdinalReferenceSystem
195
195
  "*epoch:[ランドベリ=,Llandovery]",
196
196
  [When::TM::OrdinalEra,
197
197
  "*age:[ルダニアン=,Rhuddanian]",
198
- "begin:-443_700_000-"
198
+ "begin:-443_800_000-"
199
199
  ],
200
200
  [When::TM::OrdinalEra,
201
201
  "*age:[アエロニアン=,Aeronian]",
202
- "begin:-439_000_000-"
202
+ "begin:-440_800_000-"
203
203
  ],
204
204
  [When::TM::OrdinalEra,
205
205
  "*age:[テリチアン=,Telychian]",
206
- "begin:-436_000_000-"
206
+ "begin:-438_500_000-"
207
207
  ]
208
208
  ],
209
209
  [When::TM::OrdinalEra,
210
210
  "*epoch:[ウェンロック=,Wenlock]",
211
211
  [When::TM::OrdinalEra,
212
212
  "*age:[シェインウッディアン=,Sheinwoodian]",
213
- "begin:-428_200_000-"
213
+ "begin:-433_400_000-"
214
214
  ],
215
215
  [When::TM::OrdinalEra,
216
216
  "*age:[ホメリアン=,Homerian]",
217
- "begin:-432_620_000-"
217
+ "begin:-430_500_000-"
218
218
  ]
219
219
  ],
220
220
  [When::TM::OrdinalEra,
221
221
  "*epoch:[ラドロウ=,Ludlow]",
222
222
  [When::TM::OrdinalEra,
223
223
  "*age:[ゴースティアン=,Gorstian]",
224
- "begin:-422_900_000-"
224
+ "begin:-427_400_000-"
225
225
  ],
226
226
  [When::TM::OrdinalEra,
227
227
  "*age:[ルドフォーディアン=,Ludfordian]",
228
- "begin:-421_300_000-"
228
+ "begin:-425_600_000-"
229
229
  ]
230
230
  ],
231
231
  [When::TM::OrdinalEra,
232
232
  "*epoch:[プリドリ=,Pridoli=en_wiki:Pridoli_epoch#Pridoli]",
233
- "begin:-418_700_000-"
233
+ "begin:-423_000_000-"
234
234
  ]
235
235
  ],
236
236
  [When::TM::OrdinalEra,
@@ -239,74 +239,74 @@ class When::TM::OrdinalReferenceSystem
239
239
  "*epoch:[前期=,Early_Devonian]",
240
240
  [When::TM::OrdinalEra,
241
241
  "*age:[ロホコビアン=,Lochkovian]",
242
- "begin:-416_000_000-"
242
+ "begin:-419_200_000-"
243
243
  ],
244
244
  [When::TM::OrdinalEra,
245
245
  "*age:[プラーギアン=,Pragian]",
246
- "begin:-411_200_000-"
246
+ "begin:-410_800_000-"
247
247
  ],
248
248
  [When::TM::OrdinalEra,
249
249
  "*age:[エムシアン=,Emsian]",
250
- "begin:-407_000_000-"
250
+ "begin:-407_600_000-"
251
251
  ]
252
252
  ],
253
253
  [When::TM::OrdinalEra,
254
254
  "*epoch:[中期=,Middle_Devonian]",
255
255
  [When::TM::OrdinalEra,
256
256
  "*age:[アイフェリアン=,Eifelian]",
257
- "begin:-397_500_000-"
257
+ "begin:-393_300_000-"
258
258
  ],
259
259
  [When::TM::OrdinalEra,
260
260
  "*age:[ジベーティアン=,Givetian]",
261
- "begin:-391_800_000-"
261
+ "begin:-387_700_000-"
262
262
  ]
263
263
  ],
264
264
  [When::TM::OrdinalEra,
265
265
  "*epoch:[後期=,Late_Devonian]",
266
266
  [When::TM::OrdinalEra,
267
267
  "*age:[フラスニアン=,Frasnian]",
268
- "begin:-385_300_000-"
268
+ "begin:-382_700_000-"
269
269
  ],
270
270
  [When::TM::OrdinalEra,
271
271
  "*age:[ファメニアン=,Famennian]",
272
- "begin:-374_500_000-"
272
+ "begin:-372_200_000-"
273
273
  ]
274
274
  ]
275
275
  ],
276
276
  [When::TM::OrdinalEra,
277
277
  "*period:[石炭紀,Carboniferous]",
278
278
  [When::TM::OrdinalEra,
279
- "*subperiod:[ミシシッピ紀=,Mississippian]",
279
+ "*subperiod:[ミシシッピアン=,Mississippian]",
280
280
  [When::TM::OrdinalEra,
281
281
  "*age:[トゥルネージアン=,Tournaisian]",
282
- "begin:-359_200_000-"
282
+ "begin:-358_900_000-"
283
283
  ],
284
284
  [When::TM::OrdinalEra,
285
285
  "*age:[ヴィゼアン=,Visean]",
286
- "begin:-345_300_000-"
286
+ "begin:-346_700_000-"
287
287
  ],
288
288
  [When::TM::OrdinalEra,
289
289
  "*age:[サープコビアン=,Serpukhovian]",
290
- "begin:-328_300_000-"
290
+ "begin:-330_900_000-"
291
291
  ]
292
292
  ],
293
293
  [When::TM::OrdinalEra,
294
- "*subperiod:[ペンシルバニア紀=,Pennsylvanian]",
294
+ "*subperiod:[ペンシルバニアン=,Pennsylvanian]",
295
295
  [When::TM::OrdinalEra,
296
296
  "*age:[バシュキーリアン=,Bashkirian]",
297
- "begin:-318_100_000-"
297
+ "begin:-323_200_000-"
298
298
  ],
299
299
  [When::TM::OrdinalEra,
300
300
  "*age:[モスコビアン=,Moscovian]",
301
- "begin:-311_700_000-"
301
+ "begin:-315_200_000-"
302
302
  ],
303
303
  [When::TM::OrdinalEra,
304
304
  "*age:[カシモービアン=,Kasimovian]",
305
- "begin:-307_200_000-"
305
+ "begin:-307_000_000-"
306
306
  ],
307
307
  [When::TM::OrdinalEra,
308
308
  "*age:[グゼーリアン=,Gzhelian]",
309
- "begin:-303_400_000-"
309
+ "begin:-303_700_000-"
310
310
  ]
311
311
  ]
312
312
  ],
@@ -316,45 +316,45 @@ class When::TM::OrdinalReferenceSystem
316
316
  "*epoch:[キスラリアン=,Cisuralian]",
317
317
  [When::TM::OrdinalEra,
318
318
  "*age:[アッセリアン=,Asselian]",
319
- "begin:-299_000_000-"
319
+ "begin:-298_900_000-"
320
320
  ],
321
321
  [When::TM::OrdinalEra,
322
322
  "*age:[サクマーリアン=,Sakmarian]",
323
- "begin:-294_600_000-"
323
+ "begin:-293_520_000-"
324
324
  ],
325
325
  [When::TM::OrdinalEra,
326
326
  "*age:[アルチンスキアン=,Artinskian]",
327
- "begin:-284_400_000-"
327
+ "begin:-290_100_000-"
328
328
  ],
329
329
  [When::TM::OrdinalEra,
330
330
  "*age:[クングーリアン=,Kungurian]",
331
- "begin:-275_600_000-"
331
+ "begin:-283_500_000-"
332
332
  ]
333
333
  ],
334
334
  [When::TM::OrdinalEra,
335
335
  "*epoch:[ガダリューピアン=,Guadalupian]",
336
336
  [When::TM::OrdinalEra,
337
337
  "*age:[ローディアン=,Roadian]",
338
- "begin:-270_600_000-"
338
+ "begin:-272_950_000-"
339
339
  ],
340
340
  [When::TM::OrdinalEra,
341
341
  "*age:[ワーディアン=,Wordian]",
342
- "begin:-268_000_000-"
342
+ "begin:-268_800_000-"
343
343
  ],
344
344
  [When::TM::OrdinalEra,
345
345
  "*age:[カピタニアン=,Capitanian]",
346
- "begin:-265_800_000-"
346
+ "begin:-265_100_000-"
347
347
  ]
348
348
  ],
349
349
  [When::TM::OrdinalEra,
350
350
  "*epoch:[ロピンギアン=,Lopingian]",
351
351
  [When::TM::OrdinalEra,
352
352
  "*age:[ウキアピンギアン=,Wuchiapingian]",
353
- "begin:-260_400_000-"
353
+ "begin:-259_100_000-"
354
354
  ],
355
355
  [When::TM::OrdinalEra,
356
356
  "*age:[チャンシンギアン=,Changhsingian]",
357
- "begin:-253_800_000-"
357
+ "begin:-254_140_000-"
358
358
  ]
359
359
  ]
360
360
  ]
@@ -367,37 +367,37 @@ class When::TM::OrdinalReferenceSystem
367
367
  "*epoch:[前期=,Early_Triassic]",
368
368
  [When::TM::OrdinalEra,
369
369
  "*age:[インドゥアン=,Induan]",
370
- "begin:-251_000_000-"
370
+ "begin:-251_902_000-"
371
371
  ],
372
372
  [When::TM::OrdinalEra,
373
373
  "*age:[オレネキアン=,Olenekian]",
374
- "begin:-249_500_000-"
374
+ "begin:-251_200_000-"
375
375
  ]
376
376
  ],
377
377
  [When::TM::OrdinalEra,
378
378
  "*epoch:[中期=,Middle_Triassic]",
379
379
  [When::TM::OrdinalEra,
380
380
  "*age:[アニシアン=,Anisian]",
381
- "begin:-245_900_000-"
381
+ "begin:-247_200_000-"
382
382
  ],
383
383
  [When::TM::OrdinalEra,
384
384
  "*age:[ラディニアン=,Ladinian]",
385
- "begin:-237_000_000-"
385
+ "begin:-242_000_000-"
386
386
  ]
387
387
  ],
388
388
  [When::TM::OrdinalEra,
389
389
  "*epoch:[後期=,Late_Triassic]",
390
390
  [When::TM::OrdinalEra,
391
391
  "*age:[カーニアン=,Carnian]",
392
- "begin:-228_700_000-"
392
+ "begin:-237_000_000-"
393
393
  ],
394
394
  [When::TM::OrdinalEra,
395
395
  "*age:[ノーリアン=,Norian]",
396
- "begin:-216_500_000-"
396
+ "begin:-227_000_000-"
397
397
  ],
398
398
  [When::TM::OrdinalEra,
399
399
  "*age:[レーティアン=,Rhaetian]",
400
- "begin:-203_600_000-"
400
+ "begin:-208_500_000-"
401
401
  ]
402
402
  ]
403
403
  ],
@@ -407,53 +407,53 @@ class When::TM::OrdinalReferenceSystem
407
407
  "*epoch:[前期=,Early_Jurassic]",
408
408
  [When::TM::OrdinalEra,
409
409
  "*age:[ヘッタンジアン=,Hettangian]",
410
- "begin:-199_600_000-"
410
+ "begin:-201_300_000-"
411
411
  ],
412
412
  [When::TM::OrdinalEra,
413
413
  "*age:[シネムーリアン=,Sinemurian]",
414
- "begin:-196_500_000-"
414
+ "begin:-199_300_000-"
415
415
  ],
416
416
  [When::TM::OrdinalEra,
417
417
  "*age:[プリンスバッキアン=,Pliensbachian]",
418
- "begin:-189_600_000-"
418
+ "begin:-190_800_000-"
419
419
  ],
420
420
  [When::TM::OrdinalEra,
421
421
  "*age:[トアルシアン=,Toarcian]",
422
- "begin:-183_000_000-"
422
+ "begin:-182_700_000-"
423
423
  ]
424
424
  ],
425
425
  [When::TM::OrdinalEra,
426
426
  "*epoch:[中期=,Middle_Jurassic]",
427
427
  [When::TM::OrdinalEra,
428
428
  "*age:[アーレニアン=,Aalenian]",
429
- "begin:-175_600_000-"
429
+ "begin:-174_100_000-"
430
430
  ],
431
431
  [When::TM::OrdinalEra,
432
432
  "*age:[バジョシアン=,Bajocian]",
433
- "begin:-171_600_000-"
433
+ "begin:-170_300_000-"
434
434
  ],
435
435
  [When::TM::OrdinalEra,
436
436
  "*age:[バトニアン=,Bathonian]",
437
- "begin:-167_700_000-"
437
+ "begin:-168_300_000-"
438
438
  ],
439
439
  [When::TM::OrdinalEra,
440
440
  "*age:[カロビアン=,Callovian]",
441
- "begin:-164_700_000-"
441
+ "begin:-166_100_000-"
442
442
  ]
443
443
  ],
444
444
  [When::TM::OrdinalEra,
445
445
  "*epoch:[後期=,Late_Jurassic]",
446
446
  [When::TM::OrdinalEra,
447
447
  "*age:[オクスフォーディアン=,Oxfordian]",
448
- "begin:-161_200_000-"
448
+ "begin:-163_500_000-"
449
449
  ],
450
450
  [When::TM::OrdinalEra,
451
451
  "*age:[キンメリッジアン=,Kimmeridgian]",
452
- "begin:-155_600_000-"
452
+ "begin:-157_300_000-"
453
453
  ],
454
454
  [When::TM::OrdinalEra,
455
455
  "*age:[チトニアン=,Tithonian]",
456
- "begin:-150_800_000-"
456
+ "begin:-152_100_000-"
457
457
  ]
458
458
  ]
459
459
  ],
@@ -462,55 +462,55 @@ class When::TM::OrdinalReferenceSystem
462
462
  [When::TM::OrdinalEra,
463
463
  "*epoch:[前期= ,Early_Cretaceous]",
464
464
  [When::TM::OrdinalEra,
465
- "*age:[ベリアシアン=,Berriasian]",
466
- "begin:-145_500_000-"
465
+ "*age:[ベリアシアン,Berriasian]",
466
+ "begin:-145_000_000-"
467
467
  ],
468
468
  [When::TM::OrdinalEra,
469
- "*age:[バランギニアン=,Valanginian]",
470
- "begin:-140_200_000-"
469
+ "*age:[バランギニアン,Valanginian]",
470
+ "begin:-139_800_000-"
471
471
  ],
472
472
  [When::TM::OrdinalEra,
473
- "*age:[オーテリビアン=,Hauterivian]",
474
- "begin:-133_900_000-"
473
+ "*age:[オーテリビアン,Hauterivian]",
474
+ "begin:-132_600_000-"
475
475
  ],
476
476
  [When::TM::OrdinalEra,
477
- "*age:[バレミアン=,Barremian]",
478
- "begin:-130_000_000-"
477
+ "*age:[バレミアン,Barremian]",
478
+ "begin:-129_400_000-"
479
479
  ],
480
480
  [When::TM::OrdinalEra,
481
- "*age:[アプチアン=,Aptian]",
481
+ "*age:[アプチアン,Aptian]",
482
482
  "begin:-125_000_000-"
483
483
  ],
484
484
  [When::TM::OrdinalEra,
485
- "*age:[アルビアン=,Albian]",
486
- "begin:-112_000_000-"
485
+ "*age:[アルビアン,Albian]",
486
+ "begin:-113_000_000-"
487
487
  ]
488
488
  ],
489
489
  [When::TM::OrdinalEra,
490
490
  "*epoch:[後期=,Late_Cretaceous]",
491
491
  [When::TM::OrdinalEra,
492
- "*age:[セノマニアン=,Cenomanian]",
493
- "begin:-99_600_000-"
492
+ "*age:[セノマニアン=Cenomanian]",
493
+ "begin:-100_500_000-"
494
494
  ],
495
495
  [When::TM::OrdinalEra,
496
- "*age:[チューロニアン=,Turonian]",
497
- "begin:-93_600_000-"
496
+ "*age:[チューロニアン,Turonian]",
497
+ "begin:-93_900_000-"
498
498
  ],
499
499
  [When::TM::OrdinalEra,
500
- "*age:[コニアシアン=,Coniacian]",
501
- "begin:-88_600_000-"
500
+ "*age:[コニアシアン,Coniacian]",
501
+ "begin:-89_800_000-"
502
502
  ],
503
503
  [When::TM::OrdinalEra,
504
- "*age:[サントニアン=,Santonian]",
505
- "begin:-85_800_000-"
504
+ "*age:[サントニアン,Santonian]",
505
+ "begin:-86_300_000-"
506
506
  ],
507
507
  [When::TM::OrdinalEra,
508
508
  "*age:[カンパニアン,Campanian]",
509
- "begin:-83_500_000-"
509
+ "begin:-83_600_000-"
510
510
  ],
511
511
  [When::TM::OrdinalEra,
512
- "*age:[マストリヒシアン,Maastrichtian]",
513
- "begin:-70_600_000-"
512
+ "*age:[マーストリヒチアン,Maastrichtian]",
513
+ "begin:-72_100_000-"
514
514
  ]
515
515
  ]
516
516
  ]
@@ -523,34 +523,34 @@ class When::TM::OrdinalReferenceSystem
523
523
  "*epoch:[暁新世,Paleocene]",
524
524
  [When::TM::OrdinalEra,
525
525
  "*age:[ダニアン,Danian]",
526
- "begin:-65_500_000-"
526
+ "begin:-66_000_000-"
527
527
  ],
528
528
  [When::TM::OrdinalEra,
529
529
  "*age:[セランディアン,Selandian]",
530
- "begin:-61_100_000-"
530
+ "begin:-61_600_000-"
531
531
  ],
532
532
  [When::TM::OrdinalEra,
533
533
  "*age:[サネティアン,Thanetian]",
534
- "begin:-58_700_000-"
534
+ "begin:-59_200_000-"
535
535
  ]
536
536
  ],
537
537
  [When::TM::OrdinalEra,
538
538
  "*epoch:[始新世,Eocene]",
539
539
  [When::TM::OrdinalEra,
540
540
  "*age:[ヤプレシアン,Ypresian]",
541
- "begin:-55_800_000-"
541
+ "begin:-56_000_000-"
542
542
  ],
543
543
  [When::TM::OrdinalEra,
544
544
  "*age:[ルテシアン,Lutetian]",
545
- "begin:-48_600_000-"
545
+ "begin:-47_800_000-"
546
546
  ],
547
547
  [When::TM::OrdinalEra,
548
548
  "*age:[バートニアン,Bartonian]",
549
- "begin:-40_400_000-"
549
+ "begin:-41_200_000-"
550
550
  ],
551
551
  [When::TM::OrdinalEra,
552
552
  "*age:[プリアボニアン,Priabonian]",
553
- "begin:-37_200_000-"
553
+ "begin:-37_710_000-"
554
554
  ]
555
555
  ],
556
556
  [When::TM::OrdinalEra,
@@ -561,7 +561,7 @@ class When::TM::OrdinalReferenceSystem
561
561
  ],
562
562
  [When::TM::OrdinalEra,
563
563
  "*age:[チャッティアン,Chattian]",
564
- "begin:-28_400_000-"
564
+ "begin:-27_820_000-"
565
565
  ]
566
566
  ]
567
567
  ],
@@ -575,7 +575,7 @@ class When::TM::OrdinalReferenceSystem
575
575
  ],
576
576
  [When::TM::OrdinalEra,
577
577
  "*age:[バーディガリアン,Burdigalian]",
578
- "begin:-20_430_000-"
578
+ "begin:-20_440_000-"
579
579
  ],
580
580
  [When::TM::OrdinalEra,
581
581
  "*age:[ランギアン,Langhian]",
@@ -587,7 +587,7 @@ class When::TM::OrdinalReferenceSystem
587
587
  ],
588
588
  [When::TM::OrdinalEra,
589
589
  "*age:[トートニアン,Tortonian]",
590
- "begin:-11_606_000-"
590
+ "begin:-11_630_000-"
591
591
  ],
592
592
  [When::TM::OrdinalEra,
593
593
  "*age:[メッシニアン,Messinian]",
@@ -598,7 +598,7 @@ class When::TM::OrdinalReferenceSystem
598
598
  "*epoch:[鮮新世,Pliocene]",
599
599
  [When::TM::OrdinalEra,
600
600
  "*age:[ザンクリアン,Zanclean]",
601
- "begin:-5_330_000-"
601
+ "begin:-5_331_000-"
602
602
  ],
603
603
  [When::TM::OrdinalEra,
604
604
  "*age:[ピアセンジアン,Piacenzian]",
@@ -611,26 +611,37 @@ class When::TM::OrdinalReferenceSystem
611
611
  [When::TM::OrdinalEra,
612
612
  "*epoch:[更新世,Pleistocene]",
613
613
  [When::TM::OrdinalEra,
614
- "*age:[ゲラシアン,Gelasian]",
615
- "begin:-2_586_000-"
614
+ "*age:[ジェラシアン,Gelasian]",
615
+ "begin:-2_578_000-"
616
616
  ],
617
617
  [When::TM::OrdinalEra,
618
- "*age:[カラブリアン=,Calabrian]",
619
- "begin:-1_804_000-"
618
+ "*age:[カラブリアン,Calabrian]",
619
+ "begin:-1_798_000-"
620
620
  ],
621
621
  [When::TM::OrdinalEra,
622
- "*age:[イオニアン=,Ionian=en_wiki:Middle_Pleistocene]",
623
- "begin:-779_000-"
622
+ "*age:[チバニアン,Chibanian]",
623
+ "begin:-772_000-"
624
624
  ],
625
625
  [When::TM::OrdinalEra,
626
- "*age:[タランティアン=,Tarantian=en_wiki:Late_Pleistocene]",
627
- "begin:-124_000-"
626
+ "*age:[後期更新世,Late_Pleistocene]",
627
+ "begin:-127_000-"
628
628
  ]
629
629
  ],
630
630
  [When::TM::OrdinalEra,
631
631
  "*epoch:[完新世,Holocene]",
632
- "begin:-9_700-",
633
- "end:+Infinity"
632
+ [When::TM::OrdinalEra,
633
+ "*age:[グリーンランディアン,Greenlandian]",
634
+ "begin:-9_700-",
635
+ ],
636
+ [When::TM::OrdinalEra,
637
+ "*age:[ノースグリッピアン,Northgrippian]",
638
+ "begin:-6_200-",
639
+ ],
640
+ [When::TM::OrdinalEra,
641
+ "*age:[メーガーラヤン,Meghalayan]",
642
+ "begin:-2_200-",
643
+ "end:+Infinity"
644
+ ]
634
645
  ]
635
646
  ]
636
647
  ]