zakuro 0.7.2 → 0.8.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (136) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +3 -3
  3. data/VERSION +1 -1
  4. data/lib/zakuro/calculation/base/gengou.rb +5 -5
  5. data/lib/zakuro/calculation/base/linear_gengou.rb +5 -5
  6. data/lib/zakuro/calculation/base/operated_year.rb +23 -21
  7. data/lib/zakuro/calculation/base/year.rb +3 -3
  8. data/lib/zakuro/calculation/cycle/abstract_remainder.rb +50 -44
  9. data/lib/zakuro/calculation/cycle/abstract_solar_term.rb +28 -24
  10. data/lib/zakuro/calculation/cycle/zodiac.rb +22 -20
  11. data/lib/zakuro/calculation/era/gengou/abstract_scroll.rb +38 -29
  12. data/lib/zakuro/calculation/era/gengou/internal/connector.rb +4 -4
  13. data/lib/zakuro/calculation/era/gengou/internal/counter.rb +16 -16
  14. data/lib/zakuro/calculation/era/gengou/internal/publisher.rb +74 -72
  15. data/lib/zakuro/calculation/era/gengou/internal/reserve/abstract_list.rb +16 -16
  16. data/lib/zakuro/calculation/era/gengou/internal/reserve/abstract_range.rb +58 -35
  17. data/lib/zakuro/calculation/era/gengou/internal/reserve/dated_list.rb +3 -3
  18. data/lib/zakuro/calculation/era/gengou/internal/reserve/empty_link.rb +111 -113
  19. data/lib/zakuro/calculation/era/gengou/internal/reserve/named_list.rb +6 -6
  20. data/lib/zakuro/calculation/era/gengou/internal/reserve/named_range.rb +7 -9
  21. data/lib/zakuro/calculation/era/gengou/internal/reserve.rb +22 -20
  22. data/lib/zakuro/calculation/era/version/internal/crawler.rb +39 -22
  23. data/lib/zakuro/calculation/era/version/version.rb +12 -10
  24. data/lib/zakuro/calculation/monthly/abstract_lunar_phase.rb +13 -9
  25. data/lib/zakuro/calculation/monthly/const.rb +18 -0
  26. data/lib/zakuro/calculation/monthly/initialized_month.rb +39 -37
  27. data/lib/zakuro/calculation/monthly/month.rb +15 -15
  28. data/lib/zakuro/calculation/monthly/month_label.rb +4 -4
  29. data/lib/zakuro/calculation/monthly/operated_month.rb +36 -85
  30. data/lib/zakuro/calculation/monthly/operated_solar_term.rb +80 -0
  31. data/lib/zakuro/calculation/range/abstract_full_range.rb +34 -21
  32. data/lib/zakuro/calculation/range/abstract_operation_range.rb +109 -107
  33. data/lib/zakuro/calculation/range/medieval_annual_range.rb +64 -63
  34. data/lib/zakuro/calculation/range/operated_solar_term.rb +220 -0
  35. data/lib/zakuro/calculation/range/transfer/gengou_scroller.rb +32 -29
  36. data/lib/zakuro/calculation/range/transfer/year_boundary.rb +115 -117
  37. data/lib/zakuro/calculation/stella/lunar/abstract_location.rb +1 -1
  38. data/lib/zakuro/calculation/stella/lunar/choukei_value.rb +48 -46
  39. data/lib/zakuro/calculation/stella/solar/abstract_average.rb +31 -26
  40. data/lib/zakuro/calculation/stella/solar/abstract_location.rb +5 -5
  41. data/lib/zakuro/calculation/stella/solar/choukei_value.rb +114 -114
  42. data/lib/zakuro/calculation/summary/internal/day.rb +21 -19
  43. data/lib/zakuro/calculation/summary/internal/month.rb +25 -12
  44. data/lib/zakuro/calculation/summary/internal/operation.rb +68 -67
  45. data/lib/zakuro/calculation/summary/internal/option.rb +66 -50
  46. data/lib/zakuro/calculation/summary/japan/range.rb +145 -124
  47. data/lib/zakuro/calculation/summary/japan/single.rb +87 -87
  48. data/lib/zakuro/calculation/summary/japan/specifier/single_day.rb +54 -52
  49. data/lib/zakuro/calculation/summary/japan/specifier/specified_range.rb +34 -0
  50. data/lib/zakuro/calculation/summary/western/range.rb +95 -92
  51. data/lib/zakuro/calculation/summary/western/single.rb +78 -76
  52. data/lib/zakuro/calculation/summary/western/specifier/multiple_day.rb +123 -124
  53. data/lib/zakuro/calculation/summary/western/specifier/single_day.rb +60 -58
  54. data/lib/zakuro/calculation/type/old_float.rb +2 -2
  55. data/lib/zakuro/condition.rb +121 -111
  56. data/lib/zakuro/context/context.rb +1 -1
  57. data/lib/zakuro/context/option.rb +31 -29
  58. data/lib/zakuro/context/version_class_resolver.rb +26 -24
  59. data/lib/zakuro/era/japan/calendar.rb +35 -33
  60. data/lib/zakuro/era/japan/gengou/alignment/aligner.rb +4 -4
  61. data/lib/zakuro/era/japan/gengou/alignment/division.rb +117 -118
  62. data/lib/zakuro/era/japan/gengou/alignment/line.rb +7 -5
  63. data/lib/zakuro/era/japan/gengou/alignment/linear_gengou.rb +20 -14
  64. data/lib/zakuro/era/japan/gengou/alignment.rb +27 -25
  65. data/lib/zakuro/era/japan/gengou/resource/parser.rb +51 -36
  66. data/lib/zakuro/era/japan/gengou/resource/type.rb +39 -37
  67. data/lib/zakuro/era/japan/gengou/resource/validator.rb +34 -32
  68. data/lib/zakuro/era/japan/gengou.rb +28 -26
  69. data/lib/zakuro/era/japan/version.rb +18 -16
  70. data/lib/zakuro/era/western/calendar.rb +102 -90
  71. data/lib/zakuro/exception/case/preset.rb +2 -2
  72. data/lib/zakuro/exception/exception.rb +15 -13
  73. data/lib/zakuro/exception/zakuro_error.rb +1 -1
  74. data/lib/zakuro/gateway/locale/date.rb +2 -2
  75. data/lib/zakuro/gateway/locale/range.rb +3 -3
  76. data/lib/zakuro/gateway/range.rb +1 -1
  77. data/lib/zakuro/gateway/single.rb +13 -2
  78. data/lib/zakuro/merchant.rb +1 -1
  79. data/lib/zakuro/operation/month/parser.rb +252 -251
  80. data/lib/zakuro/operation/month/type.rb +17 -8
  81. data/lib/zakuro/operation/month/validator.rb +148 -144
  82. data/lib/zakuro/operation/operation.rb +38 -36
  83. data/lib/zakuro/output/response.rb +112 -113
  84. data/lib/zakuro/result/operation/month/annotation.rb +2 -2
  85. data/lib/zakuro/result/operation/month/history.rb +2 -2
  86. data/lib/zakuro/result/operation/month.rb +31 -0
  87. data/lib/zakuro/result/operation.rb +39 -0
  88. data/lib/zakuro/result/result.rb +3 -3
  89. data/lib/zakuro/tools/stringifier.rb +66 -64
  90. data/lib/zakuro/tools/typeconv.rb +17 -15
  91. data/lib/zakuro/tools/typeof.rb +15 -13
  92. data/lib/zakuro/version/daien/monthly/lunar_phase.rb +10 -12
  93. data/lib/zakuro/version/daien/range/annual_range.rb +19 -17
  94. data/lib/zakuro/version/daien/stella/lunar/adjustment.rb +42 -39
  95. data/lib/zakuro/version/daien/stella/lunar/localization.rb +16 -14
  96. data/lib/zakuro/version/daien/stella/lunar/value.rb +52 -49
  97. data/lib/zakuro/version/daien/stella/origin/average_november.rb +15 -13
  98. data/lib/zakuro/version/daien/stella/origin/lunar_age.rb +23 -21
  99. data/lib/zakuro/version/daien/stella/origin/winter_solstice.rb +22 -20
  100. data/lib/zakuro/version/daien/stella/solar/adjustment.rb +12 -10
  101. data/lib/zakuro/version/daien/stella/solar/average.rb +53 -51
  102. data/lib/zakuro/version/daien/stella/solar/interval.rb +19 -17
  103. data/lib/zakuro/version/daien/stella/solar/value.rb +13 -11
  104. data/lib/zakuro/version/genka/cycle/remainder.rb +2 -2
  105. data/lib/zakuro/version/genka/monthly/lunar_phase.rb +7 -5
  106. data/lib/zakuro/version/genka/range/annual_range.rb +48 -44
  107. data/lib/zakuro/version/genka/stella/origin/first_term.rb +30 -28
  108. data/lib/zakuro/version/genka/stella/origin/january.rb +22 -20
  109. data/lib/zakuro/version/gihou/monthly/lunar_phase.rb +9 -9
  110. data/lib/zakuro/version/gihou/range/annual_range.rb +19 -17
  111. data/lib/zakuro/version/gihou/stella/lunar/adjustment.rb +42 -39
  112. data/lib/zakuro/version/gihou/stella/lunar/localization.rb +16 -14
  113. data/lib/zakuro/version/gihou/stella/lunar/value.rb +52 -49
  114. data/lib/zakuro/version/gihou/stella/origin/average_november.rb +15 -13
  115. data/lib/zakuro/version/gihou/stella/origin/lunar_age.rb +23 -21
  116. data/lib/zakuro/version/gihou/stella/origin/winter_solstice.rb +24 -22
  117. data/lib/zakuro/version/gihou/stella/solar/adjustment.rb +12 -10
  118. data/lib/zakuro/version/gihou/stella/solar/average.rb +52 -50
  119. data/lib/zakuro/version/gihou/stella/solar/interval.rb +19 -17
  120. data/lib/zakuro/version/gihou/stella/solar/value.rb +13 -11
  121. data/lib/zakuro/version/senmyou/monthly/lunar_phase.rb +10 -10
  122. data/lib/zakuro/version/senmyou/range/annual_range.rb +19 -17
  123. data/lib/zakuro/version/senmyou/stella/lunar/adjustment.rb +42 -38
  124. data/lib/zakuro/version/senmyou/stella/lunar/localization.rb +16 -14
  125. data/lib/zakuro/version/senmyou/stella/lunar/value.rb +39 -36
  126. data/lib/zakuro/version/senmyou/stella/origin/average_november.rb +15 -13
  127. data/lib/zakuro/version/senmyou/stella/origin/lunar_age.rb +23 -21
  128. data/lib/zakuro/version/senmyou/stella/origin/winter_solstice.rb +22 -20
  129. data/lib/zakuro/version/senmyou/stella/solar/adjustment.rb +12 -10
  130. data/lib/zakuro/version/senmyou/stella/solar/average.rb +52 -50
  131. data/lib/zakuro/version/senmyou/stella/solar/interval.rb +19 -17
  132. data/lib/zakuro/version/senmyou/stella/solar/value.rb +13 -11
  133. metadata +12 -9
  134. data/lib/zakuro/calculation/range/operated_solar_terms.rb +0 -218
  135. data/lib/zakuro/result/operation/bundle.rb +0 -44
  136. data/lib/zakuro/result/operation/month/bundle.rb +0 -36
@@ -14,24 +14,26 @@ module Zakuro
14
14
  # AnnualRange 年間範囲
15
15
  #
16
16
  module AnnualRange
17
- #
18
- # 一覧取得する
19
- #
20
- # * 対象年に対して、前年11月-当年11月までを出力する
21
- # * 対象年(西暦)と計算年(元号x年)の紐付けは行わない
22
- #
23
- # @param [Context::Context] context 暦コンテキスト
24
- # @param [Integer] western_year 西暦年
25
- #
26
- # @return [Array<Month>] 1年データ
27
- #
28
- def self.get(context:, western_year:)
29
- lunar_phase = Monthly::LunarPhase.new(western_year: western_year)
30
- solar_average = Solar::Average.new(western_year: western_year)
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
- Calculation::Range::MedievalAnnualRange.get(
33
- context: context, lunar_phase: lunar_phase, solar_average: solar_average
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
- return false unless @day == day
63
+ inner_day = @day
64
+ return false unless inner_day == day
64
65
 
65
- return false unless @range.include?(minute: minute)
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
- @range.denominator
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 >= @min && minute <= @max
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
- @max - @min
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:#{@per}, stack:#{@stack}"
154
+ "per:#{per}, stack:#{stack}"
154
155
  end
155
156
  end
156
157
 
@@ -197,44 +198,46 @@ module Zakuro
197
198
  ].freeze
198
199
  # rubocop:enable Layout/LineLength
199
200
 
200
- #
201
- # 月軌道の補正に必要な基本値を引き当てる
202
- #
203
- # @param [True, False] forward 進(遠地点より数える)/退(近地点より数える)
204
- # @param [Integer] day 大余
205
- # @param [Integer] minute 小余
206
- #
207
- # @return [Row] 補正値
208
- #
209
- # @raise [ArgumentError] 引数エラー
210
- #
211
- def self.specify(day:, minute:)
212
- LIST.each do |row|
213
- # NOTE: 範囲が重複している場合、最初に引き当てたほうを優先する
214
- return row if row.match?(day: day, minute: minute)
215
- end
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
216
218
 
217
- raise ArgumentError.new, "invalid parameter: #{day}/#{minute}"
218
- end
219
+ raise ArgumentError.new, "invalid parameter: #{day}/#{minute}"
220
+ end
219
221
 
220
- # :reek:ControlParameter
222
+ # :reek:ControlParameter
221
223
 
222
- #
223
- # 小余の下げ幅を求める
224
- #
225
- # @param [Integer] day 大余
226
- # @param [Integer] minute 小余
227
- #
228
- # @return [Integer] 小余の下げ幅
229
- #
230
- def self.minus_minute(day:, minute:)
231
- limit = DAY_LIMIT.fetch(day, -1)
232
- # 該当なし
233
- return minute if limit == -1
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
234
236
 
235
- return minute unless minute > limit
237
+ return minute unless minute > limit
236
238
 
237
- minute - limit
239
+ minute - limit
240
+ end
238
241
  end
239
242
  end
240
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
- # @param [Remainder] lunar_age 天正閏余
28
- # @param [Integer] western_year 西暦年
29
- #
30
- # @return [Cycle::LunarRemainder] 入暦
31
- #
32
- def self.first_remainder(lunar_age:, western_year:)
33
- # 積年の開始から対象年までの年数
34
- total_year = TOTAL_YEAR + western_year - BEGIN_YEAR
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
- total_day = total_year * YEAR - lunar_age.to_minute
37
+ # 通積分 - 天正閏余
38
+ total_day = total_year * YEAR - lunar_age.to_minute
38
39
 
39
- Cycle::LunarRemainder.new(total: (total_day % ANOMALISTIC_MONTH))
40
+ Cycle::LunarRemainder.new(total: (total_day % ANOMALISTIC_MONTH))
41
+ end
40
42
  end
41
43
  end
42
44
  end
@@ -21,56 +21,59 @@ module Zakuro
21
21
 
22
22
  # :reek:TooManyStatements { max_statements: 9 }
23
23
 
24
- #
25
- # 月の運行による補正値を算出する
26
- #
27
- # @param [Cycle::LunarRemainder] remainder 月の大余小余
28
- #
29
- # @return [Integer] 補正値
30
- #
31
- def self.get(remainder:)
32
- valid?(remainder: remainder)
33
-
34
- day, minute = Calculation::Lunar::ChoukeiValue.remainder_without_second(
35
- remainder: remainder
36
- )
37
-
38
- # 引き当て
39
- row = Adjustment.specify(day: day, minute: minute)
40
-
41
- value = row.value
42
-
43
- # LOGGER.debug("value.per: #{value.per}")
44
- # LOGGER.debug("row.denominator: #{row.denominator}")
45
- # LOGGER.debug("value.stack: #{value.stack}")
46
-
47
- minus_minute = Adjustment.minus_minute(day: day, minute: minute)
48
-
49
- day = Calculation::Lunar::ChoukeiValue.rounded_day(
50
- per: value.per, denominator: row.denominator, minute: minus_minute
51
- )
52
-
53
- # LOGGER.debug("day: #{day}")
54
-
55
- value.stack + day
56
- end
57
-
58
- #
59
- # 大余小余を検証する
60
- #
61
- # @param [Cycle::LunarRemainder] remainder 大余小余
62
- #
63
- # @return [True] 正しい(月の位相計算に使う大余小余)
64
- # @return [True] 正しくない
65
- #
66
- # @raise [ArgumentError] 引数エラー
67
- #
68
- def self.valid?(remainder:)
69
- return if remainder.is_a?(Cycle::LunarRemainder)
70
-
71
- raise ArgumentError, "unmatch parameter type: #{remainder.class}"
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
72
76
  end
73
- private_class_method :valid?
74
77
  end
75
78
  end
76
79
  end
@@ -13,20 +13,22 @@ module Zakuro
13
13
  # AverageNovember 11月経
14
14
  #
15
15
  module AverageNovember
16
- #
17
- # 11月経朔(冬至が含まれる月の1日)を求める
18
- #
19
- # @param [Integer] western_year 西暦年
20
- #
21
- # @return [Remainder] 11月経朔
22
- #
23
- def self.get(western_year:)
24
- # 冬至
25
- winter_solstice = WinterSolstice.get(western_year: western_year)
26
- # 天正閏余
27
- lunar_age = LunarAge.get(western_year: western_year)
16
+ class << self
17
+ #
18
+ # 11月経朔(冬至が含まれる月の1日)を求める
19
+ #
20
+ # @param [Integer] western_year 西暦年
21
+ #
22
+ # @return [Remainder] 11月経朔
23
+ #
24
+ def get(western_year:)
25
+ # 冬至
26
+ winter_solstice = WinterSolstice.get(western_year: western_year)
27
+ # 天正閏余
28
+ lunar_age = LunarAge.get(western_year: western_year)
28
29
 
29
- winter_solstice.sub(lunar_age)
30
+ winter_solstice.sub(lunar_age)
31
+ end
30
32
  end
31
33
  end
32
34
  end
@@ -28,33 +28,35 @@ module Zakuro
28
28
 
29
29
  # :reek:TooManyStatements { max_statements: 7 }
30
30
 
31
- #
32
- # 対象年の天正閏余(冬至より前にある11月経朔との差 = 月齢)を算出する
33
- # 太陽と月の運動による補正値を算出し、その補正結果を返す
34
- #
35
- # @param [Integer] western_year 西暦年
36
- #
37
- # @return [Remainder] 天正閏余
38
- #
39
- def self.get(western_year:)
40
- # 積年の開始から対象年までの年数
41
- total = TOTAL_YEAR + western_year - BEGIN_YEAR
31
+ class << self
32
+ #
33
+ # 対象年の天正閏余(冬至より前にある11月経朔との差 = 月齢)を算出する
34
+ # 太陽と月の運動による補正値を算出し、その補正結果を返す
35
+ #
36
+ # @param [Integer] western_year 西暦年
37
+ #
38
+ # @return [Remainder] 天正閏余
39
+ #
40
+ def get(western_year:)
41
+ # 積年の開始から対象年までの年数
42
+ total = TOTAL_YEAR + western_year - BEGIN_YEAR
42
43
 
43
- # 12朔望月に対する1年の余り(単位:分)
44
- remainder_minute = YEAR - (SYNODIC_MONTH * 12)
44
+ # 12朔望月に対する1年の余り(単位:分)
45
+ remainder_minute = YEAR - (SYNODIC_MONTH * 12)
45
46
 
46
- # 朔望月に含まれなかった余り(単位:年)
47
- remainder_year = total % SYNODIC_MONTH
47
+ # 朔望月に含まれなかった余り(単位:年)
48
+ remainder_year = total % SYNODIC_MONTH
48
49
 
49
- LOGGER.debug("[01]: #{remainder_year}")
50
+ LOGGER.debug("[01]: #{remainder_year}")
50
51
 
51
- # 天正閏余
52
- lunar_age = remainder_minute * remainder_year % SYNODIC_MONTH
52
+ # 天正閏余
53
+ lunar_age = remainder_minute * remainder_year % SYNODIC_MONTH
53
54
 
54
- LOGGER.debug("[02]: #{lunar_age}")
55
+ LOGGER.debug("[02]: #{lunar_age}")
55
56
 
56
- # 大余・小余に変換する
57
- Cycle::Remainder.new(total: lunar_age)
57
+ # 大余・小余に変換する
58
+ Cycle::Remainder.new(total: lunar_age)
59
+ end
58
60
  end
59
61
  end
60
62
  end
@@ -28,26 +28,28 @@ module Zakuro
28
28
 
29
29
  # :reek:TooManyStatements { max_statements: 6 }
30
30
 
31
- #
32
- # 対象年の前年の冬至を求める
33
- #
34
- # @param [Integer] western_year 西暦年
35
- #
36
- # @return [Remainder] 前年の冬至
37
- #
38
- def self.get(western_year:)
39
- # 積年の開始から対象年までの年数
40
- total = TOTAL_YEAR + western_year - BEGIN_YEAR
41
- remainder_year = total % SIXTY_DAYS
42
-
43
- LOGGER.debug("[01]:#{remainder_year}")
44
-
45
- # 通余を使う
46
- winter_solstice_minute = (remainder_year * REMAINDER_ALL_YEAR) % SIXTY_DAYS
47
-
48
- LOGGER.debug("[02]:#{winter_solstice_minute}")
49
-
50
- Cycle::Remainder.new(total: winter_solstice_minute)
31
+ class << self
32
+ #
33
+ # 対象年の前年の冬至を求める
34
+ #
35
+ # @param [Integer] western_year 西暦年
36
+ #
37
+ # @return [Remainder] 前年の冬至
38
+ #
39
+ def get(western_year:)
40
+ # 積年の開始から対象年までの年数
41
+ total = TOTAL_YEAR + western_year - BEGIN_YEAR
42
+ remainder_year = total % SIXTY_DAYS
43
+
44
+ LOGGER.debug("[01]:#{remainder_year}")
45
+
46
+ # 通余を使う
47
+ winter_solstice_minute = (remainder_year * REMAINDER_ALL_YEAR) % SIXTY_DAYS
48
+
49
+ LOGGER.debug("[02]:#{winter_solstice_minute}")
50
+
51
+ Cycle::Remainder.new(total: winter_solstice_minute)
52
+ end
51
53
  end
52
54
  end
53
55
  end
@@ -76,16 +76,18 @@ module Zakuro
76
76
  taisetsu: Row.new(stack: -176.0, per_term: +10.9010, per_day: +0.1886) # 大雪(たいせつ)
77
77
  }.freeze
78
78
 
79
- #
80
- # 24気損益眺朒(ちょうじく)数の行データを特定する
81
- #
82
- # @param [Integer] index 連番(二十四節気)
83
- #
84
- # @return [Row] 行データ
85
- #
86
- def self.specify(index:)
87
- key = Cycle::SolarTerm::ORDER[index]
88
- Adjustment::MAP[key].clone
79
+ class << self
80
+ #
81
+ # 24気損益眺朒(ちょうじく)数の行データを特定する
82
+ #
83
+ # @param [Integer] index 連番(二十四節気)
84
+ #
85
+ # @return [Row] 行データ
86
+ #
87
+ def specify(index:)
88
+ key = Cycle::SolarTerm::ORDER[index]
89
+ Adjustment::MAP[key].clone
90
+ end
89
91
  end
90
92
  end
91
93
  end
@@ -26,7 +26,7 @@ module Zakuro
26
26
  # @param [Integer] western_year 西暦年
27
27
  #
28
28
  def initialize(western_year:)
29
- solar_term = Average.first_solar_term(western_year: western_year)
29
+ solar_term = self.class.first_solar_term(western_year: western_year)
30
30
  super(solar_term: solar_term)
31
31
  end
32
32
 
@@ -41,56 +41,58 @@ module Zakuro
41
41
  super(annual_range: annual_range)
42
42
  end
43
43
 
44
- #
45
- # 計算開始する二十四節気を求める
46
- #
47
- # @param [Integer] western_year 西暦年
48
- #
49
- # @return [SolarTerm] 二十四節気
50
- #
51
- def self.first_solar_term(western_year:)
52
- # 天正冬至
53
- winter_solstice = Origin::WinterSolstice.get(western_year: western_year)
54
-
55
- # 二十四節気(冬至)
56
- solar_term = Cycle::SolarTerm.new(index: 0, remainder: winter_solstice)
57
-
58
- first_solar_term_index = Average.calc_first_solar_term_index(western_year: western_year)
59
-
60
- # 対象の二十四節気まで戻す
61
- solar_term.prev_by_index(first_solar_term_index)
62
-
63
- solar_term
64
- end
65
-
66
- # :reek:TooManyStatements { max_statements: 6 }
67
-
68
- #
69
- # 計算開始する二十四節気番号を求める
70
- #
71
- # * 前提として入定気は冬至の手前にある
72
- # * 例えば、定気が大雪であれば入定気は大雪の範囲内にある
73
- # * 入定気は、定気の開始位置に重複しない限り、常に定気より後にある
74
- # * 基本的に定気の一つ前から起算すれば、当時から求めた11月(閏10/閏11月)に二十四節気を割り当てられる
75
- #
76
- # @param [Integer] western_year 西暦年
77
- #
78
- # @return [Integer] 二十四節気番号
79
- #
80
- def self.calc_first_solar_term_index(western_year:)
81
- # 天正閏余
82
- lunar_age = Origin::LunarAge.get(western_year: western_year)
83
-
84
- solar_location = Solar::Location.new(lunar_age: lunar_age)
85
- solar_location.run
86
-
87
- solar_term_index = solar_location.index
88
-
89
- # 入定気の一つ後の二十四節気まで戻す(ただし11月経朔が二十四節気上にある場合は戻さない)
90
- # NOTE: 789年で大余0のパターンあり
91
- solar_term_index += 1 unless solar_location.remainder.day.zero?
92
-
93
- solar_term_index
44
+ class << self
45
+ #
46
+ # 計算開始する二十四節気を求める
47
+ #
48
+ # @param [Integer] western_year 西暦年
49
+ #
50
+ # @return [SolarTerm] 二十四節気
51
+ #
52
+ def first_solar_term(western_year:)
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
65
+ end
66
+
67
+ # :reek:TooManyStatements { max_statements: 6 }
68
+
69
+ #
70
+ # 計算開始する二十四節気番号を求める
71
+ #
72
+ # * 前提として入定気は冬至の手前にある
73
+ # * 例えば、定気が大雪であれば入定気は大雪の範囲内にある
74
+ # * 入定気は、定気の開始位置に重複しない限り、常に定気より後にある
75
+ # * 基本的に定気の一つ前から起算すれば、当時から求めた11月(閏10/閏11月)に二十四節気を割り当てられる
76
+ #
77
+ # @param [Integer] western_year 西暦年
78
+ #
79
+ # @return [Integer] 二十四節気番号
80
+ #
81
+ def calc_first_solar_term_index(western_year:)
82
+ # 天正閏余
83
+ lunar_age = Origin::LunarAge.get(western_year: western_year)
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
+ # NOTE: 789年で大余0のパターンあり
92
+ solar_term_index += 1 unless solar_location.remainder.day.zero?
93
+
94
+ solar_term_index
95
+ end
94
96
  end
95
97
  end
96
98
  end