equationoftime 4.1.5 → 4.1.6

data/lib/eot/angles.rb

@@ -1,10 +1,10 @@
 # class Eot file = angles.rb
+# methods for non delta angle calculations
 class Eot
-  include Math
   # From angles.rb:
   # Apparent solar longitude = true longitude - aberation
   def al_sun
-    Celes.anp(al(@ma, @ta, Celes.faom03(@ta)))
+    Celes.anp(al(@ma, @ta, omega))
   end
   alias_method :apparent_longitude, :al_sun
   alias_method :alsun, :al_sun
@@ -20,8 +20,7 @@ class Eot
   # From angles.rb:
   # solar declination
   def dec_sun
-    asin(sin(Celes.nut06a(@ajd, 0)[1] + Celes.obl06(@ajd, 0)) *
-            sin(al(@ma, @ta, Celes.faom03(@ta))))
+    sun_dec(al_sun, to_earth)
   end
   alias_method :declination, :dec_sun
 
@@ -37,10 +36,17 @@ class Eot
   # equation of equinox
   # used for true longitude of Aries
   # Depricated by Celes.gst06a()
+  # compinents are still used
+  # see: #cosine_to_earth and #angle_delta_psi
   def eq_of_equinox
-    cos(Celes.nut06a(@ajd, 0)[1] +
-        Celes.obl06(@ajd, 0)) *
-        Celes.nut06a(@ajd, 0)[0]
+    Celes.ee06a(@ajd, 0.0)
+  end
+
+  # From angles.rb:
+  # Earth rotation angle (for comparison to tl_aries
+  # which uses gmst06)
+  def era
+    Celes.era00(@ajd, 0.0)
   end
 
   # From angles.rb:
@@ -50,17 +56,30 @@ class Eot
     ml(@ta)
   end
   alias_method :geometric_mean_longitude, :gml_sun
+  alias_method :ml_sun, :gml_sun
+
+  # From angles.rb:
+  # used by ha_sun method
+  # to select rise set and civil, nautical, astronomical twilights.
+  def choice(c)
+    case c
+    when 1
+      return 90.8333 # Sunrise and Sunset
+    when 2
+      return 96 # Civil Twilight
+    when 3
+      return 102 # Nautical Twilight
+    when 4
+      return 108 # Astronomical Twilight
+    end
+  end
 
   # From angles.rb:
   # horizon angle for provided geo coordinates
-  # used for angles from transit to horizons
-  def ha_sun
-    zenith   = 90.8333 # use other zeniths here for non commercial
-    top      = cosZ(zenith) - sin_dec_sun(dec_sun) * sin_lat(@latitude * D2R)
-    bottom   = cos_dec_sun(dec_sun) * cos_lat(@latitude * D2R)
-    t_cosine = top / bottom
-    t_cosine > 1.0 || t_cosine < -1.0 ? cos = 1.0 : cos = t_cosine
-    acos(cos)
+  # used for angles from transit to horizons.
+  def ha_sun(c)
+    zenith = choice(c)
+    sun(zenith, dec_sun, @latitude)
   end
   alias_method :horizon_angle, :ha_sun
 
@@ -106,9 +125,10 @@ class Eot
   # From angles.rb:
   # solar right ascension
   def ra_sun
-    y0 = sin(al(@ma, @ta, Celes.faom03(@ta))) * cos(Celes.nut06a(@ajd, 0)[1] +
-         Celes.obl06(@ajd, 0))
-    Celes.anp(PI + atan2(-y0, -cos(al(@ma, @ta, Celes.faom03(@ta)))))
+    y0 = sine_al_sun * cosine_to_earth
+    ra = sun_ra(y0, cosine_al_sun) 
+    # Celes.anp(PI + atan2(-y0, -cosine_al_sun))
+    Celes.anp(PI + ra)
   end
   alias_method :right_ascension, :ra_sun
 
@@ -143,7 +163,7 @@ class Eot
   # From angles.rb:
   # true obliquity considers nutation
   def to_earth
-    Celes.nut06a(@ajd, 0)[1] + Celes.obl06(@ajd, 0)
+    mo_earth + angle_delta_epsilon
   end
   alias_method :obliquity_correction, :to_earth
   alias_method :true_obliquity, :to_earth

data/lib/eot/constants.rb

@@ -1,4 +1,5 @@
 # class Eot file = constants.rb
+# has the constants used and more
 class Eot
   # Array result for time_julian_century default = [0.0, 0.0, 0.0, 0.0, 0.0]
   # A2000       = [0.0, 0.0, 0.0, 0.0, 0.0]
@@ -121,7 +122,7 @@ class Eot
 
   # Julian Date of Modified Julian Date zero
   # 1858, 11, 17, 0.0 midnight start of calendar reform = 2400000.5
-  # MJD0        = 2400000.5  
+  # MJD0        = 2400000.5
 
   # from desktop calculator PI = 3.1415926535897932384626433832795
   PI          = 3.1415926535897932384626433832795

data/lib/eot/deltas.rb

@@ -1,4 +1,5 @@
 # class Eot file = deltas.rb
+# methods for angle deltas
 class Eot
   # From deltas.rb:
   # delta epsilon

data/lib/eot/geo_lat_lng_smt.rb

@@ -1,6 +1,5 @@
 # class GeoLatLng file = geo_lat_lng_smt.rb
-# class for location lookup
-# in geo_lat_lng_smt.rb
+# class for location coordinates lookup
 class GeoLatLng
   # Base address for Google maps api
   attr_reader :base_json

data/lib/eot/init.rb

@@ -1,67 +1,71 @@
 # class Eot file = int.rb
+# attributes, a setter and init method
 class Eot
   # From init.rb:
-  # address used for GeoLatLng.addr
+  # address is a String ex: "houston, tx"
   attr_accessor :addr
 
   # From init.rb:
-  # Astronomical Julian Day Number is an instance of DateTime class.
-  # ajd or jd. Use ajd for time now and jd for suntimes. Initially
-  # @ajd = DateTime.now.to_time.utc.to_datetime.jd.to_f
-  attr_reader :ajd
+  # Astronomical Julian Day Number
+  # instance of Float class.
+  # ajd or jd. Use ajd for time now and jd for noon
+  # init sets ajd = DateTime.now.to_time.utc.to_datetime.jd.to_f
+  attr_accessor :ajd
 
-  def ajd=(ajd)
-    @ajd = ajd
-    @ta  = ((ajd - DJ00) / DJC).to_f
-    @ma  = Celes.falp03(@ta)
+  # From init.rb
+  # method to reset ma and ta after initialization
+  # init sets them using ajd initial Float value
+  # see: :ajd attribute
+  def ma_ta_set
+    @ta = ((@ajd - DJ00) / DJC).to_f
+    @ma = Celes.falp03(@ta)
   end
 
   # From init.rb:
-  # @date is an instance of DateTime class.
-  # When new Eot class is initialized @date = ajd_to_datetime(@ajd)
+  # Date
+  # instance of DateTime class
+  # initialized to = ajd_to_datetime(@ajd)
   attr_accessor :date
 
   # From init.rb:
-  # Julian Day Number is an instance of DateTime class.
-  # When new Eot class is initialized @jd = @ajd
+  # Julian Day Number
+  # instance of Float class
+  # initialized to = ajd
   attr_accessor :jd
 
   # From init.rb:
-  # Latitude input is an instance of Float class.
-  # When new Eot class is initialized @latitude = 0.0
-  # if GeoLatLng class can't set it.
+  # Latitude input
+  # instance of Float class
+  # initialized to = 0.0
   attr_accessor :latitude
 
   # From init.rb:
-  # Longitude input is an instance of Float class.
-  # When new Eot class is initialized @longitude = 0.0
-  # if GeoLatLng class can't set it.
+  # Longitude input
+  # instance of Float class
+  # initialized to = 0.0
   attr_accessor :longitude
 
   # From init.rb:
-  # JCT gets called a lot so class attribute it.
-  # Setting @ajd will set this and @ma
-  # @ta = (( @ajd - DJ00 ) / DJC).to_f
+  # Julian Century gets called often
+  # instance of Float class
+  # ta = (( @ajd - DJ00 ) / DJC).to_f
   attr_accessor :ta
 
   # From init.rb:
-  # Mean Anomaly gets called a lot so class attribute saves it.
-  # @ma = Celes.falp03(@ta)
+  # Mean Anomaly gets called often
+  # instance of Float class
+  # ma = Celes.falp03(@ta) see: celes gem
   attr_accessor :ma
 
   # From init.rb:
   # Initialize to set attributes
-  # You may use GeoLatLng to set up @latitude and @longitude
   def initialize
-    @geo = GeoLatLng.new
-    @addr = @geo.default_int
-    @geo.addr = @addr
-    @ajd = DateTime.now.to_time.utc.to_datetime.jd.to_f
-    @date, @jd = ajd_to_datetime(@ajd), @ajd
-    @geo.set_coordinates
-    # queries could excede quotas or you get disconnected.
-    @geo.lat.zero? ? @latitude = 0.0 : @latitude = @geo.lat
-    @geo.lng.zero? ? @longitude = 0.0 : @longitude = @geo.lng
+    d = DateTime.now.to_time.utc.to_datetime
+    djm0, djm = Celes::cal2jd(d.year, d.month, d.day + d.day_fraction)
+    @ajd = djm0 + djm + 0.5
+    ma_ta_set
+    @date, @jd = ajd_to_datetime(@ajd), @ajd    
+    @latitude,  @longitude = 0.0,  0.0      
   end
 end
 
@@ -79,8 +83,10 @@ if __FILE__ == $PROGRAM_NAME
   p eot.addr
   p eot.latitude
   p eot.longitude
+  list = eot.public_methods(false).sort
+  list.each { |i| puts i.to_sym }
   spec = File.expand_path('../../../test/eot', __FILE__)
   $LOAD_PATH.unshift(spec) unless $LOAD_PATH.include?(spec)
   require 'init_spec'
-  system 'bundle exec ruby ~/workspace/equationoftime/test/eot/init_spec.rb'
+  # bundle exec rake
 end

data/lib/eot/time_displays.rb

@@ -1,4 +1,5 @@
 # class Eot file = time_displays.rb
+# methods for time displays
 class Eot
   # From displays.rb
   # String formatter for + and - time
@@ -24,14 +25,24 @@ class Eot
     h = Integer(fraction * DAY_HOURS)
     m = Integer((fraction - h / DAY_HOURS) * DAY_MINUTES)
     s = Integer((fraction - h / 24.0 - m / DAY_MINUTES) * DAY_SECONDS)
-    format('%02d', h)   +
-    ':'              +
+    format('%02d:', h) +
+    # ':' +
     format('%02d', m) +
-    ':'              +
+                  ':' +
     format('%02d', s)
   end
   alias_method :julian_period_day_fraction_to_time, :string_day_fraction_to_time
 
+  # From displays.rb
+  # radians to time method
+  def string_deg_to_time(radians = 0.0)
+    radians.nil? ? radians = 0.0 : radians
+    s, ihmsf = Celes.a2tf(3, radians)
+    f_string(s, ihmsf[0], ihmsf[1], ihmsf[2], ihmsf[3])
+  end
+
+  # From displays.rb
+  # displays + or - sign
   def sign_min(min)
     if min < 0.0
       sign = '-'
@@ -65,6 +76,8 @@ class Eot
   end
   alias_method :jd_to_date_string, :string_jd_to_date
 
+  # From displays.rb
+  # formats time components
   def format_time(h, m, s, ds)
     format('%02d', h)   +
                  ':' +
@@ -75,8 +88,10 @@ class Eot
     format('%3.3d', ds)
   end
 
+  # From displays.rb
+  # creates [h,m,s,ds] array from Time or DateTime
   def dt_parts(val)
-    h = val.hour
+    h  = val.hour
     m  = val.min
     s  = val.sec
     is = Integer(s)
@@ -84,6 +99,8 @@ class Eot
     [h, m, is, ds]
   end
 
+  # From displays.rb
+  # creates [h,m,s,ds] from hours Float 
   def float_parts(val)
     hours = Integer(val % DAY_HOURS)
     mins = 60.0 * (val % DAY_HOURS - hours)

data/lib/eot/times.rb

@@ -1,4 +1,5 @@
 # class Eot file = times.rb
+# methods calculating times
 class Eot
   # From times.rb:
   # Pass in an AJD number
@@ -9,104 +10,75 @@ class Eot
 
   # From times.rb:
   # Uses @ajd attribute
-  # Returns EOT as an AJD Julian number
-  def eot_jd
-    time_eot / DAY_MINUTES
+  # Returns astronomical twilight end as a DateTime
+  def astronomical_twilight_end_dt
+    ajd_to_datetime(astronomical_twilight_end_jd)
   end
 
   # From times.rb:
-  # Uses @ajd and @longitude attributes
-  # Returns DateTime object of local noon or solar transit
-  def local_noon_dt
-    ajd_to_datetime(@ajd - @longitude / 360.0 - eot_jd)
-  end
-
-  # From times.rb:
-  # Uses @ajd and @longitude attributes
-  # Returns DateTime object of local mean noon or solar transit
-  def mean_local_noon_dt
-    ajd_to_datetime(@ajd - @longitude / 360.0)
-  end
-
-  # From times.rb:
-  # sets @ajd to DateTime.now
-  # Returns EOT (equation of time) now in decimal minutes form
-  def now
-    @ajd = DateTime.now.to_time.utc.to_datetime.ajd
-    @ta = (@ajd - DJ00) / DJC
-    time_eot
+  # Uses @ajd attribute
+  # Returns astronomical twilight start as a DateTime
+  def astronomical_twilight_start_dt
+    ajd_to_datetime(astronomical_twilight_start_jd)
   end
 
   # From times.rb:
   # Uses @ajd attribute
-  # Returns a DateTime object of local sunrise
-  def sunrise_dt
-    ajd_to_datetime(sunrise_jd)
+  # Returns civil twilight end as a DateTime
+  def civil_twilight_end_dt
+    ajd_to_datetime(civil_twilight_end_jd)
   end
 
   # From times.rb:
   # Uses @ajd attribute
-  # Returns Sunrise as a Julian Day Number
-  def sunrise_jd
-    local_noon_dt.ajd - ha_sun / P2
+  # Returns civil twilight start as a DateTime
+  def civil_twilight_start_dt
+    ajd_to_datetime(civil_twilight_start_jd)
   end
 
   # From times.rb:
-  # Uses @ajd attribute
-  # Returns a DateTime object of local sunset
-  def sunset_dt
-    ajd_to_datetime(sunset_jd)
+  # Uses @ajd and @longitude attributes
+  # Returns DateTime object of local noon or solar transit
+  def local_noon_dt
+    ajd_to_datetime(mean_local_noon_jd - eot_jd)
   end
 
   # From times.rb:
   # Uses @ajd attribute
-  # Returns Sunset as a Julian Day Number
-  def sunset_jd
-    local_noon_dt.ajd + ha_sun / P2
+  # Returns nautical twilight end as a DateTime
+  def nautical_twilight_end_dt
+    ajd_to_datetime(nautical_twilight_end_jd)
   end
 
   # From times.rb:
   # Uses @ajd attribute
-  # Returns Oblique component of EOT in decimal minutes time
-  def time_delta_oblique
-    (tl_sun - ra_sun) * R2D * SM
+  # Returns nautical twilight start as a DateTime
+  def nautical_twilight_start_dt
+    ajd_to_datetime(nautical_twilight_start_jd)
   end
 
   # From times.rb:
-  # Uses @ajd attribute
-  # Returns Orbit component of EOT in decimal minutes time
-  def time_delta_orbit
-    (@ma - ta_sun) * R2D * SM
+  # sets @ajd to DateTime.now
+  # Returns EOT (equation of time) now in decimal minutes form
+  def now
+    @ajd = DateTime.now.to_time.utc.to_datetime.ajd
+    @ta = (@ajd - DJ00) / DJC
+    time_eot
   end
 
   # From times.rb:
   # Uses @ajd attribute
-  # Returns EOT as a float for decimal minutes time
-  def time_eot
-    eot * R2D * SM
+  # Returns a DateTime object of local sunrise
+  def sunrise_dt
+    ajd_to_datetime(sunrise_jd)
   end
 
   # From times.rb:
-  # All calculations with ( ta )  were based on this.
-  # Julian Century Time is a fractional century
-  # Julian Day Number DJ00 is subtracted from the JDN or AJDN and then divided
-  # by days in a Julian Century.
-  # Deprecated
-  def time_julian_century
-    t1 = (@ajd - DJ00) / DJC
-    # t2 = t1 * t1
-    # t3 = t1 * t2
-    # t4 = t2 * t2
-    # t5 = t2 * t3
-    # t6 = t3 * t3
-    # t7 = t3 * t4
-    # t8 = t4 * t4
-    # t9 = t4 * t5
-    # t10 = t5 * t5
-    # @ta = [ t1, t2, t3, t4, t5, t6, t7, t8, t9, t10 ]
-    @ta = t1
+  # Uses @ajd attribute
+  # Returns a DateTime object of local sunset
+  def sunset_dt
+    ajd_to_datetime(sunset_jd)
   end
-  alias_method :time_julian_centurey, :time_julian_century
 end
 
 if __FILE__ == $PROGRAM_NAME