when_exe 0.3.7 → 0.3.8

data/lib/when_exe/core/compatibility.rb

@@ -79,7 +79,7 @@ end
 #
 # 例外クラス
 #
-unless Object.const_defined?(:StopIteration)
+unless ::Object.const_defined?(:StopIteration)
   # @private
   class StopIteration < IndexError
   end

data/lib/when_exe/core/duration.rb

@@ -33,20 +33,22 @@ end
 # Extensions to Date class
 #
 # @private
-class Date
+if ::Object.const_defined?(:Date) && ::Date.method_defined?(:+)
+  class Date
 
-  alias :_plus_  :+
-  def +(other)
-    other.kind_of?(When::TM::Duration) ? self + other.rational_duration : self._plus_(other)
-  end
+    alias :_plus_  :+
+    def +(other)
+      other.kind_of?(When::TM::Duration) ? self + other.rational_duration : self._plus_(other)
+    end
 
 
-  alias :_minus_ :-
-  def -(other)
-    case other
-    when When::TM::Duration ; self - other.rational_duration
-    when When::TimeValue    ; self._minus_(kind_of?(DateTime) ? other.to_date_time : other.to_date)
-    else                    ; self._minus_(other)
+    alias :_minus_ :-
+    def -(other)
+      case other
+      when When::TM::Duration ; self - other.rational_duration
+      when When::TimeValue    ; self._minus_(other.to_date_or_datetime)
+      else                    ; self._minus_(other)
+      end
     end
   end
 end

data/lib/when_exe/core/extension.rb

@@ -5,7 +5,6 @@
   You may use and/or modify this file according to the license described in the LICENSE.txt file included in this archive.
 =end
 
-require 'date'
 require 'when_exe/core/duration'
 
 #
@@ -53,55 +52,49 @@ end
 #
 # Extensions to Date class
 #
-class Date
-
-  if When::TM.const_defined?(:TemporalPosition)
+if ::Object.const_defined?(:Date) && ::Date.method_defined?(:+)
+  class Date
+
+    if When::TM.const_defined?(:TemporalPosition)
+
+      include When::TM::TemporalPosition::Conversion
+
+      #
+      # 対応する When::TM::CalDate or DateAndTime を生成
+      #
+      # @param [Hash] options 暦法や時法などの指定
+      #   see {When::TM::TemporalPosition._instance}
+      #
+      # @return [When::TM::CalDate, When::TM::DateAndTime]
+      #
+      # @note 暦法の指定がない場合、start メソッドの値によって
+      #       Julian / Gregorian / Civil 暦法を選択する
+      #
+      def tm_pos(options={})
+        options[:frame] ||= When::CalendarTypes::Christian._default_start(self)
+        super(options)
+      end
+      alias :to_tm_pos :tm_pos
+    end
 
-    include When::TM::TemporalPosition::Conversion
+    alias :__method_missing :method_missing
 
+    # その他のメソッド
     #
-    # 対応する When::TM::CalDate or DateAndTime を生成
-    #
-    # @param [Hash] options 暦法や時法などの指定
-    #   see {When::TM::TemporalPosition._instance}
+    # @note
+    #   self で定義されていないメソッドは
+    #   tm_pos で変換して処理する
     #
-    # @return [When::TM::CalDate, When::TM::DateAndTime]
-    #
-    # @note 暦法の指定がない場合、start メソッドの値によって
-    #       Julian / Gregorian / Civil 暦法を選択する
-    #
-    def tm_pos(options={})
-      options[:frame] ||= When::CalendarTypes::Christian._default_start(self)
-      super(options)
-    end
-    alias :to_tm_pos :tm_pos
-  end
-
-  alias :__method_missing :method_missing
-
-  # その他のメソッド
-  #
-  # @note
-  #   self で定義されていないメソッドは
-  #   tm_pos で変換して処理する
-  #
-  def method_missing(name, *args, &block)
-    return __method_missing(name, *args, &block) if When::Parts::MethodCash::Escape.key?(name)
-    self.class.module_eval %Q{
-      def #{name}(*args, &block)
-        result = tm_pos.send("#{name}", *args, &block)
-        case result
-        when When::TM::DateAndTime ; result.to_date_time
-        when When::TM::CalDate     ; result.to_date
-        else                       ; result
+    def method_missing(name, *args, &block)
+      return __method_missing(name, *args, &block) if When::Parts::MethodCash::Escape.key?(name)
+      self.class.module_eval %Q{
+        def #{name}(*args, &block)
+          result = tm_pos.send("#{name}", *args, &block)
+          result.kind_of?(When::TimeValue) ? result.to_date_or_datetime : result
         end
-      end
-    } unless When::Parts::MethodCash.escape(name)
-    result = tm_pos.send(name, *args, &block)
-    case result
-    when When::TM::DateAndTime ; result.to_date_time
-    when When::TM::CalDate     ; result.to_date
-    else                       ; result
+      } unless When::Parts::MethodCash.escape(name)
+      result = tm_pos.send(name, *args, &block)
+      result.kind_of?(When::TimeValue) ? result.to_date_or_datetime : result
     end
   end
 end

data/lib/when_exe/ephemeris.rb

@@ -289,12 +289,10 @@ module When::Ephemeris
   def root(t0, y0=nil, delta=0, count=10, error=1E-6, &func)
 
     # 近似値0,1
-    # printf("y0=%20.7f\n",y0)
-    d     = [0.01, error * 10].max
-    t     = [t0-d,            t0+d           ]
+    diff  = [0.01, error*1000].min
+    t     = [t0-diff,         t0+diff        ]
     y     = [func.call(t[0]), func.call(t[1])]
     y.map! {|y1| _adjust(y1, y0, delta)} unless delta==0
-    # printf("t=%20.7f,L=%20.7f\n",t[1],y[1])
 
     # 近似値2(1次関数による近似)
     t << (y0 ? (t[1]-t[0])/(y[1]-y[0])*(y0-y[0])+t[0] : t0)
@@ -319,15 +317,19 @@ module When::Ephemeris
 
       if y0
         # 判別式
-        if (d = b*b-4*a*(c-y0)) < 0
-          i = -1
-          break
+        if (discriminant = b*b-4*a*(c-y0)) < 0
+          # 近似値(1次関数による近似)
+          if y12 == 0
+            i = -1
+            break
+          end
+          t << t12/y12*(y0-y[1]) + t[1]
+        else
+          # 近似値(2次関数による近似)
+          sqrtd = Math.sqrt(discriminant)
+          sqrtd = -sqrtd if b < 0
+          t << (t[2] + 2*(y0-c)/(b+sqrtd)) # <-桁落ち回避
         end
-
-        # 近似値(2次関数による近似)
-        sqrtd = Math.sqrt(d)
-        sqrtd = -sqrtd if b < 0
-        t << (t[2] + 2*(y0-c)/(b+sqrtd)) # <-桁落ち回避
       else
         t << (t[2] - b / (2*a))
       end
@@ -1117,7 +1119,7 @@ module When::Ephemeris
     #
     # @return [Numeric]
     #
-    def eclipse(t, target, base=Earth)
+    def phase_of_eclipse(t, target, base=Earth)
       t = +t
       distance      = acos(self.coords(t, base).spherical_law_of_cosines(target.coords(t, base))) / CIRCLE
       self_radius   = self.apparent_radius(t, base)
@@ -1477,6 +1479,33 @@ module When::Ephemeris
       day_event_in_the_day(t, 0, When.Resource('_ep:Moon'))
     end
 
+    # 日食の情報
+    #
+    # @param [When::TM::TemporalPosition] date
+    # @param [Range<When::TM::TemporalPosition>] date
+    # @param [Block] block
+    #
+    # @return [Array<String, Numeric, Array<Array<Numeric or When::TM::TemporalPosition, String>>>] 食の情報(のArray(dateがRangeの場合))
+    #   @see When::Coordinates::Spatial#eclipse_info
+    #
+    def solar_eclipse(date, &block)
+      location.solar_eclipse(date, &block)
+    end
+
+    # 月食の情報
+    #
+    # @param [When::TM::TemporalPosition] date
+    # @param [Range<When::TM::TemporalPosition>] date
+    #   @note Rangeの場合午前6時より前は前日扱い
+    # @param [Block] block
+    #
+    # @return [Array<String, Numeric, Array<Array<Numeric or When::TM::TemporalPosition, String>>>] 食の情報(のArray(dateがRangeの場合))
+    #   @see When::Coordinates::Spatial#eclipse_info
+    #
+    def lunar_eclipse(date, &block)
+      location.lunar_eclipse(date, &block)
+    end
+
     # 恒星の出没と太陽の位置関係に関するイベントの日時
     #
     # @param [Numeric] t ユリウス日(Terrestrial Time)
@@ -1568,7 +1597,7 @@ module When::Ephemeris
       @long, @lat, @alt = [@location.long / When::Coordinates::Spatial::DEGREE,
                            @location.lat  / When::Coordinates::Spatial::DEGREE,
                            @location.alt] if @location
-      @formula        ||= '1L'
+      @formula        ||= '1S'
       @time_standard  ||= 'dynamical'
       @is_dynamical     = (@time_standard[0..0].downcase == 'd')
 

data/lib/when_exe/ephemeris/eclipse.rb

@@ -0,0 +1,149 @@
+# -*- coding: utf-8 -*-
+=begin
+    Copyright (C) 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
+
+class When::Coordinates::Spatial
+
+  # @private
+  EclipseHalfYear = (346 + (14*3600+52*60+54.965) / 86400) / 2
+
+  # @private
+  EclipseRange    = (75.0..120.0) # 82.05003457775217..114.62097737290446
+
+  # 日食の情報
+  #
+  # @param [When::TM::TemporalPosition] date
+  # @param [Range<When::TM::TemporalPosition>] date
+  # @param [Block] block
+  #
+  # @return [Array<String, Numeric, Array<Array<Numeric or When::TM::TemporalPosition, String>>>] 食の情報(のArray(dateがRangeの場合))
+  #   @see When::Coordinates::Spatial#eclipse_info
+  #
+  def solar_eclipse(date, &block)
+    if date.kind_of?(Range)
+      last  = date.last.to_i
+      last -= 1 if date.exclude_end?
+      first = date.first.to_i
+      date  = date.first
+    end
+    clock = date.clock && (date.clock.tz_prop || date.clock.label)
+    cn    = @mean.time_to_cn(date).round
+    list  = []
+    loop do
+      unless @ecls.key?([cn,clock.to_s])
+        time = @mean.cn_to_time(cn)
+        data = EclipseRange.include?(time % EclipseHalfYear) ?
+                eclipse_info(@mean._to_seed_type(time, date), self, When.Resource('_ep:Sun'), When.Resource('_ep:Moon')) : nil
+        @ecls[[cn,clock.to_s]] = data ? [data[2][data[2].size / 2][0].to_i, data] : nil
+      end
+      key, info = @ecls[[cn,clock.to_s]]
+      return info unless first
+      list << (block_given? ? yield(info) : info) if key && first <= key && key <= last
+      break if (key || first) >= last
+      cn += 1
+    end
+    return list
+  end
+
+  # 月食の情報
+  #
+  # @param [When::TM::TemporalPosition] date
+  # @param [Range<When::TM::TemporalPosition>] date
+  #   @note Rangeの場合午前6時より前は前日扱い
+  # @param [Block] block
+  #
+  # @return [Array<String, Numeric, Array<Array<Numeric or When::TM::TemporalPosition, String>>>] 食の情報(のArray(dateがRangeの場合))
+  #   @see When::Coordinates::Spatial#eclipse_info
+  #
+  def lunar_eclipse(date, &block)
+    if date.kind_of?(Range)
+      last  = date.last.to_i
+      last -= 1 if date.exclude_end?
+      first = date.first.to_i
+      date  = date.first
+    end
+    clock = date.clock && (date.clock.tz_prop || date.clock.label)
+    cn    = (@mean.time_to_cn(date)+0.25).floor+0.5
+    list  = []
+    loop do
+      unless @ecls.key?([cn,clock.to_s])
+        time = @mean.cn_to_time(cn)
+        data = EclipseRange.include?(time % EclipseHalfYear) ?
+                 eclipse_info(@mean._to_seed_type(time, date), When.Resource('_ep:Earth'), When.Resource('_ep:Moon'),
+                   When.Resource('_ep:Shadow'), [self, When.Resource('_ep:Moon')]) : nil
+        @ecls[[cn,clock.to_s]] = data ? [(data[2][data[2].size / 2][0]-When::PT6H).to_i, data] : nil
+      end
+      key, info = @ecls[[cn,clock.to_s]]
+      return info unless first
+      list << (block_given? ? yield(info) : info) if key && first <= key && key <= last
+      break if (key || first) >= last
+      cn += 1
+    end
+    return list
+  end
+
+  # 食の情報
+  #
+  # @param [Numeric] date ユリウス日(Terrestrial Time)
+  # @param [When::TM::TemporalPosition] date
+  # @param [When::Ephemeris::Datum or When::Coordinates::Spatial] location 観測地
+  # @param [When::Ephemeris::Datum] target 隠される天体
+  # @param [When::Ephemeris::Datum] base 隠す天体
+  # @param [Array<When::Coordinates::Spatial, When::Ephemeris::Datum>] l_for_h 高度を計算する観測地と対象天体
+  #
+  # @return [Array<String, Numeric, Array<Array<Numeric or When::TM::TemporalPosition, String>>>] 食の情報
+  #
+  #   [ String  - 食の種類 'T' 皆既食, 'A' 金環食, 'P' 部分食, 'B' 帯食]
+  #   [ Numeric - 最大食分                                             ]
+  #   [ Array   - 第1～4接触の日時と地平座標(高度/方位角)              ]
+  #
+  def eclipse_info(date, location, target, base, l_for_h=[location, base])
+
+    tc  = When::Ephemeris.root(+date) {|t|            # 離角最小日時
+            base.elongation(t, target, location)**2
+          }
+    mag = base.phase_of_eclipse(tc, target, location) # 食分
+    return nil unless mag >= 0                        # 食なし
+
+    t1, t4 = [-0.1, +0.1].map {|dt|                   # 第1, 第4接触
+      When::Ephemeris.root(tc+dt, 0) {|t|
+        base.phase_of_eclipse(t, target, location)
+      }
+    }
+
+    if mag >= 1
+      category = 'T'
+      t2, t3 = [-0.01, +0.01].map {|dt|               # 第2, 第3接触
+        When::Ephemeris.root(tc+dt, 1.0) {|t|
+          base.phase_of_eclipse(t, target, location)
+        }
+      }
+    elsif target.phase_of_eclipse(tc, base, location) >= 1
+      category = 'A'
+      t2, t3 = [-0.01, +0.01].map {|dt|               # 第2, 第3接触
+        When::Ephemeris.root(tc+dt, 1.0) {|t|
+          target.phase_of_eclipse(t, base, location)
+        }
+      }
+    else
+      category = 'P'
+    end
+    ts = [t1,t2,tc,t3,t4].compact
+
+    form = When::Ephemeris::Formula.new(:location=>l_for_h[0])
+    height, azimuth = ts.map {|t|                     # 基準天体の高度・方位角
+       coord = form._coords(t, HORIZONTAL, l_for_h[1])
+      [coord.theta * 360, ((0.5-coord.phi)-(0.5-coord.phi).floor) * 360]
+    }.transpose
+    return nil  unless height.max >= 0                # 見えない食
+    category += 'B' if height.min <  0                # 地平線下で食が始まる/終わる
+
+    [category, mag, [ts.map {|t| form._to_seed_type(t, date)}, height, azimuth].transpose]
+
+  rescue RangeError
+    nil
+  end
+end

data/lib/when_exe/ephemeris/notes.rb

@@ -58,8 +58,10 @@ class When::CalendarNote
     #
     # @return [When::TM::CalDate] date またはその直後のイベントの日時
     #
-    def event_eval(date, parameter=@event, precision=date.precision)
-      num, den  = parameter.kind_of?(String) ? parameter[/\d.*\z/].split(/\//, 2) : parameter
+    def event_eval(date, parameter=@event, precision=nil)
+      date         = When.when?(date) unless date.kind_of?(When::TimeValue)
+      precision  ||= date.precision
+      num, den     = parameter.kind_of?(String) ? (parameter[/\d.*\z/]||'').split(/\//, 2) : parameter
       num = (num || @num).to_f
       den = (den || @den).to_f
       date      = date.floor(precision) if precision < date.precision
@@ -67,14 +69,24 @@ class When::CalendarNote
       is_date_and_time = options.key?(:clock) || precision > When::DAY
       options[:precision] = precision
       options[:clock]   ||= date.frame.time_basis || When::TM::Clock.local_time
+      sdn       = _the_date(date, num, den)
+      time      = When::TM::JulianDate._d_to_t(sdn)
+      if @formula.is_dynamical
+        time    = date.time_standard.from_dynamical_time(time)
+        time   += options[:clock].universal_time(sdn.round) if options[:clock].kind_of?(When::CalendarTypes::LocalTime)
+      end
+      event = date.frame.jul_trans(When::TM::JulianDate.universal_time(time), options)
+      is_date_and_time ? event : event.to_cal_date
+    end
+
+    # the event date
+    def _the_date(date, num, den)
       quot, mod = (@formula.time_to_cn(date)*30.0).divmod(den)
       cycle     = quot * den + num
       cycle    += den if mod > (num % den)
-      time      = When::TM::JulianDate._d_to_t(@formula.cn_to_time(cycle/30.0))
-      time      = date.time_standard.from_dynamical_time(time) if @formula.is_dynamical
-      event = date.frame.jul_trans(When::TM::JulianDate.universal_time(time), options)
-      is_date_and_time ? event : event.to_cal_date
+      @formula.cn_to_time(cycle/30.0)
     end
+    private :_the_date
 
     # 日付に対応する座標
     #
@@ -114,7 +126,7 @@ class When::CalendarNote
     def event_time(date, event_name, event)
       etime = term(date - When.Duration('P3D'), event, When::SYSTEM)
       if formula.respond_to?(:year_length) && formula.denominator && formula.denominator < 100000
-        fraction  =  etime.clk_time.universal_time
+        fraction  =  etime.clk_time.local_time
         fraction +=  When::TM::Duration::DAY * (etime.to_i - date.to_i)
         fraction  = (fraction  / When::TM::Duration::DAY * formula.denominator * 1000 + 0.5).floor / 1000.0
         fraction  =  fraction.to_i if fraction == fraction.to_i
@@ -159,6 +171,26 @@ class When::CalendarNote
     end
   end
 
+  #
+  # 冬至を定気で計算し、その他の二十四節気を前後の冬至の日時を時間で等分して求める
+  #
+  class SolarTermsRevised < SolarTerms
+
+    # the event date
+    def _the_date(date, num, den)
+      quot, mod = @formula.time_to_cn(date).divmod(12)
+      quot     +=  1 if mod >= 9
+      range     = [12*quot-3, 12*quot+9].map {|cn| [cn*30, @formula.cn_to_time(cn)]}
+      time      = @formula.is_dynamical ? +date : date.to_f
+      now       = [range[0][0] + (range[1][0] - range[0][0]) / (range[1][1] - range[0][1]) * (time - range[0][1]), time]
+
+      quot, mod = now[0].divmod(den)
+      cycle     = quot * den + num
+      cycle    += den if mod > (num % den)
+      range[0][1] + (range[1][1] - range[0][1]) / (range[1][0] - range[0][0]) * (cycle - range[0][0])
+    end
+  end
+
   #
   # 月の位相
   #