zakuro 0.7.0 → 0.9.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +48 -13
- data/VERSION +1 -1
- data/doc/dropped_date.md +93 -0
- data/doc/error.md +45 -0
- data/doc/operation/csv/month.csv +100 -79
- data/doc/operation/operation.xlsx +0 -0
- data/lib/zakuro/calculation/base/day.rb +52 -0
- data/lib/zakuro/calculation/base/gengou.rb +5 -5
- data/lib/zakuro/calculation/base/linear_gengou.rb +5 -5
- data/lib/zakuro/calculation/base/operated_year.rb +26 -24
- data/lib/zakuro/calculation/base/year.rb +7 -7
- data/lib/zakuro/calculation/cycle/abstract_remainder.rb +55 -47
- data/lib/zakuro/calculation/cycle/abstract_solar_term.rb +28 -24
- data/lib/zakuro/calculation/cycle/zodiac.rb +22 -20
- data/lib/zakuro/calculation/era/gengou/abstract_scroll.rb +38 -29
- data/lib/zakuro/calculation/era/gengou/internal/connector.rb +4 -4
- data/lib/zakuro/calculation/era/gengou/internal/counter.rb +16 -16
- data/lib/zakuro/calculation/era/gengou/internal/publisher.rb +74 -72
- data/lib/zakuro/calculation/era/gengou/internal/reserve/abstract_list.rb +16 -16
- data/lib/zakuro/calculation/era/gengou/internal/reserve/abstract_range.rb +58 -35
- data/lib/zakuro/calculation/era/gengou/internal/reserve/dated_list.rb +3 -3
- data/lib/zakuro/calculation/era/gengou/internal/reserve/empty_link.rb +111 -113
- data/lib/zakuro/calculation/era/gengou/internal/reserve/named_list.rb +6 -6
- data/lib/zakuro/calculation/era/gengou/internal/reserve/named_range.rb +7 -9
- data/lib/zakuro/calculation/era/gengou/internal/reserve.rb +22 -20
- data/lib/zakuro/calculation/era/version/internal/crawler.rb +39 -22
- data/lib/zakuro/calculation/era/version/version.rb +12 -10
- data/lib/zakuro/calculation/monthly/abstract_lunar_phase.rb +13 -9
- data/lib/zakuro/calculation/monthly/const.rb +18 -0
- data/lib/zakuro/calculation/monthly/initialized_month.rb +40 -38
- data/lib/zakuro/calculation/monthly/month.rb +17 -17
- data/lib/zakuro/calculation/monthly/month_label.rb +4 -4
- data/lib/zakuro/calculation/monthly/operated_month.rb +37 -86
- data/lib/zakuro/calculation/monthly/operated_solar_term.rb +80 -0
- data/lib/zakuro/calculation/option/dropped_date/abstract_parameter.rb +44 -0
- data/lib/zakuro/calculation/option/dropped_date/location.rb +135 -0
- data/lib/zakuro/calculation/range/abstract_full_range.rb +40 -25
- data/lib/zakuro/calculation/range/abstract_operation_range.rb +111 -109
- data/lib/zakuro/calculation/range/dated_full_range.rb +1 -1
- data/lib/zakuro/calculation/range/dated_operation_range.rb +1 -1
- data/lib/zakuro/calculation/range/medieval_annual_range.rb +64 -63
- data/lib/zakuro/calculation/range/named_full_range.rb +1 -1
- data/lib/zakuro/calculation/range/named_operation_range.rb +1 -1
- data/lib/zakuro/calculation/range/operated_solar_term.rb +220 -0
- data/lib/zakuro/calculation/range/transfer/gengou_scroller.rb +32 -29
- data/lib/zakuro/calculation/range/transfer/year_boundary.rb +115 -117
- data/lib/zakuro/calculation/stella/lunar/abstract_location.rb +1 -1
- data/lib/zakuro/calculation/stella/lunar/choukei_value.rb +48 -46
- data/lib/zakuro/calculation/stella/solar/abstract_average.rb +31 -26
- data/lib/zakuro/calculation/stella/solar/abstract_location.rb +7 -5
- data/lib/zakuro/calculation/stella/solar/choukei_value.rb +114 -114
- data/lib/zakuro/calculation/summary/internal/day.rb +42 -0
- data/lib/zakuro/calculation/summary/internal/month.rb +32 -11
- data/lib/zakuro/calculation/summary/internal/operation.rb +68 -67
- data/lib/zakuro/calculation/summary/internal/option.rb +101 -0
- data/lib/zakuro/calculation/summary/japan/range.rb +145 -118
- data/lib/zakuro/calculation/summary/japan/single.rb +87 -87
- data/lib/zakuro/calculation/summary/japan/specifier/single_day.rb +57 -50
- data/lib/zakuro/calculation/summary/japan/specifier/specified_range.rb +34 -0
- data/lib/zakuro/calculation/summary/western/range.rb +95 -92
- data/lib/zakuro/calculation/summary/western/single.rb +78 -76
- data/lib/zakuro/calculation/summary/western/specifier/multiple_day.rb +123 -119
- data/lib/zakuro/calculation/summary/western/specifier/single_day.rb +63 -56
- data/lib/zakuro/calculation/type/old_float.rb +2 -2
- data/lib/zakuro/calculation/type/optional.rb +46 -0
- data/lib/zakuro/condition.rb +142 -92
- data/lib/zakuro/context/context.rb +44 -0
- data/lib/zakuro/context/option.rb +119 -0
- data/lib/zakuro/context/version_class_resolver.rb +112 -0
- data/lib/zakuro/era/japan/calendar.rb +35 -33
- data/lib/zakuro/era/japan/gengou/alignment/aligner.rb +8 -4
- data/lib/zakuro/era/japan/gengou/alignment/division.rb +117 -118
- data/lib/zakuro/era/japan/gengou/alignment/line.rb +7 -5
- data/lib/zakuro/era/japan/gengou/alignment/linear_gengou.rb +20 -14
- data/lib/zakuro/era/japan/gengou/alignment.rb +27 -25
- data/lib/zakuro/era/japan/gengou/resource/parser.rb +51 -34
- data/lib/zakuro/era/japan/gengou/resource/type.rb +45 -37
- data/lib/zakuro/era/japan/gengou/resource/validator.rb +34 -32
- data/lib/zakuro/era/japan/gengou.rb +28 -26
- data/lib/zakuro/era/japan/version.rb +18 -16
- data/lib/zakuro/era/western/calendar.rb +104 -88
- data/lib/zakuro/exception/case/pattern.rb +39 -3
- data/lib/zakuro/exception/case/preset.rb +2 -2
- data/lib/zakuro/exception/exception.rb +17 -15
- data/lib/zakuro/exception/zakuro_error.rb +19 -1
- data/lib/zakuro/gateway/locale/date.rb +2 -2
- data/lib/zakuro/gateway/locale/range.rb +3 -3
- data/lib/zakuro/gateway/range.rb +3 -3
- data/lib/zakuro/gateway/single.rb +14 -3
- data/lib/zakuro/merchant.rb +79 -9
- data/lib/zakuro/operation/month/parser.rb +252 -249
- data/lib/zakuro/operation/month/type.rb +17 -8
- data/lib/zakuro/operation/month/validator.rb +148 -144
- data/lib/zakuro/operation/operation.rb +38 -36
- data/lib/zakuro/operation/yaml/month.yaml +955 -281
- data/lib/zakuro/output/response.rb +107 -141
- data/lib/zakuro/result/data/option/abstract_option.rb +37 -0
- data/lib/zakuro/result/data/option/dropped_date/calculation.rb +47 -0
- data/lib/zakuro/result/data/option/dropped_date/option.rb +47 -0
- data/lib/zakuro/result/data/option/dropped_date/solar_term.rb +48 -0
- data/lib/zakuro/result/data/single_day.rb +9 -1
- data/lib/zakuro/result/operation/month/annotation.rb +2 -2
- data/lib/zakuro/result/operation/month/history.rb +2 -2
- data/lib/zakuro/result/operation/month.rb +31 -0
- data/lib/zakuro/result/operation.rb +39 -0
- data/lib/zakuro/result/result.rb +3 -3
- data/lib/zakuro/tools/stringifier.rb +67 -42
- data/lib/zakuro/tools/typeconv.rb +17 -15
- data/lib/zakuro/tools/typeof.rb +15 -13
- data/lib/zakuro/version/daien/cycle/remainder.rb +2 -2
- data/lib/zakuro/version/daien/monthly/lunar_phase.rb +10 -12
- data/lib/zakuro/version/daien/option/dropped_date/parameter.rb +31 -0
- data/lib/zakuro/version/daien/range/annual_range.rb +19 -17
- data/lib/zakuro/version/daien/stella/lunar/adjustment.rb +42 -37
- data/lib/zakuro/version/daien/stella/lunar/localization.rb +16 -14
- data/lib/zakuro/version/daien/stella/lunar/value.rb +52 -47
- data/lib/zakuro/version/daien/stella/origin/average_november.rb +15 -13
- data/lib/zakuro/version/daien/stella/origin/lunar_age.rb +23 -21
- data/lib/zakuro/version/daien/stella/origin/winter_solstice.rb +22 -20
- data/lib/zakuro/version/daien/stella/solar/adjustment.rb +12 -10
- data/lib/zakuro/version/daien/stella/solar/average.rb +53 -51
- data/lib/zakuro/version/daien/stella/solar/interval.rb +19 -17
- data/lib/zakuro/version/daien/stella/solar/value.rb +13 -11
- data/lib/zakuro/version/genka/cycle/remainder.rb +4 -4
- data/lib/zakuro/version/genka/monthly/lunar_phase.rb +7 -5
- data/lib/zakuro/version/genka/option/dropped_date/parameter.rb +31 -0
- data/lib/zakuro/version/genka/range/annual_range.rb +48 -44
- data/lib/zakuro/version/genka/stella/origin/first_term.rb +30 -28
- data/lib/zakuro/version/genka/stella/origin/january.rb +22 -20
- data/lib/zakuro/version/gihou/cycle/remainder.rb +2 -2
- data/lib/zakuro/version/gihou/monthly/lunar_phase.rb +9 -9
- data/lib/zakuro/version/gihou/option/dropped_date/parameter.rb +31 -0
- data/lib/zakuro/version/gihou/range/annual_range.rb +19 -17
- data/lib/zakuro/version/gihou/stella/lunar/adjustment.rb +42 -37
- data/lib/zakuro/version/gihou/stella/lunar/localization.rb +16 -14
- data/lib/zakuro/version/gihou/stella/lunar/value.rb +52 -47
- data/lib/zakuro/version/gihou/stella/origin/average_november.rb +15 -13
- data/lib/zakuro/version/gihou/stella/origin/lunar_age.rb +23 -21
- data/lib/zakuro/version/gihou/stella/origin/winter_solstice.rb +24 -22
- data/lib/zakuro/version/gihou/stella/solar/adjustment.rb +12 -10
- data/lib/zakuro/version/gihou/stella/solar/average.rb +52 -50
- data/lib/zakuro/version/gihou/stella/solar/interval.rb +19 -17
- data/lib/zakuro/version/gihou/stella/solar/value.rb +13 -11
- data/lib/zakuro/version/senmyou/const/remainder.rb +7 -1
- data/lib/zakuro/version/senmyou/cycle/remainder.rb +37 -2
- data/lib/zakuro/version/senmyou/monthly/lunar_phase.rb +10 -10
- data/lib/zakuro/version/senmyou/option/dropped_date/parameter.rb +33 -0
- data/lib/zakuro/version/senmyou/range/annual_range.rb +19 -17
- data/lib/zakuro/version/senmyou/stella/lunar/adjustment.rb +42 -36
- data/lib/zakuro/version/senmyou/stella/lunar/localization.rb +16 -14
- data/lib/zakuro/version/senmyou/stella/lunar/value.rb +39 -34
- data/lib/zakuro/version/senmyou/stella/origin/average_november.rb +15 -13
- data/lib/zakuro/version/senmyou/stella/origin/lunar_age.rb +23 -21
- data/lib/zakuro/version/senmyou/stella/origin/winter_solstice.rb +22 -20
- data/lib/zakuro/version/senmyou/stella/solar/adjustment.rb +12 -10
- data/lib/zakuro/version/senmyou/stella/solar/average.rb +52 -50
- data/lib/zakuro/version/senmyou/stella/solar/interval.rb +19 -17
- data/lib/zakuro/version/senmyou/stella/solar/value.rb +13 -11
- metadata +27 -7
- data/lib/zakuro/calculation/range/operated_solar_terms.rb +0 -218
- data/lib/zakuro/result/operation/month/bundle.rb +0 -36
- data/lib/zakuro/result/operation/operation.rb +0 -44
- data/lib/zakuro/version/context.rb +0 -44
- data/lib/zakuro/version/version_class_resolver.rb +0 -74
@@ -12,58 +12,83 @@ module Zakuro
|
|
12
12
|
# Stringifier 文字列処理
|
13
13
|
#
|
14
14
|
module Stringifier
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
obj
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
15
|
+
class << self
|
16
|
+
#
|
17
|
+
# 対象インスタンスをハッシュ化する
|
18
|
+
#
|
19
|
+
# @param [Object] obj 対象インスタンス
|
20
|
+
# @param [String] class_prefix インスタンス内でハッシュ変換するクラスのプレフィックス
|
21
|
+
# @param [True, False] formatted 整形有無
|
22
|
+
#
|
23
|
+
# @return [Hash<String, Objcet>] ハッシュ
|
24
|
+
#
|
25
|
+
def to_h(obj:, class_prefix:, formatted: true)
|
26
|
+
hash = {}
|
27
|
+
obj.instance_variables.each do |var|
|
28
|
+
key = var.to_s.delete('@')
|
29
|
+
hash[key] = value_to_hash(
|
30
|
+
obj: obj.instance_variable_get(var), class_prefix: class_prefix, formatted: formatted
|
31
|
+
)
|
32
|
+
end
|
33
|
+
hash
|
30
34
|
end
|
31
|
-
hash
|
32
|
-
end
|
33
35
|
|
34
|
-
|
36
|
+
private
|
35
37
|
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
38
|
+
#
|
39
|
+
# 対象インスタンスをハッシュ化する(再帰処理)
|
40
|
+
#
|
41
|
+
# @param [Object] obj 対象インスタンス
|
42
|
+
# @param [String] class_prefix インスタンス内でハッシュ変換するクラスのプレフィックス
|
43
|
+
# @param [True, False] formatted 整形有無
|
44
|
+
#
|
45
|
+
# @return [Hash<String, Objcet>] ハッシュ
|
46
|
+
#
|
47
|
+
def value_to_hash(obj:, class_prefix:, formatted:)
|
48
|
+
return obj unless obj
|
46
49
|
|
47
|
-
|
48
|
-
|
50
|
+
# 日付をフォーマットする
|
51
|
+
return obj.format if formatted && Tools::Typeof.time?(obj: obj)
|
52
|
+
|
53
|
+
# 同じモジュール内のオブジェクトは再帰する
|
54
|
+
if obj.class.name.start_with?(class_prefix)
|
55
|
+
return to_h(obj: obj, class_prefix: class_prefix, formatted: formatted)
|
56
|
+
end
|
49
57
|
|
50
|
-
|
51
|
-
if obj.class.name.start_with?(class_prefix)
|
52
|
-
return to_h(obj: obj, class_prefix: class_prefix, formatted: formatted)
|
58
|
+
general_value_to_hash(obj: obj, class_prefix: class_prefix, formatted: formatted)
|
53
59
|
end
|
54
60
|
|
55
|
-
#
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
61
|
+
#
|
62
|
+
# ライブラリを問わない標準的な値をハッシュ化する(再帰処理)
|
63
|
+
#
|
64
|
+
# @param [Object] obj 対象インスタンス
|
65
|
+
# @param [String] class_prefix インスタンス内でハッシュ変換するクラスのプレフィックス
|
66
|
+
# @param [True, False] formatted 整形有無
|
67
|
+
#
|
68
|
+
# @return [Objcet] ハッシュ変換可能な値
|
69
|
+
#
|
70
|
+
def general_value_to_hash(obj:, class_prefix:, formatted:)
|
71
|
+
# 配列は要素一つずつで再帰する
|
72
|
+
if obj.is_a?(Array)
|
73
|
+
arr = []
|
74
|
+
obj.each do |item|
|
75
|
+
arr.push(to_h(obj: item, class_prefix: class_prefix, formatted: formatted))
|
76
|
+
end
|
77
|
+
return arr
|
78
|
+
end
|
79
|
+
|
80
|
+
# ハッシュはキーごとに再帰する
|
81
|
+
if obj.is_a?(Hash)
|
82
|
+
hash = {}
|
83
|
+
obj.each do |key, value|
|
84
|
+
hash[key] = to_h(obj: value, class_prefix: class_prefix, formatted: formatted)
|
85
|
+
end
|
86
|
+
return hash
|
60
87
|
end
|
61
|
-
return arr
|
62
|
-
end
|
63
88
|
|
64
|
-
|
89
|
+
obj
|
90
|
+
end
|
65
91
|
end
|
66
|
-
private_class_method :value_to_hash
|
67
92
|
end
|
68
93
|
end
|
69
94
|
end
|
@@ -16,22 +16,24 @@ module Zakuro
|
|
16
16
|
module Typeconv
|
17
17
|
LOGGER = Output::Logger.new(location: 'Typeconv')
|
18
18
|
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
19
|
+
class << self
|
20
|
+
#
|
21
|
+
# 文字列を10進数で数値化する
|
22
|
+
#
|
23
|
+
# @param [String] text 対象文字列
|
24
|
+
# @param [Integer] default デフォルト数値
|
25
|
+
#
|
26
|
+
# @return [Integer] 数値
|
27
|
+
#
|
28
|
+
def to_i(text:, default:)
|
29
|
+
begin
|
30
|
+
return Integer(text, 10)
|
31
|
+
rescue StandardError => e
|
32
|
+
LOGGER.debug(e)
|
33
|
+
end
|
33
34
|
|
34
|
-
|
35
|
+
default
|
36
|
+
end
|
35
37
|
end
|
36
38
|
end
|
37
39
|
end
|
data/lib/zakuro/tools/typeof.rb
CHANGED
@@ -14,22 +14,24 @@ module Zakuro
|
|
14
14
|
# Typeof 型判定
|
15
15
|
#
|
16
16
|
module Typeof
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
17
|
+
class << self
|
18
|
+
#
|
19
|
+
# 時間を表す型か
|
20
|
+
#
|
21
|
+
# @param [Object] obj 引数
|
22
|
+
#
|
23
|
+
# @return [True] 時間型である
|
24
|
+
# @return [False] 時間型ではない
|
25
|
+
#
|
26
|
+
def time?(obj:)
|
27
|
+
return true if obj.is_a?(Japan::Calendar)
|
27
28
|
|
28
|
-
|
29
|
+
return true if obj.is_a?(Western::Calendar)
|
29
30
|
|
30
|
-
|
31
|
+
return true if obj.is_a?(Calculation::Cycle::AbstractRemainder)
|
31
32
|
|
32
|
-
|
33
|
+
false
|
34
|
+
end
|
33
35
|
end
|
34
36
|
end
|
35
37
|
end
|
@@ -29,7 +29,7 @@ module Zakuro
|
|
29
29
|
# @param [Integer] total 繰り上げなしの小余
|
30
30
|
#
|
31
31
|
def initialize(day: -1, minute: -1, second: -1, total: -1)
|
32
|
-
super(base_day: Const::Number::Cycle::DAY,
|
32
|
+
super(base_day: Const::Number::Cycle::DAY, base_minute: MINUTE,
|
33
33
|
day: day, minute: minute, second: second, total: total)
|
34
34
|
end
|
35
35
|
|
@@ -63,7 +63,7 @@ module Zakuro
|
|
63
63
|
# @param [Integer] total 繰り上げなしの小余
|
64
64
|
#
|
65
65
|
def initialize(day: -1, minute: -1, second: -1, total: -1)
|
66
|
-
super(base_day: Const::Number::Cycle::DAY,
|
66
|
+
super(base_day: Const::Number::Cycle::DAY, base_minute: MINUTE,
|
67
67
|
day: day, minute: minute, second: second, total: total)
|
68
68
|
end
|
69
69
|
|
@@ -35,7 +35,7 @@ module Zakuro
|
|
35
35
|
lunar_age = Origin::LunarAge.get(western_year: western_year)
|
36
36
|
|
37
37
|
super(
|
38
|
-
|
38
|
+
quarter: QUARTER,
|
39
39
|
average_remainder: Origin::AverageNovember.get(western_year: western_year),
|
40
40
|
solar_location: Solar::Location.new(lunar_age: lunar_age),
|
41
41
|
lunar_location: Lunar::Location.new(
|
@@ -55,13 +55,13 @@ module Zakuro
|
|
55
55
|
# @return [Remainder] 定朔
|
56
56
|
#
|
57
57
|
def current_remainder
|
58
|
-
# debug("
|
58
|
+
# debug("average_remainder.format: #{average_remainder.format(form: '%d-%d-%.5f')}")
|
59
59
|
|
60
60
|
sum = correction_value
|
61
|
-
adjusted =
|
61
|
+
adjusted = average_remainder.add(
|
62
62
|
Cycle::Remainder.new(day: 0, minute: sum, second: 0)
|
63
63
|
)
|
64
|
-
#
|
64
|
+
# NOTE: 大衍暦では進朔しない
|
65
65
|
# adjusted.up_on_new_moon!
|
66
66
|
|
67
67
|
debug("result: #{adjusted.format}")
|
@@ -75,24 +75,22 @@ module Zakuro
|
|
75
75
|
# @return [Integer] 太陽運動の補正値
|
76
76
|
#
|
77
77
|
def correction_solar_value
|
78
|
-
|
79
|
-
# debug("
|
80
|
-
# debug("
|
78
|
+
solar_location.run
|
79
|
+
# debug("solar_term.remainder: #{solar_location.remainder.format(form: '%d-%d-%.5f')}")
|
80
|
+
# debug("solar_term.index: #{solar_location.index}")
|
81
81
|
|
82
|
-
Solar::Value.get(solar_location:
|
82
|
+
Solar::Value.get(solar_location: solar_location)
|
83
83
|
end
|
84
84
|
|
85
|
-
# :reek:TooManyStatements { max_statements: 6 }
|
86
|
-
|
87
85
|
#
|
88
86
|
# 月運動の補正値を得る
|
89
87
|
#
|
90
88
|
# @return [Integer] 月運動の補正値
|
91
89
|
#
|
92
90
|
def correction_moon_value
|
93
|
-
|
91
|
+
lunar_location.run
|
94
92
|
|
95
|
-
remainder =
|
93
|
+
remainder = lunar_location.adjusted_remainder
|
96
94
|
|
97
95
|
# debug("[lunar]remainder.format: #{remainder.format(form: '%d-%d-%.5f')}")
|
98
96
|
# debug("[lunar]remainder.day: #{remainder.day}")
|
@@ -0,0 +1,31 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require_relative '../../../../calculation/option/dropped_date/abstract_parameter'
|
4
|
+
|
5
|
+
require_relative '../../const/number'
|
6
|
+
require_relative '../../const/remainder'
|
7
|
+
require_relative '../../cycle/remainder'
|
8
|
+
|
9
|
+
# :nodoc:
|
10
|
+
module Zakuro
|
11
|
+
# :nodoc:
|
12
|
+
module Senmyou
|
13
|
+
# :nodoc:
|
14
|
+
module Daien
|
15
|
+
# :nodoc:
|
16
|
+
module DroppedDate
|
17
|
+
#
|
18
|
+
# Parameter 引数
|
19
|
+
#
|
20
|
+
class Parameter < Calculation::Option::DroppedDate::AbstractParameter
|
21
|
+
#
|
22
|
+
# 初期化
|
23
|
+
#
|
24
|
+
def initialize
|
25
|
+
super(valid: false)
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|
31
|
+
end
|
@@ -14,24 +14,26 @@ module Zakuro
|
|
14
14
|
# AnnualRange 年間範囲
|
15
15
|
#
|
16
16
|
module AnnualRange
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
17
|
+
class << self
|
18
|
+
#
|
19
|
+
# 一覧取得する
|
20
|
+
#
|
21
|
+
# * 対象年に対して、前年11月-当年11月までを出力する
|
22
|
+
# * 対象年(西暦)と計算年(元号x年)の紐付けは行わない
|
23
|
+
#
|
24
|
+
# @param [Context::Context] context 暦コンテキスト
|
25
|
+
# @param [Integer] western_year 西暦年
|
26
|
+
#
|
27
|
+
# @return [Array<Month>] 1年データ
|
28
|
+
#
|
29
|
+
def get(context:, western_year:)
|
30
|
+
lunar_phase = Monthly::LunarPhase.new(western_year: western_year)
|
31
|
+
solar_average = Solar::Average.new(western_year: western_year)
|
31
32
|
|
32
|
-
|
33
|
-
|
34
|
-
|
33
|
+
Calculation::Range::MedievalAnnualRange.get(
|
34
|
+
context: context, lunar_phase: lunar_phase, solar_average: solar_average
|
35
|
+
)
|
36
|
+
end
|
35
37
|
end
|
36
38
|
end
|
37
39
|
end
|
@@ -60,9 +60,10 @@ module Zakuro
|
|
60
60
|
# @return [False] 不一致
|
61
61
|
#
|
62
62
|
def match?(day:, minute:)
|
63
|
-
|
63
|
+
inner_day = @day
|
64
|
+
return false unless inner_day == day
|
64
65
|
|
65
|
-
return false unless
|
66
|
+
return false unless range.include?(minute: minute)
|
66
67
|
|
67
68
|
true
|
68
69
|
end
|
@@ -73,7 +74,7 @@ module Zakuro
|
|
73
74
|
# @return [Integer] 分母
|
74
75
|
#
|
75
76
|
def denominator
|
76
|
-
|
77
|
+
range.denominator
|
77
78
|
end
|
78
79
|
end
|
79
80
|
|
@@ -111,7 +112,7 @@ module Zakuro
|
|
111
112
|
# @return [False] 含まれない
|
112
113
|
#
|
113
114
|
def include?(minute:)
|
114
|
-
minute >=
|
115
|
+
minute >= min && minute <= max
|
115
116
|
end
|
116
117
|
|
117
118
|
#
|
@@ -120,7 +121,7 @@ module Zakuro
|
|
120
121
|
# @return [Integer] 分母
|
121
122
|
#
|
122
123
|
def denominator
|
123
|
-
|
124
|
+
max - min
|
124
125
|
end
|
125
126
|
end
|
126
127
|
|
@@ -150,7 +151,7 @@ module Zakuro
|
|
150
151
|
# @return [String] 文字
|
151
152
|
#
|
152
153
|
def to_s
|
153
|
-
"per:#{
|
154
|
+
"per:#{per}, stack:#{stack}"
|
154
155
|
end
|
155
156
|
end
|
156
157
|
|
@@ -197,42 +198,46 @@ module Zakuro
|
|
197
198
|
].freeze
|
198
199
|
# rubocop:enable Layout/LineLength
|
199
200
|
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
201
|
+
class << self
|
202
|
+
#
|
203
|
+
# 月軌道の補正に必要な基本値を引き当てる
|
204
|
+
#
|
205
|
+
# @param [True, False] forward 進(遠地点より数える)/退(近地点より数える)
|
206
|
+
# @param [Integer] day 大余
|
207
|
+
# @param [Integer] minute 小余
|
208
|
+
#
|
209
|
+
# @return [Row] 補正値
|
210
|
+
#
|
211
|
+
# @raise [ArgumentError] 引数エラー
|
212
|
+
#
|
213
|
+
def specify(day:, minute:)
|
214
|
+
LIST.each do |row|
|
215
|
+
# NOTE: 範囲が重複している場合、最初に引き当てたほうを優先する
|
216
|
+
return row if row.match?(day: day, minute: minute)
|
217
|
+
end
|
214
218
|
|
215
|
-
|
216
|
-
|
219
|
+
raise ArgumentError.new, "invalid parameter: #{day}/#{minute}"
|
220
|
+
end
|
217
221
|
|
218
|
-
|
222
|
+
# :reek:ControlParameter
|
219
223
|
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
231
|
-
|
224
|
+
#
|
225
|
+
# 小余の下げ幅を求める
|
226
|
+
#
|
227
|
+
# @param [Integer] day 大余
|
228
|
+
# @param [Integer] minute 小余
|
229
|
+
#
|
230
|
+
# @return [Integer] 小余の下げ幅
|
231
|
+
#
|
232
|
+
def minus_minute(day:, minute:)
|
233
|
+
limit = DAY_LIMIT.fetch(day, -1)
|
234
|
+
# 該当なし
|
235
|
+
return minute if limit == -1
|
232
236
|
|
233
|
-
|
237
|
+
return minute unless minute > limit
|
234
238
|
|
235
|
-
|
239
|
+
minute - limit
|
240
|
+
end
|
236
241
|
end
|
237
242
|
end
|
238
243
|
end
|
@@ -21,22 +21,24 @@ module Zakuro
|
|
21
21
|
# @return [Integer] 年
|
22
22
|
YEAR = Const::Number::Cycle::YEAR
|
23
23
|
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
24
|
+
class << self
|
25
|
+
#
|
26
|
+
# 対象年の最初の入暦を求める
|
27
|
+
#
|
28
|
+
# @param [Remainder] lunar_age 天正閏余
|
29
|
+
# @param [Integer] western_year 西暦年
|
30
|
+
#
|
31
|
+
# @return [Cycle::LunarRemainder] 入暦
|
32
|
+
#
|
33
|
+
def first_remainder(lunar_age:, western_year:)
|
34
|
+
# 積年の開始から対象年までの年数
|
35
|
+
total_year = TOTAL_YEAR + western_year - BEGIN_YEAR
|
35
36
|
|
36
|
-
|
37
|
-
|
37
|
+
# 通積分 - 天正閏余
|
38
|
+
total_day = total_year * YEAR - lunar_age.to_minute
|
38
39
|
|
39
|
-
|
40
|
+
Cycle::LunarRemainder.new(total: (total_day % ANOMALISTIC_MONTH))
|
41
|
+
end
|
40
42
|
end
|
41
43
|
end
|
42
44
|
end
|
@@ -21,54 +21,59 @@ module Zakuro
|
|
21
21
|
|
22
22
|
# :reek:TooManyStatements { max_statements: 9 }
|
23
23
|
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
return
|
68
|
-
|
69
|
-
raise ArgumentError
|
24
|
+
class << self
|
25
|
+
#
|
26
|
+
# 月の運行による補正値を算出する
|
27
|
+
#
|
28
|
+
# @param [Cycle::LunarRemainder] remainder 月の大余小余
|
29
|
+
#
|
30
|
+
# @return [Integer] 補正値
|
31
|
+
#
|
32
|
+
def get(remainder:)
|
33
|
+
valid?(remainder: remainder)
|
34
|
+
|
35
|
+
day, minute = Calculation::Lunar::ChoukeiValue.remainder_without_second(
|
36
|
+
remainder: remainder
|
37
|
+
)
|
38
|
+
|
39
|
+
# 引き当て
|
40
|
+
row = Adjustment.specify(day: day, minute: minute)
|
41
|
+
|
42
|
+
value = row.value
|
43
|
+
|
44
|
+
# LOGGER.debug("value.per: #{value.per}")
|
45
|
+
# LOGGER.debug("row.denominator: #{row.denominator}")
|
46
|
+
# LOGGER.debug("value.stack: #{value.stack}")
|
47
|
+
|
48
|
+
minus_minute = Adjustment.minus_minute(day: day, minute: minute)
|
49
|
+
|
50
|
+
day = Calculation::Lunar::ChoukeiValue.rounded_day(
|
51
|
+
per: value.per, denominator: row.denominator, minute: minus_minute
|
52
|
+
)
|
53
|
+
|
54
|
+
# LOGGER.debug("day: #{day}")
|
55
|
+
|
56
|
+
value.stack + day
|
57
|
+
end
|
58
|
+
|
59
|
+
private
|
60
|
+
|
61
|
+
#
|
62
|
+
# 大余小余を検証する
|
63
|
+
#
|
64
|
+
# @param [Cycle::LunarRemainder] remainder 大余小余
|
65
|
+
#
|
66
|
+
# @return [True] 正しい(月の位相計算に使う大余小余)
|
67
|
+
# @return [True] 正しくない
|
68
|
+
#
|
69
|
+
# @raise [ArgumentError] 引数エラー
|
70
|
+
#
|
71
|
+
def valid?(remainder:)
|
72
|
+
return if remainder.is_a?(Cycle::LunarRemainder)
|
73
|
+
|
74
|
+
raise ArgumentError, "unmatch parameter type: #{remainder.class}"
|
75
|
+
end
|
70
76
|
end
|
71
|
-
private_class_method :valid?
|
72
77
|
end
|
73
78
|
end
|
74
79
|
end
|