when_exe 0.4.4 → 0.4.5

data/lib/when_exe/region/chinese/epochs.rb

@@ -610,7 +610,7 @@ module When
 	["[皇泰]1"	,			"@A","name=[恭帝=ja:%%<恭帝トウ>];618-05-24^ChineseTwin?note=Chinese::大業暦", "619-04-08"],	# 戊辰 5791-26
 	[self,
 	  "period:[鄭<王世充>=ja:%%<王世充>]",
-	  ["[開明=ja:%%<開明_(王世充)>]1"	,"@F"	,"name=[王世充];619-04-08^ChineseTwin?note=Chinese::大業暦", "621-05-{丁卯}"]	# 丙午 5853-45, 621-05-09=は丁卯
+	  ["[開明=ja:%%<開明_(王世充)>]1"	,"@F"	,"name=[王世充];619-04-08^ChineseTwin?note=Chinese::大業暦", "621-05-{1丁卯}"]	# 丙午 5853-45, 621-05-09=は丁卯
 	],
 	[self,
 	  "period:[梁<蕭銑>=ja:%%<蕭銑>]",
@@ -643,11 +643,11 @@ module When
 	[self,
 	  "period:[夏<竇建徳>=ja:%%<竇建徳>]",
 	  ["[丁丑=ja:%%<丁丑_(夏)>]1",	"@F",	"name=[竇建徳];617-01-05^ChineseTwin?note=Chinese::大業暦"],				# 丙辰 5718-2
-	  ["[五鳳=ja:%%<五鳳_(夏)>]1",	"",	"	     618-07", "621-05-{丁卯}"]					# 5805-54, 621-05-09=は丁卯
+	  ["[五鳳=ja:%%<五鳳_(夏)>]1",	"",	"	     618-07", "621-05-{1丁卯}"]					# 5805-54, 621-05-09=は丁卯
 	],
 	[self,
 	  "period:[漢東<劉黒闥>=ja:%%<劉黒闥>]",
-	  ["[天造]1"	,			"@F"	,"name=[劉黒闥];622-01^ChineseTwin?note=Chinese::大業暦", "623-01-{庚辰}"]	# 5942-1, 623-01-03=は庚辰
+	  ["[天造]1"	,			"@F"	,"name=[劉黒闥];622-01^ChineseTwin?note=Chinese::大業暦", "623-01-{1庚辰}"]	# 5942-1, 623-01-03=は庚辰
 	],
 	[self,
 	  "period:[魏<李密>=ja:%%<李密_(隋)>]",
@@ -659,11 +659,11 @@ module When
 	],
 	[self,
 	  "period:[涼<李軌>=ja:%%<李軌>]",
-	  ["[安楽=ja:%%<安楽_(年号)>]1"	,	"@F"	,"name=[李軌];618-11-04^ChineseTwin?note=Chinese::大業暦", "619-05-{辛巳}"]	# 乙巳 5820-28, 619-05-13=は辛巳
+	  ["[安楽=ja:%%<安楽_(年号)>]1"	,	"@F"	,"name=[李軌];618-11-04^ChineseTwin?note=Chinese::大業暦", "619-05-{1辛巳}"]	# 乙巳 5820-28, 619-05-13=は辛巳
 	],
 	[self,
 	  "period:[燕<高開道>=ja:%%<高開道>]",
-	  ["[始興=ja:%%<始興_(高開道)>]1"	,"@F"	,"name=[高開道];618-12^ChineseTwin?note=Chinese::大業暦", "620-10-{己酉}"]	# 5833-47, 620-10-19=は己酉
+	  ["[始興=ja:%%<始興_(高開道)>]1"	,"@F"	,"name=[高開道];618-12^ChineseTwin?note=Chinese::大業暦", "620-10-{1己酉}"]	# 5833-47, 620-10-19=は己酉
 	],
 	[self,
 	  "period:[乗<高曇晟>=ja:%%<高曇晟>]",
@@ -754,7 +754,7 @@ module When
 	["[貞元=ja:%%<貞元_(唐)>]1"	,	""	,	"	     785-01-01"],				# 丁酉
 	["[永貞=ja:%%<永貞_(唐)>]1"	,	"@A"	,	"name=[順宗=ja:%%<順宗_(唐)>];805-08-05"],		# 辛丑
 	["[元和=ja:%%<元和_(唐)>]1"	,	"@A"	,	"name=[憲宗=ja:%%<憲宗_(唐)>];806-01-02"],		# 丁卯 元和２年から観象暦を使用
-	["[長慶]1"	,			"@A"	,	"name=[穆宗=ja:%%<穆宗_(唐)>];821-01-{辛丑}"],		# 辛丑 長慶２年から宣明暦を使用
+	["[長慶]1"	,			"@A"	,	"name=[穆宗=ja:%%<穆宗_(唐)>];821-01-{1辛丑}"],		# 辛丑 長慶２年から宣明暦を使用
 	["[宝暦=ja:%%<宝暦_(唐)>]1"	,	"@A"	,	"name=[敬宗];825-01-07"],				# 辛亥
 	["[大和=ja:%%<大和_(唐)>,alias:太和=ja:%%<大和_(唐)>]1"	,"@A","name=[文宗=ja:%%<文宗_(唐)>];827-02-13"],	# 乙巳
 	["[開成=ja:%%<開成_(唐)>]1"	,	""	,	"	     836-01-01"],				# 辛丑

data/lib/when_exe/region/chinese/notes.rb

@@ -94,7 +94,7 @@ module  When
       # @return [When::Coordinates::Residue] 六十干支
       #
       def year(date, options={})
-        When.Residue('干支')[(date.most_significant_coordinate-4) % 60]
+        When.Resource('_co:Common::干支')[(date.most_significant_coordinate-4) % 60]
       end
 
       #
@@ -106,7 +106,7 @@ module  When
       # @return [When::Coordinates::Residue] 七曜
       #
       def week(date, options={})
-        When.Residue('Week')[date.to_i % 7]
+        When.Resource('_co:Common::Week')[date.to_i % 7]
       end
 
       #
@@ -118,7 +118,7 @@ module  When
       # @return [When::Coordinates::Residue] 六十干支
       #
       def stembranch(date, options={})
-        When.Residue('干支')[(date.to_i-11) % 60]
+        When.Resource('_co:Common::干支')[(date.to_i-11) % 60]
       end
 
       #

data/lib/when_exe/region/chinese/twins.rb

@@ -31,7 +31,7 @@ module When
       ['[大業暦=]597.01.01',   '@CR', '597-01-01^ChineseTwin::大業暦', '619-01-01='],
       ['[戊寅元暦]619.01.01',  '@CR', '619-01-01^ChineseTwin::戊寅元暦'],
       ['[平朔戊寅暦=]645.01.01','@CR','645-01-01^ChineseTwin::平朔戊寅暦'],
-      ['[麟徳暦]665.01.01',    '@CR', '665-01-01^ChineseTwin::麟徳暦'],
+      ['[麟徳暦]666.01.01',    '@CR', '666-01-01^ChineseTwin::麟徳暦'],
       ['[大衍暦]729.01.01',    '@CR', '729-01-01^ChineseTwin::大衍暦'],
       ['[五紀暦]762.01.01',    '@CR', '762-01-01^ChineseTwin::五紀暦'],
       ['[正元暦=]784.01.01',   '@CR', '784-01-01^ChineseTwin::正元暦',  '807-01-01'],
@@ -62,7 +62,7 @@ module When
       ['[開皇暦=]584.01.16',  '@CR',  '584-01-16^ChineseTwin::開皇暦(節月)', '596.12.22='],
       ['[大業暦=]596.12.22',  '@CR',  '596-12-22^ChineseTwin::大業暦(節月)'],
       ['[戊寅元暦]618.12.19', '@CR',  '618-12-19^ChineseTwin::戊寅元暦(節月)'],
-      ['[麟徳暦]664.12.21',   '@CR',  '664-12-21^ChineseTwin::麟徳暦(節月)'],
+      ['[麟徳暦]666.01.09',   '@CR',  '666-01-09^ChineseTwin::麟徳暦(節月)'],
       ['[大衍暦]729.01.03',   '@CR',  '729-01-03^ChineseTwin::大衍暦(節月)'],
       ['[五紀暦]761.12.29',   '@CR',  '761-12-29^ChineseTwin::五紀暦(節月)'],
       ['[正元暦=]783.12.26',  '@CR',  '783-12-26^ChineseTwin::正元暦(節月)',  '807-01-11'],
@@ -320,7 +320,7 @@ module When
           # 'rissei'                   =>  'B',
             'method'                   =>  '#{Method:A}',
             's'                        => [
-              # 消息總  盈朒積    立成b    立成c
+              # 消息總  盈朒積    初率b    別差c
               [    0.0,     0,  +3.9546, -0.0372], # 冬至
               [ -722.0,   +54,  +3.4091, -0.0372], # 小寒
               [-1340.0,  +100,  +2.8636, -0.0372], # 大寒
@@ -398,7 +398,7 @@ module When
             'anomalistic_month_length' =>  '6701279/243200', # 27.0 +(1685.0+79.0/80)/3040,
           # 'rissei'                   =>  'C',
             's'                        => [
-              # 先後數  朓朒積    立成b    立成c
+              # 先後數  朓朒積    初率b    別差c
               [    0.0,     0, +13.4524, -0.1886], # 冬至
               [-2353.0,  +176, +10.5564, -0.1634], # 小寒
               [-4198.0,  +314,  +8.0408, -0.1446], # 大寒
@@ -476,7 +476,7 @@ module When
             'anomalistic_month_length' =>  '1366156/49580', # 27.0 + (743.0+5.0/37)/1340,
           # 'rissei'                   =>  'C',
             's'                        => [
-              # 先後數  朓朒積    立成b    立成c
+              # 先後數  朓朒積    初率b    別差c
               [    0.0,     0,  +5.9668, -0.0843], # 冬至
               [-1037.0,   +78,  +4.6652, -0.0721], # 小寒
               [-1850.0,  +139,  +3.5656, -0.0653], # 大寒
@@ -633,7 +633,7 @@ module When
             'anomalistic_month_length' =>  '23145819/840000', # 27.0 + 4658.19 / 8400,
           # 'rissei'                   =>  'C',
             's'                        => [
-              # 先後數  朓朒数    立成b    立成c
+              # 先後數  朓朒数    初率b    別差c
               [     0.0,     0, +33.4511, -0.3695], # 冬至
               [ -6000.0,  +449, +28.0389, -0.3606], # 小寒
               [-11000.0,  +823, +22.6998, -0.3519], # 大寒

data/lib/when_exe/region/islamic.rb

@@ -78,7 +78,7 @@ module When
       #
       def _new_month_(m)
         jdn  = (@formula[-1].cn_to_time(m + @cycle_offset) + 0.5 + 
-                @location.long / (When::Coordinates::Spatial::DEGREE * 360)).floor - 1
+                @location.long / (@location.degree * 360)).floor - 1
         jdn += 1 while @formula[-1].moon_visibility(jdn) < 0
         return jdn
       end

data/lib/when_exe/region/japanese.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2015 Takashi SUGA
+  Copyright (C) 2011-2016 Takashi SUGA
 
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
@@ -109,7 +109,7 @@ module When
       "[昭和の日,                     Shōwa Day                 ]",
       "[憲法記念日,                   Constitution Memorial Day ]",
       "[こどもの日,                   Children's Day (Japan)    ]",
-      "[七夕節句=ja:%%<七夕>          Qixi Festival             ]",
+      "[七夕節句=ja:%%<七夕>,         Qixi Festival             ]",
       "[お盆,                         Bon Festival              ]",
       "[海の日,                       Marine Day                ]",
       "[山の日,                       Mountain Day=             ]",
@@ -127,12 +127,12 @@ module When
       "[大饗第1日,                    Enthronement of the Japanese Emperor       ]",
       "[新嘗祭,                       Labor Thanksgiving Day                     ]",
       "[勤労感謝の日,                 Labor Thanksgiving Day                     ]",
-      "[振替休日,                     Transfer Holiday=                          ]",
+      "[振替休日,                     Substitute holiday                         ]",
       "[国民の休日,                   National Day Off=                          ]",
       "[即位の礼,                     Enthronement of the Japanese Emperor       ]",
       "[即位の礼正殿の儀,             Enthronement of the Japanese Emperor       ]",
       "[神武天皇祭,                   EmperorJimmu's Death anniversary=          ]",
-      "[孝明天皇祭=ja:%%<先帝祭>,     Emperor Kōmei's Birth holiday=             ]",
+      "[孝明天皇祭=ja:%%<先帝祭>,     Emperor Kōmei's Death anniversary=         ]",
       "[明治天皇祭=ja:%%<先帝祭>,     Emperor Meiji's Death anniversary=         ]",
       "[大正天皇祭=ja:%%<先帝祭>,     Emperor Taishō's Death anniversary=        ]",
       "[神武天皇即位日=ja:%%<紀元節>, National Foundation Day                    ]",

data/lib/when_exe/region/japanese/eclipses.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2014 Takashi SUGA
+  Copyright (C) 2014-2016 Takashi SUGA
 
   You may use and/or modify this file according to the license
   described in the LICENSE.txt file included in this archive.
@@ -1178,7 +1178,7 @@ module When::CalendarNote::Japanese::Eclipse
 
   # 日月食の概要を文字列化する
   #
-  # @param [Array<String, Numeric, Array>] 食の情報
+  # @param [Array<String, Numeric, Array>] info 食の情報
   #
   #   [ String  - 食の種類 'T' 皆既食, 'A' 金環食, 'P' 部分食, 'B' 帯食]
   #   [ Numeric - 最大食分                                             ]

data/lib/when_exe/region/japanese/location.rb

@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+=begin
+  Copyright (C) 2015 Takashi SUGA
+
+  You may use and/or modify this file according to the license
+  described in the LICENSE.txt file included in this archive.
+=end
+
+module When::Coordinates
+
+  t1 = LocationTable[1]
+  t2 = LocationTable[2]
+  t3 = LocationTable[3]
+  t4 = LocationTable[4]
+  co = (0..2).to_a
+
+  # 位置参照情報ダウンロードサービス「全ての大字・町丁目レベル」( http://nlftp.mlit.go.jp/isj/ )を配置してください
+  geolocation_data = When::Parts::Resource.root_dir + '/data/geolocation/japanese/*.csv'
+
+  #
+  # はしご高など UTF-8 への変換に失敗するコードを含む地名は登録しない
+  #
+  # @private
+  def self.utf_gets(io)
+    error_occurred = false
+    line = nil
+    loop do
+      error = nil
+      begin
+        line = io.gets
+      rescue Encoding::UndefinedConversionError => error
+        error_occurred = true
+      end
+      unless error
+        return error_occurred ? utf_gets(io) : line
+      end
+    end
+  end
+
+  Dir.glob(geolocation_data).each do |path|
+    open(path,'r:SHIFT_JIS') do |io|
+      h = {}
+      lines = ''
+      while (line = utf_gets(io))
+        lines.concat(line)
+      end
+      CSV.parse(lines) do |r|
+        if h.empty?
+          h = Hash[*(0...r.size).to_a.map {|i| [r[i],i]}.flatten]
+        else
+          location    = [r[h['経度']].to_f, r[h['緯度']].to_f, 0]
+          wide_name   = r[h['都道府県名']]
+          middle_name = wide_name + r[h['市区町村名']]
+          fine_name   = r[h['大字町丁目名']]
+          full_name   = middle_name + fine_name
+          t1[full_name] = location
+          t2[middle_name][fine_name] = location
+          t3[wide_name][r[h['市区町村名']]][fine_name] = location
+          case r[h['市区町村名']]
+          when /\A((.+)市)(.+区)\z/
+            t1[$1 + $3 + fine_name] = location
+            t2[$1 + $3] [fine_name] = location
+            t3[$1] [$3] [fine_name] = location
+            t3[$2] [$3] [fine_name] = location
+          when /\A((.+)市)\z/
+            t4[$1] << middle_name
+            t4[$2] << middle_name
+            t4[$1 + fine_name] << full_name
+          when /\A.+郡(.+[町村])\z/
+            t4[wide_name + $1] << middle_name
+            t4[wide_name + $1 + fine_name] << full_name
+          end
+        end
+      end
+    end
+  end
+
+  t3.keys.each do |p|
+    t3[p].keys.each do |c|
+      locations = t3[p][c].values.transpose
+      t3[p][c][:SWB] = t2[p+c][:SWB] = co.map {|i| locations[i].min}
+      t3[p][c][:NET] = t2[p+c][:NET] = co.map {|i| locations[i].max}
+    end
+    swb = t3[p].keys.map {|c| t3[p][c][:SWB]}.transpose
+    net = t3[p].keys.map {|c| t3[p][c][:NET]}.transpose
+    t3[p][:SWB] = co.map {|i| swb[i].min}
+    t3[p][:NET] = co.map {|i| net[i].max}
+  end
+
+  t4.each_pair do |key, value|
+    value.uniq!
+  end
+end

data/lib/when_exe/region/japanese/notes.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2012-2015 Takashi SUGA
+  Copyright (C) 2012-2016 Takashi SUGA
 
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
@@ -32,7 +32,19 @@ class When::CalendarNote
     # 日本暦注の要素
     #
     # @private
-    class Note < When::CalendarNote::NoteElement
+    class Note < When::BasicTypes::Object
+
+      include When::CalendarNote::NoteElement
+
+      #
+      # _m17n_form のための要素生成
+      #
+      # @param [Hash] options 下記のとおり
+      # @option options [Symbol] :method :to_m17n なら label を返す、その他は When::Parts::Resource#to_h 参照
+      #
+      def _to_hash_value(options={})
+        options[:method] == :to_m17n ? label : super
+      end
     end
 
     #
@@ -76,7 +88,7 @@ class When::CalendarNote
         [Note, 0x0003, "label:[天道=]",      'position:暦序',   'suffix:-'],                 # 14: 支
         [Note, 0x0003, "label:[人道=]",      'position:暦序',   'suffix:-'],                 # 15: 支
         [Note, 0x3FFC, "label:[歳次=]",      'position:暦序',   'suffix:-'],                 # 16: 支
-        [Note, 0xF800, "label:[金神]",       'position:仮名暦', 'suffix:在'],                # 17: 干
+        [Note, 0xFC00, "label:[金神]",       'position:仮名暦', 'suffix:在'],                # 17: 干
         [Note, 0xFFFF, "label:[大小]",       'position:暦序']                                # 18: 朔閏表
       ],
 
@@ -136,10 +148,10 @@ class When::CalendarNote
         [Note, 0x3FFC, "label:[六十卦=]",    'position:時候'],                               # 12: 太陽黄経
         [Note, 0xF800, "label:[節分]",       'position:雑節'],                               # 13: 立春からの日数
         [Note, 0xF800, "label:[初午]",       'position:雑節'],                               # 14: 支 節月 or 暦月
-        [Note, 0xF800, "label:[八十八夜]",   'position:雑節'],                               # 15: 立春からの日数
+        [Note, 0xFC00, "label:[八十八夜]",   'position:雑節'],                               # 15: 立春からの日数
         [Note, 0xF800, "label:[入梅]",       'position:雑節'],                               # 16: 干 太陽黄経
         [Note, 0xF800, "label:[半夏生]",     'position:雑節'],                               # 17: 干 太陽黄経
-        [Note, 0xF800, "label:[二百十日]",   'position:雑節'],                               # 18: 立春からの日数
+        [Note, 0xFC00, "label:[二百十日]",   'position:雑節'],                               # 18: 立春からの日数
         [Note, 0xF800, "label:[二百廿日=ja:%%<二百二十日>]", 'position:雑節'],               # 19: 立春からの日数
 
         [Note, 0x3FFC, "label:[大禍=ja:%%<暦注下段>#%.<大禍日>]",
@@ -256,7 +268,7 @@ class When::CalendarNote
         [Note, 0xC000, "label:[己巳]",       'position:仮名暦'],                             # 90: 干支
         [Note, 0xF800, "label:[庚申待]",     'position:仮名暦'],                             # 91: 干支
         [Note, 0xF800, "label:[犯土]",       'position:仮名暦'],                             # 92: 干支
-        [Note, 0xF800, "label:[十方暮]",     'position:仮名暦'],                             # 93: 干支
+        [Note, 0xFC00, "label:[十方暮]",     'position:仮名暦'],                             # 93: 干支
         [Note, 0xF800, "label:[一粒万倍=ja:%%<一粒万倍日>]",
                                              'position:仮名暦', 'suffix:日'],                # 94: 支 節月
         [Note, 0x3800, "label:[天福=]",      'position:仮名暦'],                             # 95: 支 節月
@@ -265,7 +277,7 @@ class When::CalendarNote
         [Note, 0xB800, "label:[三隣亡]",     'position:仮名暦'],                             # 98: 支 節月
         [Note, 0xF800, "label:[不成就=ja:%%<不成就日>]",
                                              'position:仮名暦', 'suffix:日'],                # 99: 暦月 暦日/晦日
-        [Note, 0x3800, "label:[鬼宿]",       'position:仮名暦'],                             #100: 廿八宿
+        [Note, 0x3C00, "label:[鬼宿]",       'position:仮名暦'],                             #100: 廿八宿
         [Note, 0x3800, "label:[金性=]",      'position:仮名暦'],                             #101: 支 節月 支 節年
         [Note, 0x3FFF, "label:[三寶吉=http://kotobank.jp/word/%%<三宝吉日>]",
                                              'position:上段 上段 上段 上段'],                #102: 干支 節月
@@ -526,8 +538,8 @@ class When::CalendarNote
       patch  = SolarTerms::Patch[result.to_i]
       return result unless patch
       num, den  = parameter.kind_of?(String) ? parameter.split('/', 2) : parameter
-      num  = (num ||   0).to_f
-      den  = (den || 360).to_f
+      num  = (num || @num ||   0).to_f
+      den  = (den || @den || 360).to_f
       diff = (num - patch[0] + 1) % den - 1
       return result if diff == 0
       patched = result + When::P1D * diff
@@ -536,6 +548,9 @@ class When::CalendarNote
       result
     end
 
+    # 二十四節気のための event_delta の別名
+    alias :term_delta :event_delta
+
     # 月の位相 => 日時
     #
     # @param [When::TM::TemporalPosition] date 探す基準とする日時
@@ -576,6 +591,9 @@ class When::CalendarNote
       result
     end
 
+    # 月の位相のための event_delta の別名
+    alias :phase_delta :event_delta
+
     private
 
     # オブジェクトの正規化
@@ -722,7 +740,7 @@ class When::CalendarNote
     #
     # 任意の暦を日本年号付暦日に変換
     #
-    # @param When::TM::CalDate] date 変換元日付
+    # @param [When::TM::CalDate] date 変換元日付
     #
     # @return [When::TM::CalDate] 変換結果
     #
@@ -737,7 +755,7 @@ class When::CalendarNote
     #
     # 日本年号付暦日か?
     #
-    # @param When::TM::CalDate] date 確認する日付
+    # @param [When::TM::CalDate] date 確認する日付
     #
     # @return [Boolean] true YES / false NO
     #

data/lib/when_exe/region/japanese/residues.rb

@@ -341,7 +341,7 @@ module When::Coordinates
       notes['天一']     ||= begin
         note = Rules['天一'][@remainder]
         dates.range >= 15 ?  note.dup.sub!(/天上始/, '天上') :
-        dates.range >= 11 ?  note : note.dup.sub!(/始/, '')
+        dates.range >= 10 ?  note : note.dup.sub!(/始/, '')
       end
       notes['土公']     ||= Rules['土公'][@remainder]
       notes['五墓']     ||= [4,22,28,31,37].include?(@remainder) ? '五墓' : nil

data/lib/when_exe/region/japanese/twins.rb

@@ -102,7 +102,9 @@ module When
             'year_length'              => 365.241696,       # 暦元の冬至年 / 日
             'anomalistic_year_shift'   => 6.445,            # 暦應(暦元での冬至から近日点通過までの日数)
             'lunation_shift'           =>  2.779 - 0.015,   # 閏應(暦元前経朔から暦元天正冬至までの日数)
-            'anomalistic_month_shift'  => 22.72  - 0.015    # 転應(暦元前近/遠地点通過から暦元天正冬至までの日数)
+            'anomalistic_month_shift'  => 22.72  - 0.015,   # 転應(暦元前近/遠地点通過から暦元天正冬至までの日数)
+            'anomaly_method'           => '#{Method:a}',    # (経朔-定朔)の計算方法(a:差分, b:微分, c:幾何学的補正)
+            'solar_weight'             => '#{Weight:1}',    # (経朔-定朔)の計算で用いる実行差での太陽盈縮の重み(0:非考慮,1:考慮)
          })]
         }
        }
@@ -118,7 +120,9 @@ module When
             'year_length'              => 365.241696,       # 暦元の冬至年 / 日
             'anomalistic_year_shift'   => 6.445,            # 暦應(暦元での冬至から近日点通過までの日数)
             'lunation_shift'           =>  2.779,           # 閏應(暦元前経朔から暦元天正冬至までの日数)
-            'anomalistic_month_shift'  => 22.72             # 転應(暦元前近/遠地点通過から暦元天正冬至までの日数)
+            'anomalistic_month_shift'  => 22.72,            # 転應(暦元前近/遠地点通過から暦元天正冬至までの日数)
+            'anomaly_method'           => '#{Method:a}',    # (経朔-定朔)の計算方法(a:差分, b:微分, c:幾何学的補正)
+            'solar_weight'             => '#{Weight:1}',    # (経朔-定朔)の計算で用いる実行差での太陽盈縮の重み(0:非考慮,1:考慮)
          })]
         }
        }
@@ -134,7 +138,9 @@ module When
             'year_length'              => 365.241696,       # 暦元の冬至年 / 日
             'anomalistic_year_shift'   => 6.445,            # 暦應(暦元での冬至から近日点通過までの日数)
             'lunation_shift'           =>  2.779 + 0.2138,  # 閏應(暦元前経朔から暦元天正冬至までの日数)
-            'anomalistic_month_shift'  => 22.72  + 0.2138   # 転應(暦元前近/遠地点通過から暦元天正冬至までの日数)
+            'anomalistic_month_shift'  => 22.72  + 0.2138,  # 転應(暦元前近/遠地点通過から暦元天正冬至までの日数)
+            'anomaly_method'           => '#{Method:a}',    # (経朔-定朔)の計算方法(a:差分, b:微分, c:幾何学的補正)
+            'solar_weight'             => '#{Weight:1}',    # (経朔-定朔)の計算で用いる実行差での太陽盈縮の重み(0:非考慮,1:考慮)
          })]
         }
        }
@@ -150,7 +156,9 @@ module When
             'year_length'              => 365.241696,       # 暦元の冬至年 / 日
             'anomalistic_year_shift'   => 6.445,            # 暦應(暦元での冬至から近日点通過までの日数)
             'lunation_shift'           =>  2.779 - 0.0677,  # 閏應(暦元前経朔から暦元天正冬至までの日数)
-            'anomalistic_month_shift'  => 22.72  - 0.0677   # 転應(暦元前近/遠地点通過から暦元天正冬至までの日数)
+            'anomalistic_month_shift'  => 22.72  - 0.0677,  # 転應(暦元前近/遠地点通過から暦元天正冬至までの日数)
+            'anomaly_method'           => '#{Method:a}',    # (経朔-定朔)の計算方法(a:差分, b:微分, c:幾何学的補正)
+            'solar_weight'             => '#{Weight:1}',    # (経朔-定朔)の計算で用いる実行差での太陽盈縮の重み(0:非考慮,1:考慮)
          })]
         }
        }
@@ -167,7 +175,9 @@ module When
             'anomalistic_year_shift'   => 6.455,            # 暦應(暦元での冬至から近日点通過までの日数)
             'lunation_shift'           => 25.654,           # 閏應(暦元前経朔から暦元天正冬至までの日数)
             'anomalistic_month_shift'  => 18.88,            # 転應(暦元前近/遠地点通過から暦元天正冬至までの日数)
-            's'                        => ChineseSolar.change_unit(365.241556 / 365.241696, _japanese_common['s'])
+            's'                        => ChineseSolar.change_unit(365.241556 / 365.241696, _japanese_common['s']),
+            'anomaly_method'           => '#{Method:a}',    # (経朔-定朔)の計算方法(a:差分, b:微分, c:幾何学的補正)
+            'solar_weight'             => '#{Weight:1}',    # (経朔-定朔)の計算で用いる実行差での太陽盈縮の重み(0:非考慮,1:考慮)
          })]
         }
        }
@@ -184,7 +194,9 @@ module When
             'anomalistic_year_shift'   => 7.42,             # 暦應(暦元での冬至から近日点通過までの日数)
             'lunation_shift'           => 25.82,            # 閏應(暦元前経朔から暦元天正冬至までの日数)
             'anomalistic_month_shift'  => 19.307,           # 転應(暦元前近/遠地点通過から暦元天正冬至までの日数)
-            's'                        => ChineseSolar.change_unit(365.241626 / 365.241696, _japanese_common['s'])
+            's'                        => ChineseSolar.change_unit(365.241626 / 365.241696, _japanese_common['s']),
+            'anomaly_method'           => '#{Method:a}',    # (経朔-定朔)の計算方法(a:差分, b:微分, c:幾何学的補正)
+            'solar_weight'             => '#{Weight:1}',    # (経朔-定朔)の計算で用いる実行差での太陽盈縮の重み(0:非考慮,1:考慮)
          })]
         }
        }