zakuro 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79211341aba598e1c98e7b3df3ffe0ce6f3016027fe0b2459bd2c68a18703e89
-  data.tar.gz: 17d2537acf7d477b6292d1b14e02dbd355499d1c12cf2491e419124108175d9b
+  metadata.gz: fffb0d3903b07bc1c5b884bb73bef8a11ff65f5cfdb4c7d2a58df1c2777da633
+  data.tar.gz: c4a5ede6b55e073ac1b82b11c4b19a56a7ae7a518391bcde2c86a94461c61928
 SHA512:
-  metadata.gz: '0196f4cd32a1b8b2d9d517ead1abf747f3be612d59514f68ef75670169c17da9e5222b8d1b63504520653aca6646a840a46b052246d192d27e22146372b52e14'
-  data.tar.gz: 8a9f4e91afd4d07868a470e8e372bd0534ddc9f72e55551febc3aba3970b589c896cf0ca8555e1bb71f1606d78078eabd5f70f5125b1680fd1e0b1eaeece9b54
+  metadata.gz: d2084bedda00006b2724616daaa6088e9034dd6e878d0ef145801a5da1ffd6e22af953ea812b24efcc996593a3ec0e7c49c368b8105f2a9b5d44efe9a91ff573
+  data.tar.gz: b960ab267ecb7667817c780b86b01ec4aac15a0d9f6ebde3a64c01cfd94d0343a9a37550ad9f98ea55a566102bcd426971e0d7ae1864a0a4af807a9414d4a8fd

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/doc/operation/csv/month.csv

@@ -351,7 +351,7 @@
 ,211-1-1,-,-,211,1,1037-4-18,長暦 1年 4 小 甲辰 39-5736,"計算は39癸卯であるが, 行親記により甲辰, 4月甲辰朔のユリウス暦日は4月19日。",-,true,朔日相違,-,-,大,小,-,-,-,-,-,-,癸卯,甲辰,1037-4-18,1037-4-19,39,40,1,1,-,-,-
 ,215-1-a,-,215-1-2,215,-,1050-10-19,永承 5年 10 小 乙卯 51-7981,-,変更なし,false,次月大小,-,-,小,小,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-
 ,215-1-0,215-1-2,-,215,-,1050-11-17,永承 5年 閏10 小 甲申 20-5089,-,-,true,朔旦冬至,11月,閏10月,大,小,0,-,-,-,1050-12-17,-,-,-,-,-,-,-,-,-,-,-,-
-,215-1-1,215-1-2,-,215,1,1050-12-17,永承 5年 11 大 癸丑 50-1948,-,-,true,朔旦冬至,閏11月,11月,大,大,-,0,-,-,-,1050-12-17,甲寅,癸丑,1050-12-17,1050-12-16,50,49,-1,-1,-,-,-
+,215-1-1,215-1-2,-,215,1,1050-12-17,永承 5年 11 大 癸丑 50-1948,-,-,true,朔旦冬至,閏11月,11月,大,大,-,0,-,-,-,1050-11-17,甲寅,癸丑,1050-12-17,1050-12-16,50,49,-1,-1,-,-,-
 ,215-1-2,-,-,215,1,1051-1-16,永承 5年 12 大 癸未 20-6665,"朔旦冬至にするために, 計算では閏11月であるが, 閏10月に変更された。そのためには中気のない月を閏月にするという規則に合わせるため, 11月朔を50甲寅から癸丑にする必要がある。それにつれて12月は甲申を癸未にしないと11月が31日になってしまう。11月癸丑朔のユリウス暦日は12月16日。12月癸丑朔は1月15日となる。（管見記84, 江次第, 扶桑略記などによる）。",-,true,朔旦冬至,-,-,小,大,-,-,-,-,-,-,甲申,癸未,1051-1-16,1051-1-15,20,19,-1,-1,-,-,-
 ,220-1-a,-,220-1-1,220,-,1063-9-25,康平 6年 9 大 己亥 35-2001,-,-,true,次月大小,-,-,小,大,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-
 ,220-1-1,-,-,220,1,1063-10-24,康平 6年 10 小 己巳 4-6004,"計算は4戊辰, 扶桑略記により己巳とする。10月己巳朔のユリウス暦日は10月25日。",-,true,朔日相違,-,-,大,小,-,-,-,-,-,-,戊辰,己巳,1063-10-24,1063-10-25,4,5,1,1,-,-,-
@@ -431,9 +431,8 @@
 ,311-3-1,-,-,311,3,1338-9-15,延元 3年 8 大 壬辰 29-103,"計算では29癸巳, 実夏公記ほか（大日本史料第6編の5）により壬辰, 8月壬辰朔のユリウス暦日は9月14日となる。これは章首のあとの閏8月を避けたものである。（大治4, 西暦1129年の注参照）",-,true,閏8月回避,閏8月,8月,小,大,-,18,-,-,-,1338-8-16,癸巳,壬辰,1338-9-15,1338-9-14,29,28,-1,-1,-,-,-
 ,313-1-a,-,313-1-1,313,-,1343-12-18,興国 4年 12 小 癸巳 29-814,-,-,true,次月大小,-,-,大,小,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-
 ,313-1-1,-,-,313,1,1344-1-17,興国 5年 1 大 壬戌 59-6335,"計算は59癸亥, 園太暦・師守記など（大日本史料第6編の8）により壬戌, 正月壬戌朔のユリウス暦日は1月16日。小余が進朔限に近く, 進朔すべきをしなかった司暦の誤りか。",-,true,進朔なし,-,-,小,大,-,-,-,-,-,-,癸亥,壬戌,1344-1-17,1344-1-16,59,58,-1,-1,-,-,-
-,318-1-a,-,318-1-1,318,-,1357-7-18,正平 12年 7 小 甲戌  10-1300,-,-,true,次月大小,-,-,大,小,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-
-,318-1-0,318-1-1,-,318,-,1357-8-16,正平 12年 閏7 小 癸卯 39-5146,-,-,true,閏8月回避,8月,閏7月,小,小,18,-,-,-,1357-9-15,-,-,-,-,-,-,-,-,-,-,-,-
-,318-1-1,-,-,318,1,1357-9-15,正平 12年 8 大 壬申 9-357,"計算では9癸酉であるが, 章首のあとの閏8月を避けるため壬申に変え閏7月にしたもの。（大日本史料第6編の21）8月壬申朔のユリウス暦日は9月14日となる。",-,true,閏8月回避,閏8月,8月,大,大,-,18,-,-,-,1357-8-16,癸酉,壬申,1357-9-15,1357-9-14,9,8,-1,-1,-,-,-
+,318-1-0,318-1-1,-,318,-,1357-8-16,正平 12年 閏7 小 癸卯 39-5146,-,-,true,閏8月回避,8月,閏7月,大,小,18,-,-,-,1357-9-15,-,-,-,-,-,-,-,-,-,-,-,-
+,318-1-1,-,-,318,1,1357-9-15,正平 12年 8 大 壬申 9-357,"計算では9癸酉であるが, 章首のあとの閏8月を避けるため壬申に変え閏7月にしたもの。（大日本史料第6編の21）8月壬申朔のユリウス暦日は9月14日となる。",-,true,閏8月回避,閏8月,8月,小,大,-,18,-,-,-,1357-8-16,癸酉,壬申,1357-9-15,1357-9-14,9,8,-1,-1,-,-,-
 ,323-1-a,-,323-1-1,323,-,1373-10-17,文中 2年 10 小 己巳  5-473,-,変更なし,false,次月大小,-,-,小,小,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-,-
 ,323-1-0,323-0-1,-,323,-,1373-11-15,文中 2年 閏10 小 戊戌 34-4924,-,-,true,朔旦冬至,11月,閏10月,大,小,0,-,-,-,1373-12-15,-,-,-,-,-,-,-,-,-,-,-,-
 ,323-1-1,323-0-1,-,323,1,1373-12-15,文中 2年 11 大 丁卯  4-1834,"計算では4戊辰, 実施暦は丁卯, 11月丁卯朔のユリウス暦日は12月14日である。",-,true,朔旦冬至,閏11月,11月,大,大,-,0,-,-,-,-,戊辰,丁卯,1373-12-15,1373-12-14,4,3,-1,-1,-,-,-

data/lib/zakuro/calculation/cycle/abstract_solar_term.rb

@@ -47,6 +47,12 @@ module Zakuro
           23 => :taisetsu
         }.freeze
 
+        # @return [Integer] 開始番号
+        FIRST_INDEX = 0
+
+        # @return [Integer] 終了番号
+        LAST_INDEX = 23
+
         #
         # 初期化
         #

data/lib/zakuro/calculation/era/gengou/dated_scroll.rb

@@ -20,11 +20,13 @@ module Zakuro
         # @param [Western::Calendar] start_date 西暦開始日（最大範囲）
         # @param [Western::Calendar] last_date 西暦終了日（最大範囲）
         # @param [True, False] operated 運用値設定
+        # @param [True, False] restored 運用値から計算値に戻すか
         #
         def initialize(start_date: Western::Calendar.new, last_date: Western::Calendar.new,
-                       operated: false)
+                       operated: false, restored: false)
           range = Reserve::DatedRange.new(
-            start_date: start_date, last_date: last_date, operated: operated
+            start_date: start_date, last_date: last_date, operated: operated,
+            restored: restored
           )
           super(range: range)
         end

data/lib/zakuro/calculation/era/gengou/internal/reserve/abstract_list.rb

@@ -34,8 +34,11 @@ module Zakuro
           # @return [Western::Calendar] 終了日
           attr_reader :last_date
           # @return [True] 運用値あり
-          # @return [True] 運用値なし
+          # @return [False] 運用値なし
           attr_reader :operated
+          # @return [True] 運用値から計算値に戻す
+          # @return [False] 運用値から計算値に戻さない
+          attr_reader :restored
           # @return [Array<Japan::Alignment::LinearGengou>] 予約元号一覧
           attr_reader :list
 
@@ -46,13 +49,15 @@ module Zakuro
           # @param [Western::Calendar] start_date 開始日
           # @param [Western::Calendar] last_date 終了日
           # @param [True, False] operated 運用値設定
+          # @param [True, False] restored 運用値から計算値に戻すか
           #
           def initialize(index:, start_date: Western::Calendar.new,
-                         last_date: Western::Calendar, operated: false)
+                         last_date: Western::Calendar, operated: false, restored: false)
             @index = index
             @start_date = start_date.clone
             @last_date = last_date.clone
             @operated = operated
+            @restored = restored
             @list = []
 
             update
@@ -216,7 +221,8 @@ module Zakuro
           #
           def line(start_date:, last_date:)
             Japan::Gengou.line(
-              line: index, start_date: start_date, last_date: last_date, operated: operated
+              line: index, start_date: start_date, last_date: last_date, operated: operated,
+              restored: restored
             )
           end
 

data/lib/zakuro/calculation/era/gengou/internal/reserve/abstract_range.rb

@@ -27,19 +27,22 @@ module Zakuro
           # @param [Western::Calendar] start_date 西暦開始日
           # @param [Western::Calendar] last_date 西暦終了日
           # @param [True, False] operated 運用値設定
+          # @param [True, False] restored 運用値から計算値に戻すか
           #
           def initialize(start_date: Western::Calendar.new, last_date: Western::Calendar.new,
-                         operated: false)
+                         operated: false, restored: false)
             last_date = start_date.clone if last_date.invalid?
 
             @first_list = DatedList.new(
-              first: true, start_date: start_date, last_date: last_date, operated: operated
+              first: true, start_date: start_date, last_date: last_date, operated: operated,
+              restored: restored
             )
             @second_list = DatedList.new(
-              first: false, start_date: start_date, last_date: last_date, operated: operated
+              first: false, start_date: start_date, last_date: last_date, operated: operated,
+              restored: restored
             )
 
-            renew(last_date: last_date)
+            renew(last_date: last_date, operated: operated, restored: restored)
           end
 
           #
@@ -47,16 +50,22 @@ module Zakuro
           #   含まれる最初の元号が別の行にまたがっている場合に開始日を前倒しする
           #
           # @param [Western::Calendar] last_date 西暦終了日
+          # @param [True, False] operated 運用値設定
+          # @param [True, False] restored 運用値から計算値に戻すか
           #
-          def renew(last_date: Western::Calendar.new)
+          def renew(last_date: Western::Calendar.new, operated: false, restored: false)
             start_date = native_start_date
 
             return if start_date.invalid?
 
-            @first_list = DatedList.new(first: true, start_date: start_date,
-                                        last_date: last_date)
-            @second_list = DatedList.new(first: false, start_date: start_date,
-                                         last_date: last_date)
+            @first_list = DatedList.new(
+              first: true, start_date: start_date, last_date: last_date,
+              operated: operated, restored: restored
+            )
+            @second_list = DatedList.new(
+              first: false, start_date: start_date, last_date: last_date,
+              operated: operated, restored: restored
+            )
           end
 
           #

data/lib/zakuro/calculation/era/gengou/internal/reserve/dated_list.rb

@@ -22,13 +22,17 @@ module Zakuro
           # @param [Western::Calendar] start_date 開始日
           # @param [Western::Calendar] last_date 終了日
           # @param [True, False] operated 運用値設定
+          # @param [True, False] restored 運用値から計算値に戻すか
           #
           def initialize(first: true, start_date: Western::Calendar.new,
-                         last_date: Western::Calendar, operated: false)
+                         last_date: Western::Calendar, operated: false, restored: false)
             @index = parse_index(first: first)
             @start_date = start_date.clone
             @last_date = last_date.invalid? ? start_date.clone : last_date.clone
-            super(index: @index, start_date: start_date, last_date: last_date, operated: operated)
+            super(
+              index: @index, start_date: start_date, last_date: last_date, operated: operated,
+              restored: restored
+            )
           end
 
           #

data/lib/zakuro/calculation/era/gengou/internal/reserve/dated_range.rb

@@ -20,10 +20,13 @@ module Zakuro
           # @param [Western::Calendar] start_date 西暦開始日
           # @param [Western::Calendar] last_date 西暦終了日
           # @param [True, False] operated 運用値設定
+          # @param [True, False] restored 運用値から計算値に戻すか
           #
           def initialize(start_date: Western::Calendar.new, last_date: Western::Calendar.new,
-                         operated: false)
-            super(start_date: start_date, last_date: last_date, operated: operated)
+                         operated: false, restored: false)
+            super(
+              start_date: start_date, last_date: last_date, operated: operated, restored: restored
+            )
           end
         end
       end

data/lib/zakuro/calculation/era/gengou/internal/reserve/named_list.rb

@@ -24,16 +24,22 @@ module Zakuro
           # @param [True, False] first true:1行目元号, false:2行目元号
           # @param [String] start_name 開始元号名
           # @param [String] last_name 終了元号名
+          # @param [True, False] operated 運用値設定
+          # @param [True, False] restored 運用値から計算値に戻すか
           #
           def initialize(first: true, start_name: INVALID_NAME, last_name: INVALID_NAME,
-                         operated: false)
+                         operated: false, restored: false)
             @index = parse_index(first: first)
             @start_date = Western::Calendar.new
             @last_date = Western::Calendar.new
             @operated = operated
+            @restored = restored
 
             locate(start_name: start_name, last_name: last_name)
-            super(index: index, start_date: start_date, last_date: last_date, operated: operated)
+            super(
+              index: index, start_date: start_date, last_date: last_date, operated: operated,
+              restored: restored
+            )
           end
 
           private
@@ -109,7 +115,9 @@ module Zakuro
           # @return [Array<Japan::Alignment::LinearGengou>] 元号
           #
           def line_by_name(name:)
-            Japan::Gengou.line_by_name(line: index, name: name, operated: operated)
+            Japan::Gengou.line_by_name(
+              line: index, name: name, operated: operated, restored: restored
+            )
           end
 
           #

data/lib/zakuro/calculation/era/gengou/internal/reserve/named_range.rb

@@ -24,19 +24,25 @@ module Zakuro
           # @param [String] start_name 開始元号名
           # @param [String] last_name 終了元号名
           # @param [True, False] operated 運用値設定
+          # @param [True, False] restored 運用値から計算値に戻すか
           #
-          def initialize(start_name: INVALID_NAME, last_name: INVALID_NAME, operated: false)
+          def initialize(start_name: INVALID_NAME, last_name: INVALID_NAME,
+                         operated: false, restored: false)
             @first_list = NamedList.new(
-              first: true, start_name: start_name, last_name: last_name, operated: operated
+              first: true, start_name: start_name, last_name: last_name, operated: operated,
+              restored: restored
             )
             @second_list = NamedList.new(
-              first: false, start_name: start_name, last_name: last_name, operated: operated
+              first: false, start_name: start_name, last_name: last_name, operated: operated,
+              restored: restored
             )
 
             start_date = western_start_date
             last_date = western_last_date
 
-            super(start_date: start_date, last_date: last_date, operated: operated)
+            super(
+              start_date: start_date, last_date: last_date, operated: operated, restored: restored
+            )
           end
 
           #

data/lib/zakuro/calculation/era/gengou/named_scroll.rb

@@ -20,10 +20,13 @@ module Zakuro
         # @param [String] start_name 開始元号名
         # @param [String] last_name 終了元号名
         # @param [True, False] operated 運用値設定
+        # @param [True, False] restored 運用値から計算値に戻すか
         #
-        def initialize(start_name: INVALID_NAME, last_name: INVALID_NAME, operated: false)
+        def initialize(start_name: INVALID_NAME, last_name: INVALID_NAME,
+                       operated: false, restored: false)
           range = Reserve::NamedRange.new(
-            start_name: start_name, last_name: last_name, operated: operated
+            start_name: start_name, last_name: last_name, operated: operated,
+            restored: restored
           )
           super(range: range)
         end

data/lib/zakuro/calculation/monthly/month.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../cycle/abstract_solar_term'
+
 require_relative '../base/gengou'
 require_relative './first_day'
 require_relative './meta'
@@ -22,7 +24,7 @@ module Zakuro
         attr_reader :month_label
         # @return [FirstDay] 月初日（朔日）
         attr_reader :first_day
-        # @return [Array<AbstractSolarTerm>] 二十四節気
+        # @return [Array<Cyle::AbstractSolarTerm>] 二十四節気
         attr_reader :solar_terms
         # @return [Base::Gengou] 元号
         attr_reader :gengou
@@ -37,7 +39,7 @@ module Zakuro
         # @param [Context::Context] context 暦コンテキスト
         # @param [MonthLabel] month_label 月表示名
         # @param [FirstDay] first_day 月初日（朔日）
-        # @param [Array<AbstractSolarTerm>] solar_terms 二十四節気
+        # @param [Array<Cyle::AbstractSolarTerm>] solar_terms 二十四節気
         # @param [Base::Gengou] gengou 元号
         # @param [Meta] meta 付加情報
         #
@@ -261,6 +263,38 @@ module Zakuro
           same_by_japan_date?(date: date)
         end
 
+        #
+        # 二十四節気を正しい順序にソートする
+        #
+        def sort_solar_terms
+          # TODO: refactor
+          sorted = (solar_terms.sort do |termx, termy|
+            termx.index <=> termy.index
+          end)
+
+          unless reset_term?(solar_terms: sorted)
+            @solar_terms = sorted
+            return
+          end
+
+          first = []
+          second = []
+
+          sorted.each do |term|
+            if term.index >= (23 - 2)
+              second.push(term)
+              next
+            end
+
+            first.push(term)
+          end
+
+          # 0以前を先頭にする
+          second += first
+
+          @solar_terms = second
+        end
+
         #
         # 大余に対応する二十四節気
         #
@@ -322,6 +356,31 @@ module Zakuro
 
           true
         end
+
+        #
+        # 二十四節気の折り返し（23 -> 0）があるか
+        #
+        # @param [Array<Cyle::AbstractSolarTerm>] solar_terms 二十四節気
+        #
+        # @return [True] 折り返しあり
+        # @return [False] 折り返しなし
+        #
+        def reset_term?(solar_terms: [])
+          first = false
+          last = false
+
+          solar_terms.each do |term|
+            index = term.index
+            case index
+            when Cycle::AbstractSolarTerm::FIRST_INDEX
+              first = true
+            when Cycle::AbstractSolarTerm::LAST_INDEX
+              last = true
+            end
+          end
+
+          first && last
+        end
       end
     end
   end

data/lib/zakuro/calculation/monthly/operated_month.rb

@@ -54,6 +54,8 @@ module Zakuro
           rewrite_month
           rewrite_solar_terms
           rewrite_first_day
+
+          sort_solar_terms
         end
 
         #

data/lib/zakuro/calculation/option/dropped_date/location.rb

@@ -62,7 +62,14 @@ module Zakuro
           # @return [False] 存在なし
           #
           def exist?
-            !solar_term_remainder.invalid?
+            remainder = solar_term_remainder
+
+            return false if remainder.invalid?
+
+            minute_later = remainder.class.new(
+              day: 0, minute: remainder.minute, second: remainder.second
+            )
+            minute_later >= limit
           end
 
           #

data/lib/zakuro/calculation/range/dated_full_range.rb

@@ -19,11 +19,14 @@ module Zakuro
         # @param [Context::Context] context 暦コンテキスト
         # @param [Western::Calendar] start_date 開始日
         # @param [Western::Calendar] last_date 終了日
+        # @param [True, False] operated 運用値設定
+        # @param [True, False] restored 運用値から計算値に戻すか
         #
-        def initialize(context:,
-                       start_date: Western::Calendar.new, last_date: Western::Calendar.new)
+        def initialize(context:, start_date: Western::Calendar.new,
+                       last_date: Western::Calendar.new, operated: false, restored: false)
           scroll = Gengou::DatedScroll.new(
-            start_date: start_date, last_date: last_date, operated: false
+            start_date: start_date, last_date: last_date, operated: operated,
+            restored: restored
           )
 
           super(context: context, scroll: scroll, start_date: start_date, last_date: last_date)

data/lib/zakuro/calculation/range/dated_operation_range.rb

@@ -25,7 +25,8 @@ module Zakuro
         def initialize(context:, start_date: Western::Calendar.new,
                        last_date: Western::Calendar.new, years: [])
           scroll = Gengou::DatedScroll.new(
-            start_date: start_date, last_date: last_date, operated: true
+            start_date: start_date, last_date: last_date, operated: true,
+            restored: false
           )
           super(context: context, scroll: scroll, years: years)
         end

data/lib/zakuro/calculation/range/named_full_range.rb

@@ -25,7 +25,7 @@ module Zakuro
         #
         def initialize(context:, start_name: INVALID_NAME, last_name: INVALID_NAME)
           scroll = Gengou::NamedScroll.new(
-            start_name: start_name, last_name: last_name, operated: false
+            start_name: start_name, last_name: last_name, operated: false, restored: false
           )
           range = scroll.range
 

data/lib/zakuro/calculation/summary/western/range.rb

@@ -35,6 +35,7 @@ module Zakuro
               years = get_full_range_years(
                 context: context, start_date: start_date, last_date: last_date
               )
+
               operated_years = get_operation_range_years(
                 context: context, years: years, start_date: start_date, last_date: last_date
               )
@@ -66,8 +67,14 @@ module Zakuro
             #
             def get_full_range_years(context:, start_date: Western::Calendar.new,
                                      last_date: Western::Calendar.new)
+              # 年情報の再計算
+              # * 元号開始日に計算値と運用値のズレが見られる場合、年情報の範囲が異なる場合がある
+              # * 例：0781-03-01（計算値は前の元号の「宝亀」を含めるが、運用値では含まない）
+              #
+              # 運用値の範囲で日付検索するが、元号開始日は計算値のままで取る
               full_range = Calculation::Range::DatedFullRange.new(
-                context: context, start_date: start_date, last_date: last_date
+                context: context, start_date: start_date, last_date: last_date,
+                operated: true, restored: true
               )
               full_range.get
             end

data/lib/zakuro/calculation/summary/western/single.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
+require_relative '../../../tools/gengou_range_comparer'
+
 require_relative '../../range/dated_operation_range'
 
 require_relative '../../range/dated_full_range'
 
-require_relative './specifier/single_day'
-
 require_relative '../internal/operation'
 
+require_relative './specifier/single_day'
+
 # :nodoc:
 module Zakuro
   # :nodoc:
@@ -53,8 +55,13 @@ module Zakuro
             # @return [Array<Calculation::Base::Year>] 完全範囲
             #
             def get_full_range_years(context:, date: Western::Calendar.new)
+              # 年情報の再計算
+              # * 元号開始日に計算値と運用値のズレが見られる場合、年情報の範囲が異なる場合がある
+              # * 例：0781-03-01（計算値は前の元号の「宝亀」を含めるが、運用値では含まない）
+              #
+              # 運用値の範囲で日付検索するが、元号開始日は計算値のままで取る
               full_range = Calculation::Range::DatedFullRange.new(
-                context: context, start_date: date
+                context: context, start_date: date, operated: true, restored: true
               )
               full_range.get
             end
@@ -93,12 +100,12 @@ module Zakuro
             end
 
             #
-            # 完全範囲を取得する
+            # 運用情報を取得する
             #
             # @param [Array<Calculation::Base::Year>] years 完全範囲
             # @param [Western::Calendar] date 西暦日
             #
-            # @return [Array<Calculation::Base::Year>] 完全範囲
+            # @return [Result::Operation] 運用情報
             #
             def get_operation(years:, date: Western::Calendar.new)
               calc_date = Specifier::SingleDay.get(

data/lib/zakuro/era/japan/gengou/alignment.rb

@@ -34,15 +34,18 @@ module Zakuro
           # @param [Western::Calendar] start_date 開始日
           # @param [Western::Calendar] last_date 終了日
           # @param [True, False] operated 運用値設定
+          # @param [True, False] restored 運用値から計算値に戻すか
           #
           # @return [Array<LinearGengou>] 元号
           #
           def get(line: FIRST_LINE,
                   start_date: Western::Calendar.new, last_date: Western::Calendar.new,
-                  operated: false)
-
+                  operated: false, restored: false)
             if operated
-              return OPERATED_SUMMARY.get(line: line, start_date: start_date, last_date: last_date)
+              result = OPERATED_SUMMARY.get(line: line, start_date: start_date, last_date: last_date)
+              return result unless restored
+
+              return restore(line: line, list: result)
             end
 
             SUMMARY.get(line: line, start_date: start_date, last_date: last_date)
@@ -54,14 +57,38 @@ module Zakuro
           # @param [Integer] line 行
           # @param [String] name 元号名
           # @param [True, False] operated 運用値設定
+          # @param [True, False] restored 運用値から計算値に戻すか
           #
           # @return [Array<LinearGengou>] 元号
           #
-          def get_by_name(line: FIRST_LINE, name:, operated: false)
-            return OPERATED_SUMMARY.get_by_name(line: line, name: name) if operated
+          def get_by_name(line: FIRST_LINE, name:, operated: false, restored: false)
+            if operated
+              result = OPERATED_SUMMARY.get_by_name(line: line, name: name)
+              return result unless restored
+
+              return restore(line: line, list: result)
+            end
 
             SUMMARY.get_by_name(line: line, name: name)
           end
+
+          #
+          # 運用値から計算値に戻す
+          #
+          # @param [Integer] line 行
+          # @param [Array<LinearGengou>] list 元号
+          #
+          # @return [Array<LinearGengou>] 元号
+          #
+          def restore(line: FIRST_LINE, list: [])
+            result = []
+            list.each do |gengou|
+              calc = SUMMARY.get_by_name(line: line, name: gengou.name)
+              result |= calc
+            end
+
+            result
+          end
         end
       end
     end

data/lib/zakuro/era/japan/gengou.rb

@@ -27,14 +27,16 @@ module Zakuro
         # @param [Western::Calendar] start_date 開始日
         # @param [Western::Calendar] last_date 終了日
         # @param [True, False] operated 運用値設定
+        # @param [True, False] restored 運用値から計算値に戻すか
         #
         # @return [Array<LinearGengou>] 該当行の元号
         #
         def line(line: FIRST_LINE,
                  start_date: Western::Calendar.new, last_date: Western::Calendar.new,
-                 operated: false)
+                 operated: false, restored: false)
           Alignment.get(
-            line: line, start_date: start_date, last_date: last_date, operated: operated
+            line: line, start_date: start_date, last_date: last_date, operated: operated,
+            restored: restored
           )
         end
 
@@ -42,14 +44,14 @@ module Zakuro
         # 該当行の元号を取得する（元号名）
         #
         # @param [Integer] line 行番号
-        # @param [Western::Calendar] start_date 開始日
-        # @param [Western::Calendar] last_date 終了日
+        # @param [String] name 元号名
         # @param [True, False] operated 運用値設定
+        # @param [True, False] restored 運用値から計算値に戻すか
         #
         # @return [Array<LinearGengou>] 該当行の元号
         #
-        def line_by_name(line: FIRST_LINE, name:, operated: false)
-          Alignment.get_by_name(line: line, name: name, operated: operated)
+        def line_by_name(line: FIRST_LINE, name:, operated: false, restored: false)
+          Alignment.get_by_name(line: line, name: name, operated: operated, restored: restored)
         end
       end
     end

data/lib/zakuro/operation/yaml/month.yaml

@@ -11294,7 +11294,7 @@
         zodiac_name: "-"
       dest:
         index: '0'
-        from: '1050-12-17'
+        from: '1050-11-17'
         zodiac_name: "-"
       days: "-"
     days: "-1"
@@ -13837,38 +13837,6 @@
         zodiac_name: "-"
       days: "-"
     days: "-1"
-- id: 318-1-a
-  relation_id: "-"
-  parent_id: 318-1-1
-  page: '318'
-  number: "-"
-  japan_date: 正平 12年 7 小 甲戌  10-1300
-  western_date: '1357-7-18'
-  description: "-"
-  note: "-"
-  modified: 'true'
-  diffs:
-    month:
-      number:
-        src: "-"
-        dest: "-"
-      leaped:
-        src: "-"
-        dest: "-"
-      days:
-        src: 大
-        dest: 小
-    solar_term:
-      src:
-        index: "-"
-        to: "-"
-        zodiac_name: "-"
-      dest:
-        index: "-"
-        from: "-"
-        zodiac_name: "-"
-      days: "-"
-    days: "-"
 - id: 318-1-0
   relation_id: 318-1-1
   parent_id: "-"
@@ -13888,7 +13856,7 @@
         src: 'false'
         dest: 'true'
       days:
-        src: 小
+        src: 大
         dest: 小
     solar_term:
       src:
@@ -13920,7 +13888,7 @@
         src: 'true'
         dest: 'false'
       days:
-        src: 大
+        src: 小
         dest: 大
     solar_term:
       src:

data/lib/zakuro/tools/gengou_range_comparer.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require_relative '../output/logger'
+
+require_relative '../calculation/cycle/abstract_remainder'
+
+require_relative '../calculation/era/gengou/dated_scroll'
+
+# TODO: Tools -> Tool
+
+# :nodoc:
+module Zakuro
+  #
+  # Tools 汎用メソッド群
+  #
+  module Tools
+    #
+    # GengouRangeComparer 元号範囲比較
+    #
+    module GengouRangeComparer
+      # @return [Output::Logger] ロガー
+      LOGGER = Output::Logger.new(location: 'GengouRangeComparer')
+
+      class << self
+        #
+        # 元号範囲が計算値/運用値で同一か
+        #
+        # @param [Western::Calendar] start_date 開始西暦日
+        # @param [Western::Calendar] last_date 終了西暦日
+        #
+        # @return [True] 一致
+        # @return [False] 不一致
+        #
+        def same?(start_date: Western::Calendar.new, last_date: Western::Calendar.new)
+          calc_range = Calculation::Gengou::DatedScroll.new(
+            start_date: start_date, last_date: last_date
+          ).range
+
+          ope_range = Calculation::Gengou::DatedScroll.new(
+            start_date: start_date, last_date: last_date, operated: true
+          ).range
+
+          # 1行目元号
+          unless same_line?(calc_line: calc_range.first_list.list,
+                            ope_line: ope_range.first_list.list)
+            return false
+          end
+
+          # 2行目元号
+          unless same_line?(calc_line: calc_range.second_list.list,
+                            ope_line: ope_range.second_list.list)
+            return false
+          end
+
+          true
+        end
+
+        private
+
+        #
+        # 同じ予約元号一覧か
+        #
+        # @param [Array<Japan::Alignment::LinearGengou>] calc_line 予約元号一覧（計算値）
+        # @param [Array<Japan::Alignment::LinearGengou>] ope_line 予約元号一覧（運用値）
+        #
+        # @return [True] 一致
+        # @return [False] 不一致
+        #
+        def same_line?(calc_line: [], ope_line: [])
+          return false unless calc_line.size == ope_line.size
+
+          calc_line.each_with_index do |calc_gengou, index|
+            ope_gengou = ope_line[index]
+            return false unless calc_gengou.name == ope_gengou.name
+          end
+
+          true
+        end
+      end
+    end
+  end
+end

data/lib/zakuro/tools/remainder_comparer.rb

@@ -4,6 +4,8 @@ require_relative '../output/logger'
 
 require_relative '../calculation/cycle/abstract_remainder'
 
+# TODO: Tools -> Tool
+
 # :nodoc:
 module Zakuro
   #
@@ -14,6 +16,7 @@ module Zakuro
     # RemainderComparer 大余小余比較
     #
     module RemainderComparer
+      # @return [Output::Logger] ロガー
       LOGGER = Output::Logger.new(location: 'RemainderComparer')
 
       class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zakuro
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - pldb
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-25 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies: []
 description: mainly lunar solar calendar
 email:
@@ -184,6 +184,7 @@ files:
 - lib/zakuro/result/operation/month/annotation.rb
 - lib/zakuro/result/operation/month/history.rb
 - lib/zakuro/result/result.rb
+- lib/zakuro/tools/gengou_range_comparer.rb
 - lib/zakuro/tools/remainder_comparer.rb
 - lib/zakuro/tools/stringifier.rb
 - lib/zakuro/tools/typeconv.rb
@@ -277,7 +278,7 @@ metadata:
   homepage_uri: https://github.com/pldb/zakuro
   source_code_uri: https://github.com/pldb/zakuro
   changelog_uri: https://github.com/pldb/zakuro
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -292,8 +293,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: japanese calendar library.
 test_files: []