equationoftime 4.1.2 → 4.1.4

data/lib/eot/constants.rb

@@ -1,159 +1,156 @@
-# constants.rb
-
-require 'date'
-
+# class Eot file = constants.rb
 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] 
+  # 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]
 
-  # Arc seconds in a degree = 3_600.0  
+  # Arc seconds in a degree = 3_600.0
   ARCSEC      = 3_600.0
-  
-  # Arc seconds in a degree = 3_600.0  
+
+  # Arc seconds in a degree = 3_600.0
   ASD         = 3_600.0
-  
+
   # Arc seconds in an hour = 240.0
   # ASH         = 240.0
-  
+
   # Light time for 1 au (s) = 499.004782
   # AULT        = 499.004782
 
   # Speed of light (m/s) = 299792458.0
-  # CMPS        = 299792458.0  
+  # CMPS        = 299792458.0
 
-  # Default date string = "2000-01-01"  
+  # Default date string = "2000-01-01"
   # D2000       = "2000-01-01"
 
-  # 2Pi = 6.283185307179586476925287 
-  # D2PI        = 6.283185307179586476925287  
+  # 2Pi = 6.283185307179586476925287
+  # D2PI        = 6.283185307179586476925287
 
   # from desktop calculator DAS2R = 4.8481368110953599358991410235795e-6
   DAS2R       = 4.8481368110953599358991410235795e-6
 
   # Astronomical unit (m) = 149597870e3
-  # DAU         = 149597870e3  
+  # DAU         = 149597870e3
+
+  # Hours in a day = 24.0
+  DAY_HOURS   = 24.0
 
-  # Hours in a day = 24.0  
-  DAY_HOURS   = 24.0 
-  
-  # Minutes in a day = 1_440.0  
-  DAY_MINUTES = 1_440.0 
+  # Minutes in a day = 1_440.0
+  DAY_MINUTES = 1_440.0
 
-  # Seconds in a day = 86_400.0  
+  # Seconds in a day = 86_400.0
   DAY_SECONDS = 86_400.0
-  
+
   # Seconds in a day = 86_400.0
-  DAYSEC      = 86400.0  
+  DAYSEC      = 86_400.0
 
-  # Micro Seconds in a day = 86_400_000_000.0  
+  # Micro Seconds in a day = 86_400_000_000.0
   DAY_USECS   = 86_400_000_000.0
-  
+
   # Speed of light (AU per day) = DAYSEC / AULT
   # DC = DAYSEC / AULT
-  
+
   # from desktop calculator D2R = 0.017453292519943295769236907684886
   D2R          = 0.017453292519943295769236907684886
-  
-  # dint(A) - truncate to nearest whole number towards zero (double) 
+
+  # dint(A) - truncate to nearest whole number towards zero (double)
   # dint(A) = ((A)<0.0?ceil(A):floor(A))
 
-  # dnint(A) - round to nearest whole number (double) 
+  # dnint(A) - round to nearest whole number (double)
   # dnint(A) = ((A)<0.0?ceil((A)-0.5):floor((A)+0.5))
 
-  # dsign(A,B) - magnitude of A with sign of B (double) 
+  # dsign(A,B) - magnitude of A with sign of B (double)
   # dsign(A,B) = ((B)<0.0?-fabs(A):fabs(A))
-  
+
   # Reference epoch (J2000.0), Julian Date
-  # Default Julian Number = 2451545.0  
-  DJ00        = 2451545.0  
-  
-  # Days per Julian century = 36525.0 
-  DJC         = 36525.0
-  
+  # Default Julian Number = 2451545.0
+  DJ00        = 2_451_545.0
+
+  # Days per Julian century = 36525.0
+  DJC         = 36_525.0
+
   # Days per Julian millennium  = 365250.0
   # DJM         = 365250.0
 
   # Julian Date of Modified Julian Date zero
   # 1858, 11, 17, 0.0 midnight start of calendar reform = 2400000.5
   # Removed from Julian Date to get Modified Julian Date
-  # DJM0        = 2400000.5  
+  # DJM0        = 2400000.5
 
-  # Reference epoch (J2000.0), Modified Julian Date = 51544.5  
+  # Reference epoch (J2000.0), Modified Julian Date = 51544.5
   # DJM00       = 51544.5
 
-  # 1977 Jan 1.0 as MJD = 43144.0  
-  # DJM77       = 43144.0  
-  
-  # Days per Julian year = 365.25 
+  # 1977 Jan 1.0 as MJD = 43144.0
+  # DJM77       = 43144.0
+
+  # Days per Julian year = 365.25
   # DJY         = 365.25
-  
+
   # Milli-arc-seconds to radians  = DAS2R / 1e3
   # DMAS2R      = DAS2R / 1e3
-  
-  # Radians to arc seconds = 206264.8062470963551564734 
-  # DR2AS       = 206264.8062470963551564734    
-  
-  # Seconds of time to radians = 7.272205216643039903848712e-5 
+
+  # Radians to arc seconds = 206264.8062470963551564734
+  # DR2AS       = 206264.8062470963551564734
+
+  # Seconds of time to radians = 7.272205216643039903848712e-5
   # DS2R        = 7.272205216643039903848712e-5
 
-  # Default DateTime = DateTime.new( 2000, 01, 01, 12, 00, 00, "+00:00" )  
-  DT2000      = DateTime.new( 2000, 01, 01, 12, 00, 00, "+00:00" )    
+  # Default DateTime = DateTime.new( 2000, 01, 01, 12, 00, 00, "+00:00" )
+  DT2000      = DateTime.new(2000, 01, 01, 12, 00, 00, '+00:00')
 
-  # arc seconds degrees to radians = PI / 180.0 / ARCSEC  
+  # arc seconds degrees to radians = PI / 180.0 / ARCSEC
   # DTR         = PI / 180.0 / ARCSEC
-  # DTR         = 4.8481368110953599358991410235795e-6 # from calculator  
-  
-  # Length of tropical year B1900 (days) = 365.242198781 
+  # DTR         = 4.8481368110953599358991410235795e-6 # from calculator
+
+  # Length of tropical year B1900 (days) = 365.242198781
   # DTY         = 365.242198781
 
   # L_G = 1 - d(TT)/d(TCG) = 6.969290134e-10
   # ELG         = 6.969290134e-10
 
-  # L_B = 1 - d(TDB)/d(TCB)  = 1.550519768e-8 
-  # ELB         = 1.550519768e-8  
+  # L_B = 1 - d(TDB)/d(TCB)  = 1.550519768e-8
+  # ELB         = 1.550519768e-8
 
-  # max(A,B) - larger (most +ve) of two numbers (generic) 
+  # max(A,B) - larger (most +ve) of two numbers (generic)
   # gmax(A,B) = (((A)>(B))?(A):(B))
 
-  # min(A,B) - smaller (least +ve) of two numbers (generic) 
-  # gmin(A,B) = (((A)<(B))?(A):(B))  
+  # min(A,B) - smaller (least +ve) of two numbers (generic)
+  # gmin(A,B) = (((A)<(B))?(A):(B))
 
   # Reference epoch (J2000.0), Julian Date
-  # Default Julian Number = 2451545.0  
-  # J2000       = 2451545.0  
-  
+  # Default Julian Number = 2451545.0
+  # J2000       = 2451545.0
+
   # Julian Date of Modified Julian Date zero
-  # 1858, 11, 17, 0.0 midnight start of calendar reform = 2400000.5  
+  # 1858, 11, 17, 0.0 midnight start of calendar reform = 2400000.5
   # MJD0        = 2400000.5
-  
+
   # 2Pi from Math module = Math::PI * 2.0
   # P2          = PI * 2.0
 
   # from desktop calculator PI = 3.1415926535897932384626433832795
-  PI          = 3.1415926535897932384626433832795   
-  
+  PI          = 3.1415926535897932384626433832795
+
   # from desktop calculator R2D = 57.295779513082320876798154814105
   R2D         = 57.295779513082320876798154814105
-  
+
   # from desktop calculator RTD = 0.015915494309189533576888376337251
-  RTD         = 0.015915494309189533576888376337251 
-  
-  # from desktop calculator Sidereal minutes = 4.0 / 1.0027379093507953456536618754278
+  RTD         = 0.015915494309189533576888376337251
+
+  # from desktop calculator Sidereal minutes =
+  # 4.0 / 1.0027379093507953456536618754278
   SM          = 4.0 / 1.0027379093507953456536618754278
-  
-  # Schwarzschild radius of the Sun (au) = 2 * 1.32712440041e20 / (2.99792458e8)^2 / 1.49597870700e11 
+
+  # Schwarzschild radius of the Sun (au) =
+  # 2 * 1.32712440041e20 / (2.99792458e8)^2 / 1.49597870700e11
   # SRS         = 1.97412574336e-8
-  
+
   # TDB (s) at TAI 1977/1/1.0 = -6.55e-5
-  # TDB0        = -6.55e-5  
+  # TDB0        = -6.55e-5
 
   # TT minus TAI (s) = 32.184
   # TTMTAI      = 32.184
 
-  # Arcseconds in a full circle  = 1296000.0 
-  # TURNAS      = 1296000.0  
-  
+  # Arcseconds in a full circle  = 1296000.0
+  # TURNAS      = 1296000.0
 end
 
 if __FILE__ == $PROGRAM_NAME
@@ -164,4 +161,4 @@ if __FILE__ == $PROGRAM_NAME
   $LOAD_PATH.unshift(spec) unless $LOAD_PATH.include?(spec)
   require 'constants_spec'
 
-end
+end

data/lib/eot/deltas.rb

@@ -0,0 +1,40 @@
+# class Eot file = deltas.rb
+class Eot
+  # From deltas.rb:
+  # delta epsilon
+  # component of equation of equinox
+  def angle_delta_epsilon
+    Celes.nut06a(@ajd, 0)[1]
+  end
+  alias_method :delta_epsilon, :angle_delta_epsilon
+
+  # From deltas.rb:
+  # one time component to total equation of time
+  def angle_delta_oblique
+    al_sun - ra_sun
+  end
+  alias_method :delta_t_ecliptic, :angle_delta_oblique
+  alias_method :delta_oblique, :angle_delta_oblique
+
+  # From angles.rb:
+  # one time component to total equation of time
+  def angle_delta_orbit
+    -1.0 * eqc(@ma, @ta)
+  end
+  alias_method :delta_t_elliptic, :angle_delta_orbit
+  alias_method :delta_orbit, :angle_delta_orbit
+
+  # From angles.rb:
+  # component of equation of equinox
+  def angle_delta_psi
+    Celes.nut06a(@ajd, 0)[0]
+  end
+  alias_method :delta_psi, :angle_delta_psi
+
+  # From angles.rb:
+  # total equation of time
+  def angle_equation_of_time
+    delta_orbit + delta_oblique
+  end
+  alias_method :eot, :angle_equation_of_time
+end

data/lib/eot/geo_lat_lng_smt.rb

@@ -1,94 +1,67 @@
-# geo_lat_lng_smt.rb
-
-# require 'multi_xml'
-require 'rest-client'
-require 'json'
-
-  # class for location lookup 
-  # in geo_lat_lng_smt.rb 
+# class GeoLatLng file = geo_lat_lng_smt.rb
+# class for location lookup
+# in geo_lat_lng_smt.rb
 class GeoLatLng
-
   # Base address for Google maps api
-  attr_reader :base  
+  attr_reader :base_json
 
   # Default US set to PARCS
   attr_reader :default_us
-  
+
   # Default International set to GMT Museum
   attr_reader :default_int
-  
+
   # Address entered
   attr_accessor :addr
-  
+
   # Latitude returned
   attr_accessor :lat
-  
+
   # Longitude returned
   attr_accessor :lng
 
   # Instance variables
   def initialize
-       
-    @base           = "http://maps.googleapis.com/maps/api/geocode/json?address="
-    # @base           = "http://maps.googleapis.com/maps/api/geocode/xml?sensor=false&address="
-    @default_us     = "3333 Coyote Hill Road, Palo Alto, CA, 94304, USA"#do you copy? :D
-    @default_int    = "Blackheath Ave, London SE10 8XJ, UK"
+    @base_json      = 'http://maps.googleapis.com/maps/api/geocode/json?sensor=false&address='
+    @default_us     = '3333 Coyote Hill Road, Palo Alto, CA, 94304, USA'
+    @default_int    = 'Blackheath Ave, London SE10 8XJ, UK'
+    @addr           = @default_int
     @lat            = 0.0
     @lng            = 0.0
-    # MultiXml.parser = :rexml#:libxml#:ox # :nokogiri
-    @addr = @default_int
-    
-  end   
-
-  # set address  
-  #def addr=(addr = @default_int)
-  #  @addr = addr
-  #end  
+  end
 
-  # coordinates lookup   
-  def get_coordinates_from_address
-    addr         = URI.escape( @base + @addr )      
-    resrc        = RestClient.get( addr )     
-    parsed_resrc = JSON.parse(resrc)#MultiXml.parse( res )
-    #~ result     = parsed_res[ "GeocodeResponse" ][ "result" ]
-    results     = parsed_resrc["results"] 
-    #~ status     = parsed_res#[ "GeocodeResponse" ][ "status" ] 
-    status     = parsed_resrc[ "status" ] 
-    if status != "OK"      
-      @addr = @default_int      
-    else      	    
-      @lat   = results[0]["geometry"]["location"][ "lat" ].to_f
-      @lng  = results[0]["geometry"]["location"][ "lng" ].to_f
-      
+  # coordinates lookup
+  def set_coordinates
+    addr = Addressable::URI.escape(@base_json + @addr)
+    rest_resource = JSON.parse(RestClient.get(addr))
+    results       = rest_resource['results']
+    status        = rest_resource['status']
+    if status != 'OK'
+      @addr = @default_int
+    else
+      @lat   = results[0]['geometry']['location']['lat'].to_f
+      @lng  = results[0]['geometry']['location']['lng'].to_f
     end
-    
   end
-
 end
 
 if __FILE__ == $PROGRAM_NAME
-	
   lib = File.expand_path('../../../lib', __FILE__)
   $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-  
   require 'eot'
   eot = Eot.new
   p eot.addr
   p eot.latitude
   p eot.longitude
-  geo = GeoLatLng.new()
+  geo = GeoLatLng.new
   p geo.addr
   p geo.lat
   p geo.lng
-  geo.get_coordinates_from_address()
+  geo.get_coordinates
   p geo.lat
   p geo.lng
-  #~ gem 'minitest'
-  #~ require 'minitest/autorun'
-  #~ spec = File.expand_path('../../../test/', __FILE__)
-  #~ $LOAD_PATH.unshift(spec) unless $LOAD_PATH.include?(spec)
-  #~ require 'geo_spec'
-  system 'rake test'
-  
+  spec = File.expand_path('../../../test/eot', __FILE__)
+  $LOAD_PATH.unshift(spec) unless $LOAD_PATH.include?(spec)
+  require 'geo_spec'
+  system 'bundle exec ruby ~/workspace/equationoftime/test/eot/geo_spec.rb'
 end
-

data/lib/eot/init.rb

@@ -1,124 +1,86 @@
-# init.rb
-
-require 'celes'
-
-require_relative 'geo_lat_lng_smt'
-require_relative 'times'
-
-class Eot
-      
-
-  # From init.rb:  
-  # address used for GeoLatLng.addr
-  attr_accessor :addr
-  
-  # From init.rb:  
-  # Astronomical Julian Day Number is an instance of DateTime class.
-  # When new Equation of Time class is initialized 
-  # @ajd = DateTime.now.to_time.utc.to_datetime.jd.to_f
-  attr_accessor :ajd
-  
-  # Method for change of @ajd from the default so @ma and @ta will get set anew.
-  # Calling ma_Sun method will set @ta so be sure to not set @ma directly.
-  # use this method for dates you want to get data for. EX: @ajd = Date.parse("YY-MM-DD").jd
-  # Generally use jd if you want suntimes and ajd if you want current times as ajd in 
-  # DateTime class will include the dayfraction which is basically just the time.
-  def ajd=(ajd)
-    @ajd = ajd.to_f
-    @ta = (( @ajd - DJ00 ) / DJC).to_f
-    @ma = Celes.falp03(@ta)
-  end
-
-  # From init.rb:  
-  # Nutation Data is an instance of Array class.
-  # @data = nutation_table5_3a.yaml 
-  # YAML File loaded when new Eot class is initialized.
-  #attr_reader :data  
-
-  # From init.rb:  
-  # @date is an instance of DateTime class.  
-  # When new Eot class is initialized @date = 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
-  attr_accessor :jd
-
-  # From init.rb:  
-  # Latitude input is an instance of Float class.
-  # When new Eot class is initialized @latitude = 0.0
-  # May use GeoLatLng class to set it also but please comment that out  
-  # if no internet connection is present via proxies or firewalls :D  
-  attr_accessor :latitude
-  
-  # From init.rb:  
-  # Longitude input is an instance of Float class.
-  # When new Eot class is initialized @longitude = 0.0
-  # May use GeoLatLng class to set it also but please comment that out 
-  # if no internet connection is present via proxies or firewalls :D   
-  attr_accessor :longitude
-
-  # From init.rb:  
-  # Mean Anomaly gets called a lot so class attribute saves it.
-  # @ma = Celes.falp03(@ta) 
-  attr_accessor :ma
-  
-
-  # 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  
-  attr_accessor :ta
-      
-  # From init.rb:  
-  # Initialize to set attributes 
-  # You may use GeoLatLng to set up @latitude and @longitude but you need to have
-  # internet so if not please comment it out for now.    
-  def initialize()
-
-    # file_path     = File.expand_path( File.dirname( __FILE__ ) + "/nutation_table5_3a.yaml" )
-    # @data         = YAML::load( File.open( file_path, 'r'), :safe => true  ).freeze
- 
-    # set all date and time from this attribute
-    @ajd = DateTime.now.to_time.utc.to_datetime.jd.to_f
-    @jd = @ajd
-    @date = ajd_to_datetime(@ajd) 
-    @ta = (( @ajd - DJ00 ) / DJC).to_f
-    @ma = Celes.falp03(@ta)                                      
-    
-    # comment out below if you do not have internet connection
-    geo = GeoLatLng.new()      
-    geo.get_coordinates_from_address
-    @addr = geo.addr
-    @latitude = geo.lat
-    @longitude = geo.lng
-  end
-  
-end
-
-
-# we can run some tests from inside this file.
-if __FILE__ == $PROGRAM_NAME
-
-  lib = File.expand_path('../../../lib', __FILE__)
-  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-  require 'eot'
-  eot = Eot.new
-
-  # p eot.ajd
-  p eot.date
-  p eot.jd
-
-  p eot.ma
-  p eot.ta
-  p eot.addr
-  p eot.latitude
-  p eot.longitude
-  
-  #~ spec = File.expand_path('../../../tests/minitest', __FILE__)
-  #~ $LOAD_PATH.unshift(spec) unless $LOAD_PATH.include?(spec)
-  #~ require 'init_spec'
-  system 'rake test'
-
-end
+# class Eot file = int.rb
+class Eot
+  # From init.rb:
+  # address used for GeoLatLng.addr
+  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
+  def ajd=(ajd)
+    @ajd = ajd
+    @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)
+  attr_accessor :date
+
+  # From init.rb:
+  # Julian Day Number is an instance of DateTime class.
+  # When new Eot class is initialized @jd = @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.
+  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.
+  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
+  attr_accessor :ta
+
+  # From init.rb:
+  # Mean Anomaly gets called a lot so class attribute saves it.
+  # @ma = Celes.falp03(@ta)
+  attr_accessor :ma
+
+  # From init.rb:
+  # Initialize to set attributes
+  # You may use GeoLatLng to set up @latitude and @longitude
+  def initialize
+    require_relative 'geo_lat_lng_smt'
+    @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
+  end
+end
+
+# we can run some tests from inside this file.
+if __FILE__ == $PROGRAM_NAME
+  lib = File.expand_path('../../../lib', __FILE__)
+  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+  require 'eot'
+  eot = Eot.new
+  p eot.ajd
+  p eot.date
+  p eot.jd
+  p eot.ma
+  p eot.ta
+  p eot.addr
+  p eot.latitude
+  p eot.longitude
+  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'
+end