zakuro 0.9.3 → 1.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +2 -2
- data/README.md +41 -8
- data/VERSION +1 -1
- data/doc/gengou.md +1 -1
- data/doc/operation/csv/month.csv +8 -9
- data/doc/operation/operation.xlsx +0 -0
- data/images/logo-text.png +0 -0
- data/lib/zakuro/calculation/base/gengou.rb +2 -4
- data/lib/zakuro/calculation/base/year.rb +1 -1
- data/lib/zakuro/calculation/cycle/abstract_solar_term.rb +6 -0
- data/lib/zakuro/calculation/era/gengou/abstract_scroll.rb +2 -2
- data/lib/zakuro/calculation/era/gengou/dated_scroll.rb +4 -2
- data/lib/zakuro/calculation/era/gengou/internal/publisher.rb +1 -1
- data/lib/zakuro/calculation/era/gengou/internal/reserve/abstract_list.rb +13 -7
- data/lib/zakuro/calculation/era/gengou/internal/reserve/abstract_range.rb +18 -9
- data/lib/zakuro/calculation/era/gengou/internal/reserve/dated_list.rb +6 -2
- data/lib/zakuro/calculation/era/gengou/internal/reserve/dated_range.rb +5 -2
- data/lib/zakuro/calculation/era/gengou/internal/reserve/empty_link.rb +3 -3
- data/lib/zakuro/calculation/era/gengou/internal/reserve/named_list.rb +12 -4
- data/lib/zakuro/calculation/era/gengou/internal/reserve/named_range.rb +10 -4
- data/lib/zakuro/calculation/era/gengou/named_scroll.rb +5 -2
- data/lib/zakuro/calculation/era/version/internal/crawler.rb +3 -3
- data/lib/zakuro/calculation/monthly/abstract_lunar_phase.rb +1 -1
- data/lib/zakuro/calculation/monthly/internal/date_comparer.rb +78 -0
- data/lib/zakuro/calculation/monthly/{meta → internal/meta}/all_solar_term.rb +1 -1
- data/lib/zakuro/calculation/monthly/{meta → internal/meta}/meta_collector.rb +2 -2
- data/lib/zakuro/calculation/monthly/{first_day.rb → internal/part/first_day.rb} +2 -2
- data/lib/zakuro/calculation/monthly/{meta.rb → internal/part/meta.rb} +1 -1
- data/lib/zakuro/calculation/monthly/internal/solar_term_selector.rb +203 -0
- data/lib/zakuro/calculation/monthly/month.rb +38 -74
- data/lib/zakuro/calculation/monthly/operated_month.rb +7 -2
- data/lib/zakuro/calculation/option/dropped_date/location.rb +8 -1
- data/lib/zakuro/calculation/range/dated_full_range.rb +6 -3
- data/lib/zakuro/calculation/range/dated_operation_range.rb +2 -1
- data/lib/zakuro/calculation/range/medieval_annual_range.rb +0 -2
- data/lib/zakuro/calculation/range/named_full_range.rb +1 -1
- data/lib/zakuro/calculation/range/transfer/gengou_scroller.rb +24 -10
- data/lib/zakuro/calculation/stella/solar/abstract_average.rb +3 -3
- data/lib/zakuro/calculation/summary/internal/option/dropped_date.rb +102 -0
- data/lib/zakuro/calculation/summary/internal/option/vanished_date.rb +111 -0
- data/lib/zakuro/calculation/summary/internal/option.rb +4 -137
- data/lib/zakuro/calculation/summary/japan/range.rb +4 -5
- data/lib/zakuro/calculation/summary/western/range.rb +8 -1
- data/lib/zakuro/calculation/summary/western/single.rb +10 -5
- data/lib/zakuro/context/version_class_resolver.rb +5 -5
- data/lib/zakuro/era/japan/calendar.rb +4 -4
- data/lib/zakuro/era/japan/gengou/alignment/division.rb +2 -2
- data/lib/zakuro/era/japan/gengou/alignment/linear_gengou.rb +2 -2
- data/lib/zakuro/era/japan/gengou/alignment.rb +35 -6
- data/lib/zakuro/era/japan/gengou/resource/parser.rb +17 -16
- data/lib/zakuro/era/japan/gengou/resource/validator.rb +3 -394
- data/lib/zakuro/era/japan/gengou/resource/yaml/set-001-until-south.yaml +2 -2
- data/lib/zakuro/era/japan/gengou.rb +8 -6
- data/lib/zakuro/era/japan/type/base/both/date.rb +51 -0
- data/lib/zakuro/era/japan/type/base/both/year.rb +53 -0
- data/lib/zakuro/era/japan/type/base/gengou.rb +177 -0
- data/lib/zakuro/era/japan/type/base/gengou_set.rb +78 -0
- data/lib/zakuro/era/japan/type/base/switch_date.rb +74 -0
- data/lib/zakuro/era/japan/type/base/version_range.rb +189 -0
- data/lib/zakuro/era/japan/type/validation/both/date.rb +99 -0
- data/lib/zakuro/era/japan/type/validation/both/year.rb +75 -0
- data/lib/zakuro/era/japan/type/validation/gengou.rb +93 -0
- data/lib/zakuro/era/japan/type/validation/gengou_set.rb +133 -0
- data/lib/zakuro/era/japan/type/validation/switch_date.rb +73 -0
- data/lib/zakuro/era/japan/type/validation/version_range.rb +109 -0
- data/lib/zakuro/era/japan/type/validation/version_root.rb +102 -0
- data/lib/zakuro/era/japan/version/resource/parser.rb +266 -0
- data/lib/zakuro/era/japan/version/resource/validator.rb +37 -0
- data/lib/zakuro/era/japan/version/resource/yaml/version.yaml +80 -0
- data/lib/zakuro/era/japan/version/resource.rb +22 -0
- data/lib/zakuro/era/japan/version.rb +4 -115
- data/lib/zakuro/era/western/calendar.rb +2 -2
- data/lib/zakuro/exception/zakuro_error.rb +1 -1
- data/lib/zakuro/merchant.rb +5 -5
- data/lib/zakuro/operation/month/parser.rb +2 -2
- data/lib/zakuro/operation/yaml/month.yaml +8 -40
- data/lib/zakuro/output/logger.rb +4 -4
- data/lib/zakuro/parameter/catalog/basis_date.rb +55 -0
- data/lib/zakuro/parameter/catalog/column.rb +57 -0
- data/lib/zakuro/parameter/catalog/option.rb +60 -0
- data/lib/zakuro/parameter/catalog/range.rb +81 -0
- data/lib/zakuro/parameter/condition.rb +108 -0
- data/lib/zakuro/result/core.rb +2 -2
- data/lib/zakuro/{tools → tool}/remainder_comparer.rb +3 -2
- data/lib/zakuro/{tools → tool}/stringifier.rb +3 -3
- data/lib/zakuro/{tools → tool}/typeconv.rb +2 -2
- data/lib/zakuro/{tools → tool}/typeof.rb +2 -2
- data/lib/zakuro/version/daien/const/number.rb +42 -39
- data/lib/zakuro/version/daien/const/remainder.rb +38 -35
- data/lib/zakuro/version/daien/cycle/remainder.rb +77 -74
- data/lib/zakuro/version/daien/cycle/solar_term.rb +18 -15
- data/lib/zakuro/version/daien/daien.rb +8 -5
- data/lib/zakuro/version/daien/monthly/lunar_phase.rb +67 -64
- data/lib/zakuro/version/daien/option/dropped_date/parameter.rb +15 -12
- data/lib/zakuro/version/daien/option/vanished_date/parameter.rb +15 -12
- data/lib/zakuro/version/daien/range/annual_range.rb +27 -24
- data/lib/zakuro/version/daien/stella/lunar/adjustment.rb +209 -206
- data/lib/zakuro/version/daien/stella/lunar/localization.rb +32 -29
- data/lib/zakuro/version/daien/stella/lunar/location.rb +53 -50
- data/lib/zakuro/version/daien/stella/lunar/value.rb +65 -62
- data/lib/zakuro/version/daien/stella/origin/average_november.rb +23 -20
- data/lib/zakuro/version/daien/stella/origin/lunar_age.rb +42 -39
- data/lib/zakuro/version/daien/stella/origin/winter_solstice.rb +44 -41
- data/lib/zakuro/version/daien/stella/solar/adjustment.rb +74 -71
- data/lib/zakuro/version/daien/stella/solar/average.rb +68 -65
- data/lib/zakuro/version/daien/stella/solar/interval.rb +95 -92
- data/lib/zakuro/version/daien/stella/solar/location.rb +41 -38
- data/lib/zakuro/version/daien/stella/solar/value.rb +21 -18
- data/lib/zakuro/version/genka/const/number.rb +31 -28
- data/lib/zakuro/version/genka/const/remainder.rb +20 -17
- data/lib/zakuro/version/genka/cycle/remainder.rb +72 -69
- data/lib/zakuro/version/genka/cycle/solar_term.rb +18 -15
- data/lib/zakuro/version/genka/genka.rb +8 -5
- data/lib/zakuro/version/genka/monthly/lunar_phase.rb +82 -79
- data/lib/zakuro/version/genka/option/dropped_date/parameter.rb +13 -10
- data/lib/zakuro/version/genka/option/vanished_date/parameter.rb +13 -10
- data/lib/zakuro/version/genka/range/annual_range.rb +57 -54
- data/lib/zakuro/version/genka/stella/origin/first_term.rb +44 -41
- data/lib/zakuro/version/genka/stella/origin/january.rb +38 -35
- data/lib/zakuro/version/genka/stella/solar/average.rb +24 -21
- data/lib/zakuro/version/gihou/const/number.rb +40 -37
- data/lib/zakuro/version/gihou/const/remainder.rb +32 -29
- data/lib/zakuro/version/gihou/cycle/remainder.rb +38 -35
- data/lib/zakuro/version/gihou/cycle/solar_term.rb +18 -15
- data/lib/zakuro/version/gihou/gihou.rb +8 -5
- data/lib/zakuro/version/gihou/monthly/lunar_phase.rb +68 -65
- data/lib/zakuro/version/gihou/option/dropped_date/parameter.rb +13 -10
- data/lib/zakuro/version/gihou/option/vanished_date/parameter.rb +13 -10
- data/lib/zakuro/version/gihou/range/annual_range.rb +27 -24
- data/lib/zakuro/version/gihou/stella/lunar/adjustment.rb +212 -209
- data/lib/zakuro/version/gihou/stella/lunar/localization.rb +32 -29
- data/lib/zakuro/version/gihou/stella/lunar/location.rb +53 -50
- data/lib/zakuro/version/gihou/stella/lunar/value.rb +65 -62
- data/lib/zakuro/version/gihou/stella/origin/average_november.rb +23 -20
- data/lib/zakuro/version/gihou/stella/origin/lunar_age.rb +42 -39
- data/lib/zakuro/version/gihou/stella/origin/winter_solstice.rb +44 -41
- data/lib/zakuro/version/gihou/stella/solar/adjustment.rb +74 -71
- data/lib/zakuro/version/gihou/stella/solar/average.rb +67 -64
- data/lib/zakuro/version/gihou/stella/solar/interval.rb +95 -92
- data/lib/zakuro/version/gihou/stella/solar/location.rb +41 -38
- data/lib/zakuro/version/gihou/stella/solar/value.rb +21 -18
- data/lib/zakuro/version/gregorio/gregorio.rb +8 -5
- data/lib/zakuro/version/houryaku/houryaku.rb +8 -5
- data/lib/zakuro/version/joukyou/joukyou.rb +8 -5
- data/lib/zakuro/version/kansei/kansei.rb +8 -5
- data/lib/zakuro/version/senmyou/const/number.rb +40 -37
- data/lib/zakuro/version/senmyou/const/remainder.rb +35 -32
- data/lib/zakuro/version/senmyou/cycle/remainder.rb +74 -71
- data/lib/zakuro/version/senmyou/cycle/solar_term.rb +18 -15
- data/lib/zakuro/version/senmyou/monthly/lunar_phase.rb +69 -66
- data/lib/zakuro/version/senmyou/option/dropped_date/parameter.rb +15 -12
- data/lib/zakuro/version/senmyou/option/vanished_date/parameter.rb +15 -12
- data/lib/zakuro/version/senmyou/range/annual_range.rb +27 -24
- data/lib/zakuro/version/senmyou/senmyou.rb +8 -5
- data/lib/zakuro/version/senmyou/stella/lunar/adjustment.rb +206 -203
- data/lib/zakuro/version/senmyou/stella/lunar/localization.rb +32 -29
- data/lib/zakuro/version/senmyou/stella/lunar/location.rb +60 -57
- data/lib/zakuro/version/senmyou/stella/lunar/value.rb +66 -63
- data/lib/zakuro/version/senmyou/stella/origin/average_november.rb +23 -20
- data/lib/zakuro/version/senmyou/stella/origin/lunar_age.rb +42 -39
- data/lib/zakuro/version/senmyou/stella/origin/winter_solstice.rb +44 -41
- data/lib/zakuro/version/senmyou/stella/solar/adjustment.rb +74 -71
- data/lib/zakuro/version/senmyou/stella/solar/average.rb +67 -64
- data/lib/zakuro/version/senmyou/stella/solar/interval.rb +93 -90
- data/lib/zakuro/version/senmyou/stella/solar/location.rb +41 -38
- data/lib/zakuro/version/senmyou/stella/solar/value.rb +23 -20
- data/lib/zakuro/version/tenpou/tenpou.rb +8 -5
- metadata +40 -15
- data/lib/zakuro/condition.rb +0 -306
- data/lib/zakuro/era/japan/gengou/resource/type.rb +0 -356
- /data/lib/zakuro/calculation/monthly/{operated_solar_term.rb → internal/operated_solar_term.rb} +0 -0
- /data/lib/zakuro/calculation/monthly/{const.rb → internal/part/const.rb} +0 -0
- /data/lib/zakuro/calculation/monthly/{month_label.rb → internal/part/month_label.rb} +0 -0
@@ -13,84 +13,87 @@ require_relative './location'
|
|
13
13
|
# :nodoc:
|
14
14
|
module Zakuro
|
15
15
|
# :nodoc:
|
16
|
-
module
|
16
|
+
module Version
|
17
17
|
# :nodoc:
|
18
|
-
module
|
19
|
-
#
|
20
|
-
|
21
|
-
#
|
22
|
-
class Average < Calculation::Solar::AbstractAverage
|
18
|
+
module Gihou
|
19
|
+
# :nodoc:
|
20
|
+
module Solar
|
23
21
|
#
|
24
|
-
#
|
22
|
+
# Average 平気(太陽軌道平均)
|
25
23
|
#
|
26
|
-
|
27
|
-
#
|
28
|
-
def initialize(western_year:)
|
29
|
-
solar_term = self.class.first_solar_term(western_year: western_year)
|
30
|
-
super(solar_term: solar_term)
|
31
|
-
end
|
32
|
-
|
33
|
-
#
|
34
|
-
# 冬至から数えた1年データの月ごとに二十四節気を割り当てる
|
35
|
-
#
|
36
|
-
# @param [Array<Month>] annual_range 1年データ
|
37
|
-
#
|
38
|
-
# @return [Array<Month>] 1年データ
|
39
|
-
#
|
40
|
-
def set(annual_range:)
|
41
|
-
super(annual_range: annual_range)
|
42
|
-
end
|
43
|
-
|
44
|
-
class << self
|
24
|
+
class Average < Calculation::Solar::AbstractAverage
|
45
25
|
#
|
46
|
-
#
|
26
|
+
# 初期化
|
47
27
|
#
|
48
28
|
# @param [Integer] western_year 西暦年
|
49
29
|
#
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
# 天正冬至
|
54
|
-
winter_solstice = Origin::WinterSolstice.get(western_year: western_year)
|
55
|
-
|
56
|
-
# 二十四節気(冬至)
|
57
|
-
solar_term = Cycle::SolarTerm.new(index: 0, remainder: winter_solstice)
|
58
|
-
|
59
|
-
first_solar_term_index = calc_first_solar_term_index(western_year: western_year)
|
60
|
-
|
61
|
-
# 対象の二十四節気まで戻す
|
62
|
-
solar_term.prev_by_index(first_solar_term_index)
|
63
|
-
|
64
|
-
solar_term
|
30
|
+
def initialize(western_year:)
|
31
|
+
solar_term = self.class.first_solar_term(western_year: western_year)
|
32
|
+
super(solar_term: solar_term)
|
65
33
|
end
|
66
34
|
|
67
|
-
# :reek:TooManyStatements { max_statements: 6 }
|
68
|
-
|
69
|
-
#
|
70
|
-
# 計算開始する二十四節気番号を求める
|
71
35
|
#
|
72
|
-
#
|
73
|
-
# * 例えば、定気が大雪であれば入定気は大雪の範囲内にある
|
74
|
-
# * 入定気は、定気の開始位置に重複しない限り、常に定気より後にある
|
75
|
-
# * 基本的に定気の一つ前から起算すれば、当時から求めた11月(閏10/閏11月)に二十四節気を割り当てられる
|
36
|
+
# 冬至から数えた1年データの月ごとに二十四節気を割り当てる
|
76
37
|
#
|
77
|
-
# @param [
|
38
|
+
# @param [Array<Month>] annual_range 1年データ
|
78
39
|
#
|
79
|
-
# @return [
|
40
|
+
# @return [Array<Month>] 1年データ
|
80
41
|
#
|
81
|
-
def
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
solar_location = Solar::Location.new(lunar_age: lunar_age)
|
86
|
-
solar_location.run
|
87
|
-
|
88
|
-
solar_term_index = solar_location.index
|
89
|
-
|
90
|
-
# 入定気の一つ後の二十四節気まで戻す(ただし11月経朔が二十四節気上にある場合は戻さない)
|
91
|
-
solar_term_index += 1 unless solar_location.remainder.day.zero?
|
42
|
+
def set(annual_range:)
|
43
|
+
super(annual_range: annual_range)
|
44
|
+
end
|
92
45
|
|
93
|
-
|
46
|
+
class << self
|
47
|
+
#
|
48
|
+
# 計算開始する二十四節気を求める
|
49
|
+
#
|
50
|
+
# @param [Integer] western_year 西暦年
|
51
|
+
#
|
52
|
+
# @return [SolarTerm] 二十四節気
|
53
|
+
#
|
54
|
+
def first_solar_term(western_year:)
|
55
|
+
# 天正冬至
|
56
|
+
winter_solstice = Origin::WinterSolstice.get(western_year: western_year)
|
57
|
+
|
58
|
+
# 二十四節気(冬至)
|
59
|
+
solar_term = Cycle::SolarTerm.new(index: 0, remainder: winter_solstice)
|
60
|
+
|
61
|
+
first_solar_term_index = calc_first_solar_term_index(western_year: western_year)
|
62
|
+
|
63
|
+
# 対象の二十四節気まで戻す
|
64
|
+
solar_term.prev_by_index(first_solar_term_index)
|
65
|
+
|
66
|
+
solar_term
|
67
|
+
end
|
68
|
+
|
69
|
+
# :reek:TooManyStatements { max_statements: 6 }
|
70
|
+
|
71
|
+
#
|
72
|
+
# 計算開始する二十四節気番号を求める
|
73
|
+
#
|
74
|
+
# * 前提として入定気は冬至の手前にある
|
75
|
+
# * 例えば、定気が大雪であれば入定気は大雪の範囲内にある
|
76
|
+
# * 入定気は、定気の開始位置に重複しない限り、常に定気より後にある
|
77
|
+
# * 基本的に定気の一つ前から起算すれば、当時から求めた11月(閏10/閏11月)に二十四節気を割り当てられる
|
78
|
+
#
|
79
|
+
# @param [Integer] western_year 西暦年
|
80
|
+
#
|
81
|
+
# @return [Integer] 二十四節気番号
|
82
|
+
#
|
83
|
+
def calc_first_solar_term_index(western_year:)
|
84
|
+
# 天正閏余
|
85
|
+
lunar_age = Origin::LunarAge.get(western_year: western_year)
|
86
|
+
|
87
|
+
solar_location = Solar::Location.new(lunar_age: lunar_age)
|
88
|
+
solar_location.run
|
89
|
+
|
90
|
+
solar_term_index = solar_location.index
|
91
|
+
|
92
|
+
# 入定気の一つ後の二十四節気まで戻す(ただし11月経朔が二十四節気上にある場合は戻さない)
|
93
|
+
solar_term_index += 1 unless solar_location.remainder.day.zero?
|
94
|
+
|
95
|
+
solar_term_index
|
96
|
+
end
|
94
97
|
end
|
95
98
|
end
|
96
99
|
end
|
@@ -3,105 +3,108 @@
|
|
3
3
|
# :nodoc:
|
4
4
|
module Zakuro
|
5
5
|
# :nodoc:
|
6
|
-
module
|
6
|
+
module Version
|
7
7
|
# :nodoc:
|
8
|
-
module
|
9
|
-
#
|
10
|
-
|
11
|
-
#
|
12
|
-
module Interval
|
8
|
+
module Gihou
|
9
|
+
# :nodoc:
|
10
|
+
module Solar
|
13
11
|
#
|
14
|
-
#
|
12
|
+
# Interval 入気定日加減数(二十四節気の間隔)
|
15
13
|
#
|
16
|
-
|
17
|
-
#
|
18
|
-
# @return [Hash<Symbol, Cycle::Remainder>] 一覧
|
19
|
-
MAP = {
|
20
|
-
# 冬至(とうじ)・大雪(たいせつ)
|
21
|
-
touji: Cycle::Remainder.new(day: 14, minute: 910, second: 5), # -722
|
22
|
-
taisetsu: Cycle::Remainder.new(day: 14, minute: 910, second: 5),
|
23
|
-
# 小寒(しょうかん)・小雪(しょうせつ)
|
24
|
-
shoukan: Cycle::Remainder.new(day: 14, minute: 1014, second: 5), # -618
|
25
|
-
shousetsu: Cycle::Remainder.new(day: 14, minute: 1014, second: 5),
|
26
|
-
# 大寒(だいかん)・立冬(りっとう)
|
27
|
-
daikan: Cycle::Remainder.new(day: 14, minute: 1118, second: 5), # -514
|
28
|
-
rittou: Cycle::Remainder.new(day: 14, minute: 1118, second: 5),
|
29
|
-
# 立春(りっしゅん)・霜降(そうこう)
|
30
|
-
risshun: Cycle::Remainder.new(day: 14, minute: 1118, second: 5), # -514
|
31
|
-
soukou: Cycle::Remainder.new(day: 14, minute: 1118, second: 5),
|
32
|
-
# 雨水(うすい)・寒露(かんろ)
|
33
|
-
usui: Cycle::Remainder.new(day: 14, minute: 1014, second: 5), # -618
|
34
|
-
kanro: Cycle::Remainder.new(day: 14, minute: 1014, second: 5),
|
35
|
-
# 啓蟄(けいちつ)・秋分(しゅうぶん)
|
36
|
-
keichitsu: Cycle::Remainder.new(day: 14, minute: 910, second: 5), # -722
|
37
|
-
shuubun: Cycle::Remainder.new(day: 14, minute: 910, second: 5),
|
38
|
-
# 春分(しゅんぶん)・白露(はくろ)
|
39
|
-
shunbun: Cycle::Remainder.new(day: 15, minute: 1014, second: 5), # +722
|
40
|
-
hakuro: Cycle::Remainder.new(day: 15, minute: 1014, second: 5),
|
41
|
-
# 清明(せいめい)・処暑(しょしょ)
|
42
|
-
seimei: Cycle::Remainder.new(day: 15, minute: 910, second: 5), # +618
|
43
|
-
shosho: Cycle::Remainder.new(day: 15, minute: 910, second: 5),
|
44
|
-
# 穀雨(こくう)・立秋(りっしゅう)
|
45
|
-
kokuu: Cycle::Remainder.new(day: 15, minute: 806, second: 5), # +514
|
46
|
-
risshuu: Cycle::Remainder.new(day: 15, minute: 806, second: 5),
|
47
|
-
# 立夏(りっか)・大暑(たいしょ)
|
48
|
-
rikka: Cycle::Remainder.new(day: 15, minute: 806, second: 5), # +514
|
49
|
-
taisho: Cycle::Remainder.new(day: 15, minute: 806, second: 5),
|
50
|
-
# 小満(しょうまん)・小暑(しょうしょ)
|
51
|
-
shouman: Cycle::Remainder.new(day: 15, minute: 910, second: 5), # +618
|
52
|
-
shousho: Cycle::Remainder.new(day: 15, minute: 910, second: 5),
|
53
|
-
# 芒種(ぼうしゅ)・夏至(げし)
|
54
|
-
boushu: Cycle::Remainder.new(day: 15, minute: 1014, second: 5), # +722
|
55
|
-
geshi: Cycle::Remainder.new(day: 15, minute: 1014, second: 5)
|
56
|
-
}.freeze
|
57
|
-
|
58
|
-
# @return [Array<Remainder>] 索引
|
59
|
-
LIST = [
|
60
|
-
MAP[:touji], # 0
|
61
|
-
MAP[:shoukan], # 1
|
62
|
-
MAP[:daikan], # 2
|
63
|
-
MAP[:risshun], # 3
|
64
|
-
MAP[:usui], # 4
|
65
|
-
MAP[:keichitsu], # 5
|
66
|
-
MAP[:shunbun], # 6
|
67
|
-
MAP[:seimei], # 7
|
68
|
-
MAP[:kokuu], # 8
|
69
|
-
MAP[:rikka], # 9
|
70
|
-
MAP[:shouman], # 10
|
71
|
-
MAP[:boushu], # 11
|
72
|
-
MAP[:geshi], # 12
|
73
|
-
MAP[:shousho], # 13
|
74
|
-
MAP[:taisho], # 14
|
75
|
-
MAP[:risshuu], # 15
|
76
|
-
MAP[:shosho], # 16
|
77
|
-
MAP[:hakuro], # 17
|
78
|
-
MAP[:shuubun], # 18
|
79
|
-
MAP[:kanro], # 19
|
80
|
-
MAP[:soukou], # 20
|
81
|
-
MAP[:rittou], # 21
|
82
|
-
MAP[:shousetsu], # 22
|
83
|
-
MAP[:taisetsu] # 23
|
84
|
-
].freeze
|
85
|
-
|
86
|
-
class << self
|
14
|
+
module Interval
|
87
15
|
#
|
88
|
-
#
|
16
|
+
# 気策の 15-292.5 を加減する
|
89
17
|
#
|
90
|
-
# @
|
18
|
+
# @note 『日本暦日原典』は雨水と啓蟄が逆になっていたのでこれを改めた
|
91
19
|
#
|
92
|
-
# @return [Cycle::Remainder]
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
20
|
+
# @return [Hash<Symbol, Cycle::Remainder>] 一覧
|
21
|
+
MAP = {
|
22
|
+
# 冬至(とうじ)・大雪(たいせつ)
|
23
|
+
touji: Cycle::Remainder.new(day: 14, minute: 910, second: 5), # -722
|
24
|
+
taisetsu: Cycle::Remainder.new(day: 14, minute: 910, second: 5),
|
25
|
+
# 小寒(しょうかん)・小雪(しょうせつ)
|
26
|
+
shoukan: Cycle::Remainder.new(day: 14, minute: 1014, second: 5), # -618
|
27
|
+
shousetsu: Cycle::Remainder.new(day: 14, minute: 1014, second: 5),
|
28
|
+
# 大寒(だいかん)・立冬(りっとう)
|
29
|
+
daikan: Cycle::Remainder.new(day: 14, minute: 1118, second: 5), # -514
|
30
|
+
rittou: Cycle::Remainder.new(day: 14, minute: 1118, second: 5),
|
31
|
+
# 立春(りっしゅん)・霜降(そうこう)
|
32
|
+
risshun: Cycle::Remainder.new(day: 14, minute: 1118, second: 5), # -514
|
33
|
+
soukou: Cycle::Remainder.new(day: 14, minute: 1118, second: 5),
|
34
|
+
# 雨水(うすい)・寒露(かんろ)
|
35
|
+
usui: Cycle::Remainder.new(day: 14, minute: 1014, second: 5), # -618
|
36
|
+
kanro: Cycle::Remainder.new(day: 14, minute: 1014, second: 5),
|
37
|
+
# 啓蟄(けいちつ)・秋分(しゅうぶん)
|
38
|
+
keichitsu: Cycle::Remainder.new(day: 14, minute: 910, second: 5), # -722
|
39
|
+
shuubun: Cycle::Remainder.new(day: 14, minute: 910, second: 5),
|
40
|
+
# 春分(しゅんぶん)・白露(はくろ)
|
41
|
+
shunbun: Cycle::Remainder.new(day: 15, minute: 1014, second: 5), # +722
|
42
|
+
hakuro: Cycle::Remainder.new(day: 15, minute: 1014, second: 5),
|
43
|
+
# 清明(せいめい)・処暑(しょしょ)
|
44
|
+
seimei: Cycle::Remainder.new(day: 15, minute: 910, second: 5), # +618
|
45
|
+
shosho: Cycle::Remainder.new(day: 15, minute: 910, second: 5),
|
46
|
+
# 穀雨(こくう)・立秋(りっしゅう)
|
47
|
+
kokuu: Cycle::Remainder.new(day: 15, minute: 806, second: 5), # +514
|
48
|
+
risshuu: Cycle::Remainder.new(day: 15, minute: 806, second: 5),
|
49
|
+
# 立夏(りっか)・大暑(たいしょ)
|
50
|
+
rikka: Cycle::Remainder.new(day: 15, minute: 806, second: 5), # +514
|
51
|
+
taisho: Cycle::Remainder.new(day: 15, minute: 806, second: 5),
|
52
|
+
# 小満(しょうまん)・小暑(しょうしょ)
|
53
|
+
shouman: Cycle::Remainder.new(day: 15, minute: 910, second: 5), # +618
|
54
|
+
shousho: Cycle::Remainder.new(day: 15, minute: 910, second: 5),
|
55
|
+
# 芒種(ぼうしゅ)・夏至(げし)
|
56
|
+
boushu: Cycle::Remainder.new(day: 15, minute: 1014, second: 5), # +722
|
57
|
+
geshi: Cycle::Remainder.new(day: 15, minute: 1014, second: 5)
|
58
|
+
}.freeze
|
97
59
|
|
98
|
-
#
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
60
|
+
# @return [Array<Remainder>] 索引
|
61
|
+
LIST = [
|
62
|
+
MAP[:touji], # 0
|
63
|
+
MAP[:shoukan], # 1
|
64
|
+
MAP[:daikan], # 2
|
65
|
+
MAP[:risshun], # 3
|
66
|
+
MAP[:usui], # 4
|
67
|
+
MAP[:keichitsu], # 5
|
68
|
+
MAP[:shunbun], # 6
|
69
|
+
MAP[:seimei], # 7
|
70
|
+
MAP[:kokuu], # 8
|
71
|
+
MAP[:rikka], # 9
|
72
|
+
MAP[:shouman], # 10
|
73
|
+
MAP[:boushu], # 11
|
74
|
+
MAP[:geshi], # 12
|
75
|
+
MAP[:shousho], # 13
|
76
|
+
MAP[:taisho], # 14
|
77
|
+
MAP[:risshuu], # 15
|
78
|
+
MAP[:shosho], # 16
|
79
|
+
MAP[:hakuro], # 17
|
80
|
+
MAP[:shuubun], # 18
|
81
|
+
MAP[:kanro], # 19
|
82
|
+
MAP[:soukou], # 20
|
83
|
+
MAP[:rittou], # 21
|
84
|
+
MAP[:shousetsu], # 22
|
85
|
+
MAP[:taisetsu] # 23
|
86
|
+
].freeze
|
87
|
+
|
88
|
+
class << self
|
89
|
+
#
|
90
|
+
# 入気定日加減数を引き当てる
|
91
|
+
#
|
92
|
+
# @param [Integer] index 二十四節気番号
|
93
|
+
#
|
94
|
+
# @return [Cycle::Remainder] 入気定日加減数
|
95
|
+
#
|
96
|
+
def index_of(index)
|
97
|
+
LIST[index]
|
98
|
+
end
|
99
|
+
|
100
|
+
#
|
101
|
+
# 入気定日加減数の総数を返す
|
102
|
+
#
|
103
|
+
# @return [Integer] 入気定日加減数の総数
|
104
|
+
#
|
105
|
+
def size
|
106
|
+
LIST.size
|
107
|
+
end
|
105
108
|
end
|
106
109
|
end
|
107
110
|
end
|
@@ -9,51 +9,54 @@ require_relative './interval'
|
|
9
9
|
# :nodoc:
|
10
10
|
module Zakuro
|
11
11
|
# :nodoc:
|
12
|
-
module
|
12
|
+
module Version
|
13
13
|
# :nodoc:
|
14
|
-
module
|
15
|
-
#
|
16
|
-
|
17
|
-
#
|
18
|
-
class Location < Calculation::Solar::AbstractLocation
|
19
|
-
# @return [Cycle::Remainder] 弦
|
20
|
-
QUARTER = Const::Remainder::Solar::QUARTER
|
21
|
-
|
22
|
-
#
|
23
|
-
# 初期化
|
14
|
+
module Gihou
|
15
|
+
# :nodoc:
|
16
|
+
module Solar
|
24
17
|
#
|
25
|
-
#
|
18
|
+
# Location 入定気
|
26
19
|
#
|
27
|
-
|
28
|
-
|
29
|
-
|
20
|
+
class Location < Calculation::Solar::AbstractLocation
|
21
|
+
# @return [Cycle::Remainder] 弦
|
22
|
+
QUARTER = Const::Remainder::Solar::QUARTER
|
30
23
|
|
31
|
-
|
24
|
+
#
|
25
|
+
# 初期化
|
26
|
+
#
|
27
|
+
# @param [Cycle::Remainder] lunar_age 天正閏余(大余小余)
|
28
|
+
#
|
29
|
+
def initialize(lunar_age:)
|
30
|
+
super(lunar_age: lunar_age, quarter: QUARTER)
|
31
|
+
end
|
32
32
|
|
33
|
-
|
34
|
-
# 二十四節気番号に対応する入気定日加減数を返す
|
35
|
-
#
|
36
|
-
# @note 継承のためクラスメソッドにしない
|
37
|
-
#
|
38
|
-
# @param [Integer] index 二十四節気番号
|
39
|
-
#
|
40
|
-
# @return [Cycle::Remainder] 入気定日加減数
|
41
|
-
#
|
42
|
-
def interval(index:)
|
43
|
-
Interval.index_of(index)
|
44
|
-
end
|
33
|
+
# :reek:UtilityFunction
|
45
34
|
|
46
|
-
|
35
|
+
#
|
36
|
+
# 二十四節気番号に対応する入気定日加減数を返す
|
37
|
+
#
|
38
|
+
# @note 継承のためクラスメソッドにしない
|
39
|
+
#
|
40
|
+
# @param [Integer] index 二十四節気番号
|
41
|
+
#
|
42
|
+
# @return [Cycle::Remainder] 入気定日加減数
|
43
|
+
#
|
44
|
+
def interval(index:)
|
45
|
+
Interval.index_of(index)
|
46
|
+
end
|
47
47
|
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
48
|
+
# :reek:UtilityFunction
|
49
|
+
|
50
|
+
#
|
51
|
+
# 入気定日加減数の要素数を返す
|
52
|
+
#
|
53
|
+
# @note 継承のためクラスメソッドにしない
|
54
|
+
#
|
55
|
+
# @return [Integer] 入気定日加減数の要素数
|
56
|
+
#
|
57
|
+
def interval_size
|
58
|
+
Interval.size
|
59
|
+
end
|
57
60
|
end
|
58
61
|
end
|
59
62
|
end
|
@@ -9,27 +9,30 @@ require_relative './adjustment'
|
|
9
9
|
# :nodoc:
|
10
10
|
module Zakuro
|
11
11
|
# :nodoc:
|
12
|
-
module
|
12
|
+
module Version
|
13
13
|
# :nodoc:
|
14
|
-
module
|
15
|
-
#
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
14
|
+
module Gihou
|
15
|
+
# :nodoc:
|
16
|
+
module Solar
|
17
|
+
#
|
18
|
+
# Value 太陽補正値
|
19
|
+
#
|
20
|
+
module Value
|
21
|
+
class << self
|
22
|
+
#
|
23
|
+
# 太陽の運行による補正値を算出する
|
24
|
+
#
|
25
|
+
# @param [SolarTerm] solar_location 入定気
|
26
|
+
#
|
27
|
+
# @return [Integer] 補正値
|
28
|
+
#
|
29
|
+
def get(solar_location:)
|
30
|
+
remainder = solar_location.remainder
|
29
31
|
|
30
|
-
|
32
|
+
row = Adjustment.specify(index: solar_location.index)
|
31
33
|
|
32
|
-
|
34
|
+
Calculation::Solar::ChoukeiValue.get(remainder: remainder, row: row)
|
35
|
+
end
|
33
36
|
end
|
34
37
|
end
|
35
38
|
end
|
@@ -3,49 +3,52 @@
|
|
3
3
|
# :nodoc:
|
4
4
|
module Zakuro
|
5
5
|
# :nodoc:
|
6
|
-
module
|
7
|
-
#
|
8
|
-
|
9
|
-
#
|
10
|
-
module Const
|
6
|
+
module Version
|
7
|
+
# :nodoc:
|
8
|
+
module Senmyou
|
11
9
|
#
|
12
|
-
#
|
10
|
+
# Const 定数
|
13
11
|
#
|
14
|
-
module
|
12
|
+
module Const
|
15
13
|
#
|
16
|
-
#
|
14
|
+
# Number 数値
|
17
15
|
#
|
18
|
-
module
|
19
|
-
#
|
20
|
-
|
21
|
-
#
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
16
|
+
module Number
|
17
|
+
#
|
18
|
+
# Cycle 周期
|
19
|
+
#
|
20
|
+
module Cycle
|
21
|
+
# @return [Integer] 統法(1日=8400分)
|
22
|
+
DAY = 8400
|
23
|
+
# @return [Float] 暦周(1近点月)
|
24
|
+
ANOMALISTIC_MONTH = 231_458.19
|
25
|
+
# @return [Integer] 朔望月
|
26
|
+
SYNODIC_MONTH = 248_057
|
27
|
+
# @return [Integer] 一年
|
28
|
+
YEAR = 3_068_055
|
29
|
+
end
|
28
30
|
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
31
|
+
#
|
32
|
+
# Derivation 導出
|
33
|
+
#
|
34
|
+
module Derivation
|
35
|
+
# @return [Integer] 通余: (YEAR - DAY * 12 * 30) = 44055
|
36
|
+
REMAINDER_ALL_YEAR = 44_055
|
37
|
+
# @return [Integer] 旬周(60日) DAY * 60
|
38
|
+
SIXTY_DAYS = 504_000
|
39
|
+
# @return [Integer] 朔虚分: (30 * 8400) % 248057
|
40
|
+
REMAINDER_IDEAL_MONTH = 3943
|
41
|
+
end
|
40
42
|
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
43
|
+
#
|
44
|
+
# 累積
|
45
|
+
#
|
46
|
+
module Stack
|
47
|
+
# @return [Integer] 積年(甲子夜半朔旦冬至〜暦の開始前)
|
48
|
+
TOTAL_YEAR = 7_070_138
|
49
|
+
# @return [Integer] 暦の開始年(長慶2年)
|
50
|
+
BEGIN_YEAR = 822
|
51
|
+
end
|
49
52
|
end
|
50
53
|
end
|
51
54
|
end
|