equationoftime 4.1.5 → 4.1.6

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 3548bdc8e0b497b9d4db22274c1cba9c31f2705f
-  data.tar.gz: 7a7045370ba55b1f21c143514a52d1ba4b7a928a
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWNhMGU3ZGYzZWY3YjAxMzNmMTI5ZjY5YWQxY2VjNjRjNTc5ODRlMw==
+  data.tar.gz: !binary |-
+    ZTIwMDE4ODE3NGYyNmMyZjFkOGIzMGFkZTY0MGRkNGUwMmUyY2IwMw==
 SHA512:
-  metadata.gz: cb8d7bbd702b98551b247b0574e9cf3ec1cc08f209f9ffc0d65f07a5dad6ec69bbc4ccfe6c746870d1f9959fd1cb316180f4834e09b628710e6d1ebb00c91953
-  data.tar.gz: 67c10e32092d3cbb9441c0052580eb58a573199ddcafeac4bf05ed185366a8273eb2c11f69366c411488f5f5fbb09d78a502ad1f7c623b2b337ff7027bff8039
+  metadata.gz: !binary |-
+    YjZjMjU5NjBkMjcyMzRiYTcwM2FmYmI5ZGYwYjY2MzA0MmI3MjVjN2FhYzU3
+    NzM2MjFjN2M3ZGNhNGQ2YWEwZmVlZTBiYzU3NTgwZDJhODg5NzA5ODUwZDhm
+    Yzc4MjQzMDZmNWYzMGMzZWUwMmY4MjgyZjdjYmE2OWQ0OGY2MDc=
+  data.tar.gz: !binary |-
+    MjYxODJkODNhYzBjYjMyYjk2YzU2NzE3MzNhNzQ4NWY3NTc2Njk3NzFlN2Iz
+    ZTZjZjZiNDY0MjNmYmExZTE0ZDg3OGRiNjcwYzA4YmEzOGVhNDRhMjFlZmU1
+    MzYwYzQxMTA3MTlhNTM4ZGU2OGY4NTZiNDE0OWJhYzQzYWU5ODg=

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+1.9.3

data/Gemfile

@@ -1,9 +1,15 @@
 source 'https://rubygems.org'
-ruby '2.1.2'
+ruby '1.9.3'
+# ruby '2.0.0'
+# ruby '2.1.0'
+# ruby '2.1.1'
+# ruby '2.1.2'
+# ruby '2.1.3'
+# ruby '2.1.4'
 
 gemspec
 
-group :development do
+group :development, :test do
   gem 'rubocop'
   gem 'hoe'
   gem 'rake'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    equationoftime (4.1.5)
+    equationoftime (4.1.6)
       addressable (~> 2.3.6)
       celes (~> 0.0.1)
       rest-client
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ZenTest (4.10.1)
+    ZenTest (4.11.0)
     addressable (2.3.6)
     ast (2.0.0)
     astrolabe (1.3.0)
@@ -19,9 +19,9 @@ GEM
       timers (~> 4.0.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
-    ffi (1.9.3)
+    ffi (1.9.6)
     formatador (0.2.5)
-    guard (2.6.1)
+    guard (2.8.1)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
@@ -31,19 +31,19 @@ GEM
       guard (~> 2.0)
       minitest (>= 3.0)
     hitimes (1.2.2)
-    hoe (3.12.0)
+    hoe (3.13.0)
       rake (>= 0.8, < 11.0)
     json (1.8.1)
-    listen (2.7.9)
+    listen (2.7.11)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
     method_source (0.8.2)
-    mime-types (2.3)
-    minitest (5.4.1)
-    netrc (0.7.7)
-    parser (2.2.0.pre.4)
+    mime-types (2.4.3)
+    minitest (5.4.2)
+    netrc (0.8.0)
+    parser (2.2.0.pre.7)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
@@ -67,26 +67,26 @@ GEM
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
       rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.2)
+    rspec-core (3.1.7)
       rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.0)
+    rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.0)
+    rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
-    rspec-support (3.1.0)
-    rubocop (0.26.1)
+    rspec-support (3.1.2)
+    rubocop (0.27.0)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.pre.4, < 3.0)
+      parser (>= 2.2.0.pre.6, < 3.0)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.6.0)
+    ruby-progressbar (1.7.0)
     slop (3.6.0)
     thor (0.19.1)
     timers (4.0.1)
       hitimes
-    yard (0.8.7.4)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby

data/Manifest.txt

@@ -1,9 +1,12 @@
 .autotest
 .buildpath
+.git
 .minitest.rb
 .project
+.settings
 .rspec
 .ruby-version
+.yardoc
 CHANGELOG.rdoc
 Gemfile
 Gemfile.lock
@@ -14,7 +17,7 @@ Manifest.txt
 README.rdoc
 Rakefile
 equationoftime.gemspec
-examples/Equation_of_Time.jpg
+examples/Equation_of_Time.png
 examples/my_lst.rb
 examples/use_addr.rb
 examples/use_ajd.rb
@@ -44,5 +47,6 @@ test/eot/displays_spec.rb
 test/eot/geo_spec.rb
 test/eot/init_spec.rb
 test/eot/times_spec.rb
+run_tests_eclipse.rb
 wiki.md
 wiki2.md

data/README.rdoc

@@ -2,7 +2,7 @@
 
 Home    :: http://equationoftime.herokuapp.com/
 Code    :: https://github.com/DouglasAllen/equationoftime
-RDoc    :: http://rubydoc.info/gems/equationoftime/4.1.2/frames
+RDoc    :: http://rubydoc.info/gems/equationoftime/4.1.5/frames
 Issues  :: https://github.com/DouglasAllen/equationoftime/issues
 
 
@@ -22,36 +22,59 @@ Lots of examples to play with for learning about Eot.
         require 'eot'
         eot = Eot.new
         eot.string_eot          # todays eot
-        eot.addr                # what is the location
-        eot.addr = "huston, tx" #changed location
+        eot.ajd                 # was initialized to noon today ei. jd
+        # Try the real AJD
+        eot.ajd = DateTime.now.to_time.utc.to_datetime.ajd.to_f
+
+        eot.string_eot          # nothing changes so...
+        eot.ma_ta_set           # recalculate ma and ta after initialization
+        eot.string_eot          # should be different than before
+
+        # check and set a new address                        
         geo = GeoLatLng.new
-        geo.addr = eot.addr     # set new location
-        geo.set_coordinates     # set new coordinates
-        eot.sunrise_jd          # todays sunrise as a jd
-        eot.sunset_jd           # todays sunset as a jd
-        eot.sunrise_dt          # todays sunrise as DateTime
-        eot.sunset_dt           # todays sunset as a DateTime
-        eot.ajd += 1            # tommorrow times can be read
+        geo.addr
+        geo.addr = "houston, tx"     # set new location
+        geo.set_coordinates          # set new coordinates
+        eot.latitude = geo.lat       # set the Eot class attributes
+        eot.longitude = geo.lng
+
+        # Be shure you have the date set right
+        eot.ajd = DateTime.new(2014,11,07).to_time.utc.to_datetime.jd.to_f
+
+        eot.ma_ta_set           # recalculate ma and ta after initialization
+
+        eot.sunrise_jd          # the dates sunrise as a jd
+        eot.sunset_jd           # the dates sunset as a jd
+        eot.sunrise_dt          # the dates sunrise as DateTime
+        eot.sunset_dt           # the dates sunset as a DateTime
+
+
+        eot.ajd += 1            # the days after times can be read
+        eot.ma_ta_set           # recalculate ma and ta after initialization 
         eot.ajd = 2451545       # ajd set to 2001-01-01 12:00 
         
 
+== Gem patch:
+
+  $ gem install eot
+
+After realizing this name was available I decided to use it.
+It installs the needed requirements as for some reason
+gem install equationoftime doesn't always. Hoe hoe hoe!
+
 == REQUIREMENTS:
 
-* bundle install
+  $ bundle install
 
 == INSTALL:
 
-* rake install
+  $ bundle exec rake install
 
 == DEVELOPERS:
 
 After checking out the source, run:
 
-  $ rake newb
-
-Or use patch to install as gem
-
-  $ gem install eot
+  $ bundle exec rake newb
 
 This task will install any missing dependencies, run the tests/specs,
 and generate the RDoc.

data/Rakefile

@@ -7,11 +7,11 @@ require 'rake/testtask'
 require 'rdoc/task'
 require 'rspec/core/rake_task'
 require 'yard'
-# rake release VERSION=4.1.5
+# rake release VERSION=4.1.6
 Hoe.spec 'equationoftime' do
   developer('Douglas Allen', 'kb9agt@gmail.com')
   license('MIT')
-  self.version = '4.1.5'
+  #self.version = '4.1.6'
   self.readme_file   = 'README.rdoc'
   self.history_file  = 'CHANGELOG.rdoc'
   self.extra_rdoc_files  = FileList['*.rdoc']
@@ -49,7 +49,7 @@ Rake::RDocTask.new(:rdox) do |rd|
 
   rd.rdoc_dir = 'rdocs'
 
-  rd.rdoc_files.include 'lib/**/*.rb', 'README.md', 'wiki.md'
+  rd.rdoc_files.include 'lib/**/*.rb', 'README.rdoc', 'wiki.md'
 
   rd.options << '--line-numbers'
 

data/examples/my_lst.rb

@@ -3,7 +3,9 @@ eot = Eot.new
 puts 'My Local Apparent Sidereal Time'
 loop do
   eot.ajd = DateTime.now.to_time.utc.to_datetime.ajd
-  puts "LST = #{ eot.string_time(((eot.tl_aries * Eot::R2D) + -88.75) / 15.0) }"
+  gst = eot.string_deg_to_time(eot.tl_aries - -88.75 * Eot::D2R)
+  era = eot.string_deg_to_time(eot.era - -88.75 * Eot::D2R)
+  puts "LST gst #{gst} LST era #{era}" 
   # the number is syncing my machine. machine may vary in this.
   sleep 0.99613381875
 end

data/ext/eot/ceot.c

@@ -21,9 +21,7 @@ double eoe(double t)
   double e;
 
   /* Eccentricity of Earth orbit */
-  e = (0.016708617   +
-       t * (-0.000042037 +
-       t * -0.0000001235));
+  e = (0.016708617 + t * (-0.000042037 + t *  -0.0000001235));
 
   return e; 
 }
@@ -72,6 +70,11 @@ double alSun(double ma, double t, double o)
   return a;
 }
 
+double raSun(double y0, double cos_al_Sun)
+{
+  return atan2(-y0, -cos_al_Sun);
+}
+
 double cosZ(double zenith)
 {
 
@@ -107,7 +110,7 @@ double cos_lat(double lat)
 
   double ca;
 
-  ca = cos(lat);
+  ca = cos(lat * 0.017453292519943295769236907684886);
 
   return ca;
 }                                   
@@ -157,7 +160,7 @@ double sin_lat(double lat)
 
   double sa;
 
-  sa = sin(lat);
+  sa = sin(lat * 0.017453292519943295769236907684886);
 
   return sa;
 }                                   
@@ -182,4 +185,26 @@ double sin_to_earth(double to_earth)
   return sa;
 } 
 
-                                                        
+double sun(double zenith, double dec_sun, double lat)
+{
+  double cos1 = cosZ(zenith);
+  double sin2 = sin_dec_sun(dec_sun);
+  double sin3 = sin_lat(lat);
+  double cos2 = cos_dec_sun(dec_sun);
+  double cos3 = cos_lat(lat);
+  double top  = cos1 - sin2 * sin3;
+  double bot  = cos2 * cos3;
+  double ca   = top / bot;
+  double c;
+  c = (ca > 1.0 || ca < -1.0) ? 1.0: ca;    
+  return acos(c);
+}
+
+double sun_dec(double al_sun, double to_earth) 
+{
+  double sin1 = sin_to_earth(to_earth);
+  double sin2 = sin_al_sun(al_sun);
+  double a   = asin(sin1 * sin2);
+  return a;
+}
+//                                                       

data/ext/eot/ceot.h

@@ -5,6 +5,7 @@ double eoe(double t);
 double eqc(double ma, double t);
 double tlSun(double ma, double t);
 double alSun(double ma, double t, double o);
+double raSun(double y0, double cos_al_Sun);
 double cosZ(double zenith);
 double cos_al_sun(double al_sun);
 double cos_tl_sun(double tl_sun);
@@ -16,3 +17,6 @@ double sin_dec_sun(double dec_sun);
 double cos_dec_sun(double dec_sun);
 double sin_lat(double lat);
 double cos_lat(double lat);
+double sun_dec(double al_sun, double to_earth);
+double sun(double zenith, double dec_sun, double lat);
+

data/ext/eot/eot.c

@@ -87,6 +87,21 @@ VALUE func_cos_lat(VALUE klass, VALUE vlat) {
   return DBL2NUM(cos_lat(NUM2DBL(vlat)));
 }
 
+VALUE func_sun(VALUE klass, VALUE vz, VALUE vds, VALUE vlat) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(sun(NUM2DBL(vz), NUM2DBL(vds), NUM2DBL(vlat)));
+}
+
+VALUE func_sun_dec(VALUE klass, VALUE vals, VALUE vtoe) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(sun_dec(NUM2DBL(vals), NUM2DBL(vtoe)));
+}
+
+VALUE func_sun_ra(VALUE klass, VALUE vy0, VALUE vcas) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(raSun(NUM2DBL(vy0), NUM2DBL(vcas)));
+}
+
 VALUE cEot;
 void
 Init_eot(void) {
@@ -109,4 +124,8 @@ Init_eot(void) {
   rb_define_method(cEot, "sin_dec_sun", func_sin_dec_sun, 1);
   rb_define_method(cEot, "cos_lat", func_cos_lat, 1);
   rb_define_method(cEot, "sin_lat", func_sin_lat, 1);
+  rb_define_method(cEot, "sun_dec", func_sun_dec, 2);
+  rb_define_method(cEot, "sun", func_sun, 3);
+  rb_define_method(cEot, "sun_ra", func_sun_ra, 2);
+  
 }

data/lib/eot.rb

@@ -1,19 +1,21 @@
 # eot.rb
 # require 'multi_xml'
 require 'addressable/uri'
-require 'rest-client'
-require 'json'
 require 'celes'
 require 'date'
-require 'eot/version'
-require 'eot/eot'
-require 'eot/constants'
-require 'eot/init'
-require 'eot/utilities'
+require 'json'
+require 'rest-client'
 require 'eot/angles'
+require 'eot/angle_displays'
+require 'eot/constants'
 require 'eot/deltas'
-require 'eot/trigonometric'
+require 'eot/delta_times'
+require 'eot/eot'
+require 'eot/geo_lat_lng_smt'
+require 'eot/init'
+require 'eot/jd_times'
 require 'eot/times'
-require 'eot/angle_displays'
 require 'eot/time_displays'
-require 'eot/geo_lat_lng_smt'
+require 'eot/trigonometric'
+require 'eot/utilities'
+require 'eot/version'

data/lib/eot/angle_displays.rb

@@ -1,29 +1,12 @@
 # class Eot file = angle_displays.rb
+# methods for display of angles
 class Eot
-  def deg_string(sgn, d, m, s, ds)
-    sgn +
-    format('%03d', d) +
-            ':' +
-    format('%02d', m) +
-            ':' +
-    format('%02d', s) +
-            '.' +
-    format('%3.3d', ds)
-  end
-
   # From displays.rb
   # String formatter for d:m:s display
   def degrees_to_s(radians = 0.0)
     radians.nil? ? radians = 0.0 : radians
-    radians < 0 ? sign = '-' : sign = '+'
-    deg = (radians * R2D).abs
-    int_deg = Integer(deg)
-    min = 60.0 * (deg - int_deg)
-    int_min = Integer(min)
-    sec = 60.0 * (min - int_min)
-    int_sec = Integer(sec)
-    int_ds = Integer(1000.0 * (sec - int_sec))
-    deg_string(sign, int_deg, int_min, int_sec, int_ds)
+    s, idmsf = Celes.a2af(3, radians)
+    f_string(s, idmsf[0], idmsf[1], idmsf[2], idmsf[3])
   end
 
   # From displays.rb