when_exe 0.3.2 → 0.3.3

data/lib/when_exe/parts/timezone.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2013 Takashi SUGA
+  Copyright (C) 2011-2014 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
@@ -15,6 +15,36 @@ module When::Parts
   #
   class Timezone
 
+    #
+    # When::V::Timezone と Qhwn::Parts::Timezone の抽象基底
+    # 
+    module Base
+      # 標準時間帯の時計
+      # @return [When::TM::Clock]
+      attr_reader :standard
+
+      # 夏時間帯の時計
+      # @return [When::TM::Clock]
+      attr_reader :daylight
+
+      # 夏時間帯と標準時間帯の時間差
+      # @return [When::TM:IntervalLength]
+      attr_reader :difference
+
+      # When::TM::TemporalPosition の時間帯を変更して複製する
+      #
+      # @param [When::TM::CalDate, When::TM::DateAndTime, When::TM::JulianDate] date
+      # @param [Hash] options see {When::TM::TemporalPosition._instance}
+      #
+      # @return [When::TM::DateAndTime, When::TM::JulianDate]
+      #
+      def ^(date, options={})
+        options = date._attr.merge({:clock=>self}).merge(options)
+        return When::TM::JulianDate.dynamical_time(date.dynamical_time, options) unless date.frame.kind_of?(When::TM::Calendar)
+        date.frame.jul_trans(When::TM::JulianDate.dynamical_time(date.dynamical_time), options)
+      end
+    end
+
     class << self
       include Resource::Pool
 
@@ -64,22 +94,12 @@ module When::Parts
       end
     end
 
+    include Base
+
     # ラップしている TZInfo::Timezone インスタンス
     # @return [TZInfo::Timezone]
     attr_reader :timezone
 
-    # 標準時間帯の時計
-    # @return [When::TM::Clock]
-    attr_reader :standard
-
-    # 夏時間帯の時計
-    # @return [When::TM::Clock]
-    attr_reader :daylight
-
-    # 夏時間帯と標準時間帯の時間差
-    # @return [When::TM:IntervalLength]
-    attr_reader :difference
-
     # ユニーク識別名
     # @return [String]
     def label
@@ -98,6 +118,14 @@ module When::Parts
       self.class.tz_info[label].latitude
     end
 
+    # 時間帯を代表する都市の空間位置
+    # @return [When::Coordinates::Spatial]
+    def location
+      return @location if @location
+      tzinfo = self.class.tz_info[label]
+      @location = When.Resource("_l:long=#{tzinfo.longitude.to_f}&lat=#{tzinfo.latitude.to_f}&label=#{label}")
+    end
+
     # 時分秒のインデクス
     # @return [Array<When::Coordinates::Index>]
     attr_reader :indices
@@ -131,8 +159,8 @@ module When::Parts
           }
         end
       end
-      std, dst    = _offsets(Time.now.to_i)
-      @standard   = When::TM::Clock.new({:zone=>std, :tz_prop=>self})
+      dst, std  = _offsets(Time.now.to_i)
+      @standard = When::TM::Clock.new({:zone=>std, :tz_prop=>self})
       if std == dst
         @daylight   = @standard
         @difference = 0
@@ -144,16 +172,20 @@ module When::Parts
     end
 
     # @private
-    def _daylight(zdate=nil)
-      if block_given?
-        zdate  = yield(@standard.dup.tap{|clock| clock.tz_prop = nil})
-        now    = zdate.to_time.to_i
-        clocks = _offsets(now).map {|clock| When::TM::Clock.new({:zone=>clock, :tz_prop=>self})}
-        flags  = clocks.map {|z| @timezone.period_for_utc(yield(z.dup.tap{|clock| clock.tz_prop = nil}).to_time.to_i).dst? }
-        (flags[0] || flags[1]) ? clocks[1] : clocks[0]
-      else
-        When::TM::Clock.new({:zone=>@timezone.period_for_utc(zdate.to_time.to_i).utc_total_offset, :tz_prop=>self})
+    def _daylight(time)
+      frame, cal_date, clk_time = time
+      clocks = {}
+      if clk_time
+        time    = frame.to_universal_time(cal_date, clk_time, @standard)
+        offsets = _offsets((time/When::TM::Duration::SECOND).floor)
+        offsets.each do |offset|
+          clocks[offset] ||= When::TM::Clock.new({:zone=>offset, :tz_prop=>self})
+          return clocks[offsets[0]] if @timezone.period_for_utc(
+            (frame.to_universal_time(cal_date, clk_time, clocks[offset])/When::TM::Duration::SECOND).floor).dst?
+        end
       end
+      offset = @timezone.period_for_utc((time/When::TM::Duration::SECOND).floor).utc_total_offset
+      clocks[offset] || When::TM::Clock.new({:zone=>offset, :tz_prop=>self})
     end
 
     # @private
@@ -164,17 +196,17 @@ module When::Parts
     private
 
     def _offsets(time)
-      now         = @timezone.period_for_utc(time)
-      past        = @timezone.period_for_utc(now.utc_start-1) if now.utc_start
-      future      = @timezone.period_for_utc(now.utc_end)     if now.utc_end
-      std         = now.utc_offset
-      dst         = now.utc_total_offset
+      now    = @timezone.period_for_utc(time)
+      past   = @timezone.period_for_utc(now.utc_start-1) if now.utc_start
+      future = @timezone.period_for_utc(now.utc_end)     if now.utc_end
+      std    = now.utc_offset
+      dst    = now.utc_total_offset
       [past, future].each do |period|
         next unless period
-        std = period.utc_offset       if std > period.utc_offset
-        dst = period.utc_total_offset if dst < period.utc_total_offset
+        std  = period.utc_offset       if std > period.utc_offset
+        dst  = period.utc_total_offset if dst < period.utc_total_offset
       end
-      [std, dst]
+      [dst, std]
     end
 
     # その他のメソッド
@@ -182,7 +214,12 @@ module When::Parts
     #   処理を first (type: When::TM::(Temporal)Position) に委譲する
     #
     def method_missing(name, *args, &block)
-      timezone.send(name.to_sym, *args, &block)
+      self.class.module_eval %Q{
+        def #{name}(*args, &block)
+          timezone.send("#{name}", *args, &block)
+        end
+      } unless When::Parts::MethodCash.escape(name)
+      timezone.send(name, *args, &block)
     end
   end
 end

data/lib/when_exe/region/bahai.rb

@@ -100,8 +100,8 @@ module When
       def ephemeris_equinox(date)
         equinox_time = @engine.cn_to_time(+date[0])
         equinox_date = (equinox_time + 0.5 + @engine.long/360.0).floor
-        sun_set_time = @engine.sun_set(equinox_date)
-        (sun_set_time <= equinox_time) ? equinox_date+1 : equinox_date
+        sunset_time = @engine.sunset(equinox_date)
+        (sunset_time <= equinox_time) ? equinox_date+1 : equinox_date
       end
 
       private

data/lib/when_exe/region/balinese.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2013 Takashi SUGA
+  Copyright (C) 2011-2014 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
@@ -71,24 +71,21 @@ module When
     # ウク周期
     #
     class Wuku < Residue
+
+      # Urip 7
+      Urip7    = [ 5, 4, 3, 7, 8, 6, 9]
+
+      # Urip 5
+      Urip5    = [ 9, 7, 4, 8, 5]
+
       # 2日週
-      Dwiwara  = [ 0, 1, 1, 1, 1, 1, 0,
-                   1, 0, 0, 0, 1, 0, 1,
-                   0, 1, 0, 1, 0, 1, 0,
-                   0, 0, 1, 0, 1, 1, 1,
-                   1, 1, 0, 0, 0, 0, 0]
+      Dwiwara  = (0...35).to_a.map {|d| (Urip7[d % 7] + Urip5[d % 5]) %  2}
+
       # 10日週
-      Dasawara = [ 0, 1, 2, 3, 4, 3, 5,
-                   6, 7, 8, 5, 3, 9, 2,
-                   9, 4, 9, 1, 5, 1, 8,
-                   7, 8, 1, 7, 2, 4, 4,
-                   4, 6, 7, 0, 7, 0, 0]
+      Dasawara = (0...35).to_a.map {|d| (Urip7[d % 7] + Urip5[d % 5]) % 10}
+
       # Watek
-      Watek    = [ 0, 1, 2, 3, 4, 3, 5,
-                   6, 7, 8, 5, 3, 9,10,
-                   9, 4, 9, 1, 5, 1,11,
-                   7, 8, 1, 7,10, 4, 4,
-                   4, 6, 7, 0, 7, 0, 0]
+      Watek    = (0...35).to_a.map {|d|  Urip7[d % 7] + Urip5[d % 5] - 7  }
 
       # 2日週
       # @return [When::BasicTypes::M17n]
@@ -136,15 +133,15 @@ module When
     #
     # バリのサカ暦
     #
-    Balinese = [self, [
+    BalineseLuniSolar = [self, [
       "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=en:, ja=ja:, alias]",
       "period:[BalineseLuniSolar=, バリ・サカ暦=]",
-      ["[BSE=, サカ暦=, alias:Balinese_Saka_Era]1886-07<13", "Calendar Epoch", "1886-07<13^BalineseLuniSolar1965",
-                                                             "1892-07-04^BalineseLuniSolar1971",
-                                                             "1914-07-08^BalineseLuniSolar1993",
-                                                             "1921-06<10^BalineseLuniSolar2000",
-                                                             "1924-07<14^BalineseLuniSolar2003", '+Infinity']
+      ["[SE=, サカ暦=, alias:Balinese_Saka_Era]1887-07<13", "Calendar Epoch", "1965-07<13^BalineseLuniSolar1965",
+                                                            "1971-07-04^BalineseLuniSolar1971",
+                                                            "1993-07-08^BalineseLuniSolar1993",
+                                                            "2000-06<10^BalineseLuniSolar2000",
+                                                            "2003-07<14^BalineseLuniSolar2003", '+Infinity']
     ]]
   end
 
@@ -204,6 +201,8 @@ module When
                                               :trunk=>When.Resource('_m:BalineseTerms::HinduMonth::*'),
                                               :shift=>+8})
 
+        @origin_of_MSC = 0
+
         @tabular = CyclicTableBased.new({
           'indices'    => [month_index, Coordinates::Index.new],
           'rule_table' => @rule_table
@@ -222,8 +221,6 @@ module When
         @indices    = [month_index, Coordinates::Index.new({:branch=>{-2=>intercalary_day[0]}})]
 
         @note       = When.CalendarNote(@note || 'BalineseNote')
-
-        @timezone ||= 0
         super
       end
     end
@@ -452,16 +449,16 @@ module When
 
           [When::BasicTypes::M17n,
             "names:[Dasawara=, 10日週=]",
-            "[Sri    ]", #  0
+            "[Pandita]", #  0
             "[Pati   ]", #  1
-            "[Raja   ]", #  2
-            "[Manuh  ]", #  3
-            "[Duka   ]", #  4
-            "[Manusa ]", #  5
-            "[Raksasa]", #  6
-            "[Suka   ]", #  7
+            "[Suka   ]", #  2
+            "[Duka   ]", #  3
+            "[Sri    ]", #  4
+            "[Manuh  ]", #  5
+            "[Manusa ]", #  6
+            "[Raja   ]", #  7
             "[Dewa   ]", #  8
-            "[Pandita]"  #  9
+            "[Raksasa]"  #  9
           ],
 
           [When::Coordinates::Residue,
@@ -476,18 +473,18 @@ module When
 
           [When::BasicTypes::M17n,
             "names:[Watek=]",
-            "[Suku-Gajah=  ]", #  0
-            "[Gajah-Lembu= ]", #  1
-            "[Watu-Lembu=  ]", #  2
-            "[Wong-Lembu=  ]", #  3
-            "[Buta-Uler=   ]", #  4
-            "[Gajah-Lintah=]", #  5
-            "[Suku-Uler=   ]", #  6
-            "[Watu-Lintah= ]", #  7
+            "[Watu-Lembu=  ]", #  7
             "[Buta-Lintah= ]", #  8
-            "[Wong-Gajah=  ]", #  9
-            "[Watu-Uler=   ]", # 10
-            "[Buta-Gajah=  ]"  # 11
+            "[Suku-Uler=   ]", #  9
+            "[Wong-Gajah=  ]", # 10
+            "[Gajah-Lembu= ]", # 11
+            "[Watu-Lintah= ]", # 12
+            "[Buta-Uler=   ]", # 13
+            "[Suku-Gajah=  ]", # 14
+            "[Wong-Lembu=  ]", # 15
+            "[Gajah-Lintah=]", # 16
+            "[Watu-Uler=   ]", # 17
+            "[Buta-Gajah=  ]"  # 18
           ],
 
           [When::Coordinates::Residue,

data/lib/when_exe/region/chinese.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 =begin
-  Copyright (C) 2011-2013 Takashi SUGA
+  Copyright (C) 2011-2014 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
@@ -130,8 +130,36 @@ module When
       attr_reader :anomalistic_month_length
 
       # 元期の近点離隔
-       # @return [Numeric]
-     attr_reader :anomalistic_month_shift
+      # @return [Numeric]
+      attr_reader :anomalistic_month_shift
+
+      # 当該日付のthiti の変化範囲(唐代の定朔の暦法用 cn_to_time(1L) を使用する)
+      #
+      # @param [When::TM::TemporalPosition] date 日付
+      #
+      # @return [Range] 当該日付のthiti の変化範囲(朔を含む場合 nil)
+      #
+      def thiti_range(date)
+        date = date.floor
+        p0, p1 = [date, date.succ].map {|d|
+          t  = d.to_f
+          c  = (30.0 * ((t - CYCLE_0M) * @cycle_number_1m + @cycle_number_0m)).floor
+          t0 = t1 = nil
+          loop do
+            t0 = cn_to_time( c   / 30.0)
+            t1 = cn_to_time((c+1)/ 30.0)
+            if t0 > t
+              c -= 1
+            elsif t1 <= t
+              c += 1
+            else
+              break
+            end
+          end
+          (c + (t-t0) / (t1-t0)) % 30.0
+        }
+        p0 >= p1 ? nil : p0...p1
+      end
 
       private
 
@@ -157,8 +185,6 @@ module When
       #
       def delta_s(t)
 
-        tt = t
-
         t0, a, b, c = nil
         @s.each do |v|
           t0, a, b, c = v
@@ -189,8 +215,6 @@ module When
       #
       def delta_m(t)
 
-        tt = t
-
         t *= @denominator
         a0 = b0 = t0 = 0
         @m.each do |v|
@@ -210,6 +234,7 @@ module When
         if @formula == '1L'
           @anomalistic_month_length =  @anomalistic_month_length.to_r
           @anomalistic_month_shift  = (@anomalistic_month_shift||0).to_r
+          @s = @s.map {|item| item.dup}
           (0...@s.size).each do |i|
             @s[i-1][1,0] = @year_length / @s.size + (@s[i][0]-@s[i-1][0]) / @denominator
           end
@@ -228,6 +253,14 @@ module When
     #
     class ChineseSolar < EphemerisBasedSolar
 
+      #
+      # @return [When::CalendarTypes::ChineseLuniSolar] 対で用いる太陰太陽暦の名前
+      #
+      attr_reader :twin
+
+      # @private
+      attr_reader :doyo
+
       private
 
       # オブジェクトの正規化
@@ -241,7 +274,6 @@ module When
         @formula           *= 2 if @formula.length == 1
         @formula[0]        += (@formula[0] =~ /\?/ ? '&' : '?') + 'formula=12S' if @formula[0].kind_of?(String)
         @formula[1]        += (@formula[1] =~ /\?/ ? '&' : '?') + 'formula=1L'  if @formula[1].kind_of?(String)
-        @timezone         ||=  0
         @note             ||= When.CalendarNote('ChineseNotes')
         @indices          ||= [
             When::Coordinates::Index.new({:trunk=>When.Resource('_m:ChineseTerms::Month::*')}),
@@ -256,13 +288,29 @@ module When
     #
     class ChineseLuniSolar < EphemerisBasedLuniSolar
 
+      #
+      # @return [When::CalendarTypes::ChineseSolar] 対で用いる太陽暦の名前
+      #
+      attr_reader :twin
+
+      # 指定の年の天正冬至を含む月以降１年分の閏月のパターン
+      #
+      # @param [Numeric] y 年
+      #
+      # @return [Array<Numeric:月番号>, Array<Numeric:中気のない月の月番号>]
+      #
+      def intercalary_pattern(y)
+        m = _base_month(y)
+        l = _base_ids(y)
+        [l, (0...l.size).to_a.map {|i| _intercalary?(m+i) ? l[i] : nil}.compact]
+      end
+
       private
 
       # オブジェクトの正規化
       #
       #   @cycle_offset = 雨水の場合 -1
       #   @formula      = 太陽黄経および月の位相の計算に用いるEphemeris
-      #   @timezone[1]  = 進朔量
       #
       def _normalize(args=[], options={})
         @label            ||= When.Resource('_m:ChineseTerms::ChineseLuniSolar')
@@ -277,7 +325,6 @@ module When
         @intercalary_span ||= 12
         @intercalary_span   =  @intercalary_span.to_i
         @intercalary_month  = (@intercalary_month.to_i - @base_month) % 12 + 1 if @intercalary_month
-        @timezone         ||= 0
         @note             ||= When.CalendarNote('ChineseNotes')
         @indices          ||= [
             When::Coordinates::Index.new({:branch=>{1=>When.Resource('_m:CalendarTerms::閏')},
@@ -312,10 +359,7 @@ module When
       # @return [Numeric] 天正冬至月の通月
       #
       def _base_month_(y)
-        (Residue.mod((@formula[0].cn_to_time(12*(y-1) + @base_month - @vernal_month) +
-          0.5 + @timezone[0]).floor) {|m|
-          _new_month(m)
-        })[0]
+        (Residue.mod(solar_sdn(@formula[0].cn_to_time(12*(y-1) + @base_month - @vernal_month))) {|m| _new_month(m)})[0]
       end
 
       # 暦年の翻訳表の取得
@@ -383,7 +427,7 @@ module When
       end
     end
 
-    Chinese = [When::BasicTypes::M17n, [
+    Chinese = [{}, When::BasicTypes::M17n, [
       "namespace:[en=http://en.wikipedia.org/wiki/, ja=http://ja.wikipedia.org/wiki/]",
       "locale:[=ja:, en=en:, alias]",
       "area:[中国,China]",
@@ -397,7 +441,7 @@ module When
       [ChineseLuniSolar,
         'name:[顓頊暦]',
         'formula:MeanLunation?year_length=1461/4&lunation_length=27759/940&day_epoch=1171396&longitude_shift=-1/8',
-        'timezone:0,+12',
+        'time_basis:+00,+#{P:12}',
         'intercalary_month:9'
       ],
 
@@ -501,12 +545,13 @@ module When
       ],
 
       [ChineseLuniSolar,
-        'name:[儀鳳暦]',
+        'name:[平朔儀鳳暦]',
         'formula:MeanLunation?year_length=122357/335&lunation_length=39571/1340&day_epoch=-96608689'
       ],
 
       [ChineseLuniSolar,
         'name:[麟徳暦]',
+        'time_basis:+00,+#{P:00}',
         {'formula'=>['12S', '1L'].map {|f|
           Ephemeris::ChineseTrueLunation.new({
             'formula'                  => f,
@@ -573,13 +618,15 @@ module When
               [1340.0,   -125],                    #   27日
               [ 743.0+1.0/12, -71]                 #   28日
             ]
-          })
-        }}
+         })
+        },
+        'doyo'   => (Rational( 4,15) +  244) / 1340
+       }
       ],
 
       [ChineseLuniSolar,
         'name:[大衍暦]',
-        'timezone:0,+6',
+        'time_basis:+00,+#{P:03}',
         {'formula'=>['12S', '1L'].map {|f|
           Ephemeris::ChineseTrueLunation.new({
             'formula'                  => f,
@@ -647,13 +694,15 @@ module When
               [3040.0,   +276],                    #   27日
               [1686.0,   +165]                     #   28日
             ]
-          })
-        }}
+         })
+        },
+        'doyo'   => (Rational(13,30) +  531) / 3040
+       }
       ],
 
       [ChineseLuniSolar,
         'name:[五紀暦]',
-        'timezone:0,+6',
+        'time_basis:+00,+#{P:06}',
         {'formula'=>['12S', '1L'].map {|f|
           Ephemeris::ChineseTrueLunation.new({
             'formula'                  => f,
@@ -720,13 +769,20 @@ module When
               [1340.0,   -125],                    #   27日
               [ 743.0+5.0/37, -75]                 #   28日
             ]
-          })
-        }}
+         })
+        },
+        'doyo'   => (Rational( 4,15) +  244) / 1340
+       }
+      ],
+
+      [ChineseSolar,
+        'name:[正元暦(節月)]',
+        'formula:MeanLunation?year_length=399943/1095&lunation_length=32336/1095&day_epoch=-145149709'
       ],
 
       [ChineseLuniSolar,
         'name:[宣明暦]',
-        'timezone:0,+6',
+        'time_basis:+00,+#{P:06}',
         {'formula'=>['12S', '1L'].map {|f|
           Ephemeris::ChineseTrueLunation.new({
             'formula'                  => f,
@@ -793,8 +849,10 @@ module When
               [ 8400.0,   +740],                    #   13日
               [ 6529.095, +646]                     #   14日
             ]
-          })
-        }}
+         })
+        },
+        'doyo'   => (Rational( 1, 2) + 1468) / 8400
+       }
       ],
 
       [ChineseSolar,
@@ -808,12 +866,12 @@ module When
       ],
 
       [ChineseSolar,
-        'name:[前々宝暦暦(節月)]',
+        'name:[貞享補暦A(節月)]',
         'formula:VariableYearLengthMethod?day_epoch=2336118.903800&year_epoch=1684&year_length=365.241696&year_delta=1'
       ],
 
       [ChineseSolar,
-        'name:[前宝暦暦(節月)]',
+        'name:[貞享補暦B(節月)]',
         'formula:VariableYearLengthMethod?day_epoch=2336118.622300&year_epoch=1684&year_length=365.241696&year_delta=1'
       ],
 
@@ -833,9 +891,11 @@ module When
       ]
     ].inject([]) {|list, cal|
       if cal.kind_of?(Array) && cal[0] == ChineseLuniSolar
-        twin       = cal.dup
-        twin[0..1] = [ChineseSolar, cal[1].sub(/\]/, '(節月)]')]
-        list << cal << twin
+        solar_name  = cal[1].sub(/\]/, '(節月)]')
+        lunisolar   = cal.dup << 'twin:Chinese::' + solar_name.gsub(/(name:\[|\])/,'')
+        solar       = cal.dup << 'twin:Chinese::' + cal[1].gsub(/(name:\[|\])/,'')
+        solar[0..1] = [ChineseSolar, solar_name]
+        list << lunisolar << solar
       else
         list << cal
       end