equationoftime 3.0.0 → 4.0.0

data/lib/eot/constants.rb

@@ -1,12 +1,11 @@
 # constants.rb
+
 require 'date'
 
 class Eot
-
-  include Math
   
   # 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] 
+  # A2000       = [0.0, 0.0, 0.0, 0.0, 0.0] 
 
   # Arc seconds in a degree = 3_600.0  
   ARCSEC      = 3_600.0
@@ -15,25 +14,25 @@ class Eot
   ASD         = 3_600.0
   
   # Arc seconds in an hour = 240.0
-  ASH         = 240.0
+  # ASH         = 240.0
   
   # Light time for 1 au (s) = 499.004782
-  AULT        = 499.004782
+  # AULT        = 499.004782
 
   # Speed of light (m/s) = 299792458.0
-  CMPS        = 299792458.0  
+  # CMPS        = 299792458.0  
 
   # Default date string = "2000-01-01"  
-  D2000       = "2000-01-01"
+  # D2000       = "2000-01-01"
 
   # 2Pi = 6.283185307179586476925287 
-  D2PI        = 6.283185307179586476925287  
+  # D2PI        = 6.283185307179586476925287  
 
-  # Arcseconds to radians = 4.848136811095359935899141e-6 
-  DAS2R       = 4.848136811095359935899141e-6
+  # 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 
@@ -51,10 +50,10 @@ class Eot
   DAY_USECS   = 86_400_000_000.0
   
   # Speed of light (AU per day) = DAYSEC / AULT
-  DC = DAYSEC / AULT
+  # DC = DAYSEC / AULT
   
-  # Degrees to radians = 1.745329251994329576923691e-2 
-  DD2R        = 1.745329251994329576923691e-2
+  # from desktop calculator D2R = 0.017453292519943295769236907684886
+  D2R          = 0.017453292519943295769236907684886
   
   # dint(A) - truncate to nearest whole number towards zero (double) 
   # dint(A) = ((A)<0.0?ceil(A):floor(A))
@@ -73,51 +72,46 @@ class Eot
   DJC         = 36525.0
   
   # Days per Julian millennium  = 365250.0
-  DJM         = 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  
-  DJM00       = 51544.5
+  # DJM00       = 51544.5
 
   # 1977 Jan 1.0 as MJD = 43144.0  
-  DJM77       = 43144.0  
+  # DJM77       = 43144.0  
   
   # Days per Julian year = 365.25 
-  DJY         = 365.25
+  # DJY         = 365.25
   
   # Milli-arc-seconds to radians  = DAS2R / 1e3
-  DMAS2R      = DAS2R / 1e3
-
-  # Pi = 3.141592653589793238462643 
-  DPI         = 3.141592653589793238462643
+  # DMAS2R      = DAS2R / 1e3
   
   # Radians to arc seconds = 206264.8062470963551564734 
-  DR2AS       = 206264.8062470963551564734
-  
-  # Radians to degrees = 57.29577951308232087679815 
-  DR2D        = 57.29577951308232087679815  
+  # DR2AS       = 206264.8062470963551564734    
   
   # Seconds of time to radians = 7.272205216643039903848712e-5 
-  DS2R        = 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" )    
 
   # arc seconds degrees to radians = PI / 180.0 / ARCSEC  
-  DTR         = PI / 180.0 / ARCSEC    
+  # DTR         = PI / 180.0 / ARCSEC
+  # DTR         = 4.8481368110953599358991410235795e-6 # from calculator  
   
   # Length of tropical year B1900 (days) = 365.242198781 
-  DTY         = 365.242198781
+  # DTY         = 365.242198781
 
   # L_G = 1 - d(TT)/d(TCG) = 6.969290134e-10
-  ELG         = 6.969290134e-10
+  # ELG         = 6.969290134e-10
 
   # L_B = 1 - d(TDB)/d(TCB)  = 1.550519768e-8 
-  ELB         = 1.550519768e-8  
+  # ELB         = 1.550519768e-8  
 
   # max(A,B) - larger (most +ve) of two numbers (generic) 
   # gmax(A,B) = (((A)>(B))?(A):(B))
@@ -127,35 +121,38 @@ class Eot
 
   # Reference epoch (J2000.0), Julian Date
   # Default Julian Number = 2451545.0  
-  J2000       = 2451545.0  
+  # J2000       = 2451545.0  
   
   # 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
   
   # 2Pi from Math module = Math::PI * 2.0
-  P2          = PI * 2.0
+  # P2          = PI * 2.0
 
-  # pi from Math module = Math::PI
-  PI  
+  # from desktop calculator PI = 3.1415926535897932384626433832795
+  PI          = 3.1415926535897932384626433832795   
+  
+  # from desktop calculator R2D = 57.295779513082320876798154814105
+  R2D         = 57.295779513082320876798154814105
   
-  # arc seconds radians to degrees = 180.0 / PI * ARCSEC    
-  RTD         = 180.0 / PI * ARCSEC
+  # from desktop calculator RTD = 0.015915494309189533576888376337251
+  RTD         = 0.015915494309189533576888376337251 
   
-  # Sidereal minutes = 4.0 / 1.0027379093507953456536618754278
+  # 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 
-  SRS         = 1.97412574336e-8
+  # 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
+  # TTMTAI      = 32.184
 
   # Arcseconds in a full circle  = 1296000.0 
-  TURNAS      = 1296000.0  
+  # TURNAS      = 1296000.0  
   
 end
 

data/lib/eot/displays.rb

@@ -4,26 +4,29 @@ class Eot
 
   # From displays.rb<br>
   # String formatter for d:m:s display 
-  def degrees_to_s( degrees = 0.0 )
-    degrees.nil? ? degrees = 0.0 : degrees
-    degrees < 0 ? sign_string      = "-" : sign_string = "+"    
-                  absolute_degrees = degrees.abs
+  def degrees_to_s( radians = 0.0 )
+    radians.nil? ? radians = 0.0 : radians
+    radians < 0 ? sign_string      = "-" : sign_string = "+"    
+                  absolute_degrees = radians.abs * R2D
           absolute_degrees_integer = Integer( absolute_degrees )
           absolute_decimal_minutes = 60.0 * 
                                      (
                                       absolute_degrees - 
                                       absolute_degrees_integer
                                      )
+                                     
           absolute_minutes_integer = Integer( absolute_decimal_minutes )
-          absolute_decimal_seconds = bd( 60.0 * 
-                                        (
-                                         absolute_decimal_minutes - 
-                                         absolute_minutes_integer
-                                        )
-                                       )
+          
+          absolute_decimal_seconds = 60.0 * 
+                                     (
+                                      absolute_decimal_minutes - 
+                                      absolute_minutes_integer
+                                      )
+                                      
           absolute_seconds_integer = Integer( absolute_decimal_seconds )
+          
     absolute_milli_seconds_integer = Integer(1000.0 *
-	                                         (
+	                                           (  
                                               absolute_decimal_seconds - 
                                               absolute_seconds_integer
                                              )
@@ -60,8 +63,8 @@ class Eot
   
   # From displays.rb<br>
   # String format of apparent longitude 
-  def string_al_Sun( ta = A2000 )
-    degrees_to_s( al_Sun( ta ) )
+  def string_al_Sun()
+    degrees_to_s( al_Sun() )
   end
   alias_method :apparent_longitude_string, :string_al_Sun
 
@@ -83,27 +86,27 @@ class Eot
 
   # From displays.rb<br>
   # String format of declination 
-  def string_dec_Sun( ta = A2000 )
-    degrees_to_s( dec_Sun( ta ) )
+  def string_dec_Sun()
+    degrees_to_s( dec_Sun() )
   end
   alias_method :declination_string, :string_dec_Sun
   
   # From displays.rb<br>
   # String format for delta oblique
-  def string_delta_oblique( ta = A2000 )
-    show_minutes(delta_oblique( ta ))
+  def string_delta_oblique()
+    show_minutes(delta_oblique())
   end
   
   # From displays.rb<br>
   # String format for delta orbit
-  def string_delta_orbit( ta = A2000 )
-    show_minutes(delta_orbit( ta ))
+  def string_delta_orbit()
+    show_minutes(delta_orbit())
   end
   
   # From displays.rb<br>
   # String format for centre
-  def string_eqc( ta = A2000 )
-    degrees_to_s( center( ta ))
+  def string_eqc()
+    degrees_to_s( center())
   end
   
   # From displays.rb<br>
@@ -129,7 +132,7 @@ class Eot
   
   # From displays.rb<br>
   # String format conversion of jd to date
-  def string_jd_to_date( jd = J2000 )
+  def string_jd_to_date( jd = DJ00 )
     jd = check_jd_zero( jd )
     Date.jd( jd ).to_s
   end 
@@ -144,15 +147,15 @@ class Eot
 
   # From displays.rb<br>
   # String format of right ascension
-  def string_ra_Sun( ta = A2000 )
-    degrees_to_s( ra_Sun( ta ) )
+  def string_ra_Sun()
+    degrees_to_s( ra_Sun() )
   end
   alias_method :right_ascension_string, :string_ra_Sun     
 
   # From displays.rb<br>
   # String format of true anomaly  
-  def string_ta_Sun( ta = A2000 )
-    degrees_to_s( ta_Sun( ta ) )
+  def string_ta_Sun( )
+    degrees_to_s( ta_Sun() )
   end
   alias_method :true_anomaly_string, :string_ta_Sun
 
@@ -168,13 +171,13 @@ class Eot
       intsecs = Integer( seconds )
       decsecs = Integer(( seconds - intsecs ).round( 3 ) * 1000.0 )
     else
-      decimal = dt % DAY_HOURS
-      hours = Integer( decimal )
-      mindecimal = bd( 60.0 * ( decimal - hours )) * 1.0
-      minutes = Integer( mindecimal )
-      seconds = bd( 60.0 * ( mindecimal - minutes )) * 1.0    
-      intsecs = Integer( seconds )
-      decsecs = Integer(( seconds - intsecs ).round( 3 ) * 1000.0 )
+      decimal    = dt % DAY_HOURS
+      hours      = Integer( decimal )
+      mindecimal = 60.0 * ( decimal - hours )
+      minutes    = Integer( mindecimal )
+      seconds    = 60.0 * ( mindecimal - minutes )    
+      intsecs    = Integer( seconds )
+      decsecs    = Integer(( seconds - intsecs ).round( 3 ) * 1000.0 )
     end
     
     "%02d" % hours   +
@@ -189,15 +192,15 @@ class Eot
 
   # From displays.rb<br>
   # String format of true longitude 
-  def string_tl_Sun( ta = A2000 )
-    degrees_to_s( tl_Sun( ta ) )
+  def string_tl_Sun()
+    degrees_to_s( tl_Sun() )
   end
   alias_method :true_longitude_string, :string_tl_Sun 
 
   # From displays.rb<br>
   # String format of true obliquity 
-  def string_to_Earth( ta = A2000 )
-    degrees_to_s( to_Earth( ta ) )
+  def string_to_Earth()
+    degrees_to_s( to_Earth() )
   end
   alias_method :true_obliquity_string, :string_to_Earth 
 

data/lib/eot/geo_lat_lng_smt.rb

@@ -8,7 +8,7 @@ require 'rest-client'
 class GeoLatLng
 
   # Base address for Google maps api
-  attr_reader :base
+  attr_reader :base  
 
   # Default US set to PARCS
   attr_reader :default_us
@@ -37,7 +37,8 @@ class GeoLatLng
     @lat            = 0.0
     @lng            = 0.0
     MultiXml.parser = :rexml#:libxml#:ox # :nokogiri
-  
+    @addr           = @default_int
+    
   end   
 
   # set address  
@@ -56,13 +57,13 @@ class GeoLatLng
     result     = parsed_res[ "GeocodeResponse" ][ "result" ]
     status     = parsed_res[ "GeocodeResponse" ][ "status" ] 
     if status != "OK"      
-      @default      
+      @default_int      
     else      
       if result.count != 4          
-        @default          
+        @default_int          
       else
-        @lat   = parsed_res[ "GeocodeResponse" ][ "result" ][ "geometry" ][ "location" ][ "lat" ]
-        @lng   = parsed_res[ "GeocodeResponse" ][ "result" ][ "geometry" ][ "location" ][ "lng" ]
+        @lat   = parsed_res[ "GeocodeResponse" ][ "result" ][ "geometry" ][ "location" ][ "lat" ].to_f
+        @lng   = parsed_res[ "GeocodeResponse" ][ "result" ][ "geometry" ][ "location" ][ "lng" ].to_f
       end
     end
     

data/lib/eot/init.rb

@@ -1,76 +1,91 @@
 # init.rb
 
-class Eot    
+require 'celes'
+require_relative 'geo_lat_lng_smt'
+require_relative 'times'
 
+class Eot
+      
+
+  # From init.rb:<br>
+  # address used for GeoLatLng.addr
+  attr_accessor :addr
+  
   # From init.rb:<br>
-  # Astronomical Julian Day Number is an instance of Date class.
-  # When new Equation of Time class is initialized @ajd = jd = today DateTime.jd
-  # Used for getting the equation of time now if it is set for that. There is 
-  # always a slight delay in the computation though.
+  # Astronomical Julian Day Number is an instance of DateTime class.
+  # When new Equation of Time class is initialized @ajd = DateTime.jd
   attr_accessor :ajd
+  
+  # Method for change of @ajd from the default so @ma will get set anew.
+  # Calling ma_Sun method will set @ta so be sure to not set @ma directly.
+  def ajd=(ajd)
+    @ajd = ajd.to_f
+    @ta = (( @ajd - DJ00 ) / DJC).to_f
+    @ma = Celes.falp03(@ta)
+  end
 
   # From init.rb:<br>
   # 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  
+  #attr_reader :data  
 
   # From init.rb:<br>
-  # @date is an instance of Date class.  
-  # When new Eot class is initialized @date = today  
+  # @date is an instance of DateTime class.  
+  # When new Eot class is initialized @date = now UTC  
   attr_accessor :date
 
   # From init.rb:<br>
-  # Julian Day Number is an instance of Date class.
-  # When new Eot class is initialized @jd = jd today  
+  # Julian Day Number is an instance of DateTime class.
+  # When new Eot class is initialized @jd = DateTime.jd  
   attr_accessor :jd
 
   # From init.rb:<br>
   # 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 is commented out or will fail if no 
-  # internet connection is present.  
+  # 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:<br>
   # 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 is commented out or will fail if no 
-  # internet connection is present.  
+  # 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:<br>
-  # Mean Anomaly gets called a lot so attribute accessor saves time 
+  # Mean Anomaly gets called a lot so class attribute saves it. 
   attr_accessor :ma
+  
 
   # From init.rb:<br>
-  # address used for GeoLatLng.addr when used.(commented out) 
-  attr_accessor :addr
-
+  # JCT gets called a lot so class attribute it.
+  # Setting @ajd or @ma will set this  
+  attr_accessor :ta
       
   # From init.rb:<br>
-  # Initialize loads nutation data with safe_yaml and is frozen, atrributes are set.
+  # Initialize to set attributes 
   # You may use GeoLatLng to set up @latitude and @longitude but you need to have
-  # internet so that is commented out for now.    
+  # internet so if not please comment it out for now.    
   def initialize(addr=nil)
 
-    file_path     = File.expand_path( File.dirname( __FILE__ ) + "/nutation_table5_3a.yaml" )
-    @data         = YAML::load( File.open( file_path, 'r'), :safe => true  ).freeze
+    # file_path     = File.expand_path( File.dirname( __FILE__ ) + "/nutation_table5_3a.yaml" )
+    # @data         = YAML::load( File.open( file_path, 'r'), :safe => true  ).freeze
  
-    @ajd.nil? ? @ajd = DateTime.now.to_time.utc.to_datetime.jd.to_f : @ajd = self.ajd      
-    @date.nil? ? @date = DateTime.now.to_time.utc.to_date : @date = self.date
-    @jd.nil? ? @jd  = DateTime.now.to_time.utc.to_datetime.jd.to_f : @jd = self.jd
-    @latitude.nil? ? @latitude = 0.0 : @latitude = self.latitude
-    @longitude.nil? ? @longitude = 0.0 : @longitude = self.longitude    
-    @ma.nil? ? @ma = ma_Sun() : @ma
-
-    #geo = GeoLatLng.new
-    @addr = addr
-    #addr.nil? ? geo.addr=(geo.default_int) : geo.addr=addr
-# uncomment below if you have internet connection
-    #geo.get_coordinates_from_address
-    #@latitude = geo.lat.to_f
-    #@longitude = geo.lng.to_f
+    # 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()   
+    @addr = geo.addr           
+    geo.get_coordinates_from_address
+    @latitude.nil?  ? @latitude = geo.lat : @latitude
+    @longitude.nil? ? @longitude = geo.lng : @longitude
   end
   
 end
@@ -80,12 +95,20 @@ end
 if __FILE__ == $PROGRAM_NAME
 
   lib = File.expand_path('../../../lib', __FILE__)
-  puts "Loading gem from #{lib}/eot.rb"
   $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
   require 'eot'
-  e = Eot.new
-  p e.date
+  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'