equationoftime 4.1.4 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d7c71c9180b8b4b0094d48ea229d33f6c6c29a0
-  data.tar.gz: 6f906ad06de3a024af3f3821ac43a0778957ba8a
+  metadata.gz: 3548bdc8e0b497b9d4db22274c1cba9c31f2705f
+  data.tar.gz: 7a7045370ba55b1f21c143514a52d1ba4b7a928a
 SHA512:
-  metadata.gz: 313234036b84d2b1a8a3f51b20ddbe5faad9e91f6d5ec678aef861804aa01c201170c7bbecea1bc702dd92318cafafe5a381f70c53dfc6d17a4ba5b92c26fcf7
-  data.tar.gz: 130b5e3874268f119c3485e76cacaaa8c7cc2f9b9a2a75b61279487fa9acdaf1772cb50dc1673e9a83d45a1bf2b234c7c8e22c052a426196e45521d061197a8c
+  metadata.gz: cb8d7bbd702b98551b247b0574e9cf3ec1cc08f209f9ffc0d65f07a5dad6ec69bbc4ccfe6c746870d1f9959fd1cb316180f4834e09b628710e6d1ebb00c91953
+  data.tar.gz: 67c10e32092d3cbb9441c0052580eb58a573199ddcafeac4bf05ed185366a8273eb2c11f69366c411488f5f5fbb09d78a502ad1f7c623b2b337ff7027bff8039

data/Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 ruby '2.1.2'
-# Specify your gem's dependencies in equationoftime.gemspec
+
 gemspec
-gem 'addressable'
+
 group :development do
-  gem 'robocop'
+  gem 'rubocop'
   gem 'hoe'
   gem 'rake'
   gem 'rake-compiler', '~> 0.9.3'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    equationoftime (4.1.4)
+    equationoftime (4.1.5)
       addressable (~> 2.3.6)
       celes (~> 0.0.1)
       rest-client
@@ -11,6 +11,9 @@ GEM
   specs:
     ZenTest (4.10.1)
     addressable (2.3.6)
+    ast (2.0.0)
+    astrolabe (1.3.0)
+      parser (>= 2.2.0.pre.3, < 3.0)
     celes (0.0.1)
     celluloid (0.16.0)
       timers (~> 4.0.0)
@@ -40,11 +43,15 @@ GEM
     mime-types (2.3)
     minitest (5.4.1)
     netrc (0.7.7)
+    parser (2.2.0.pre.4)
+      ast (>= 1.1, < 3.0)
+      slop (~> 3.4, >= 3.4.5)
+    powerpack (0.0.9)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
+    rainbow (2.0.0)
     rake (10.3.2)
     rake-compiler (0.9.3)
       rake
@@ -56,8 +63,6 @@ GEM
     rest-client (1.7.2)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    robocop (0.1.1)
-      rack
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -70,6 +75,13 @@ GEM
     rspec-mocks (3.1.0)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.0)
+    rubocop (0.26.1)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.0.pre.4, < 3.0)
+      powerpack (~> 0.0.6)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.4)
+    ruby-progressbar (1.6.0)
     slop (3.6.0)
     thor (0.19.1)
     timers (4.0.1)
@@ -81,7 +93,6 @@ PLATFORMS
 
 DEPENDENCIES
   ZenTest
-  addressable
   bundler (~> 1.7)
   equationoftime!
   guard
@@ -91,6 +102,6 @@ DEPENDENCIES
   rake
   rake-compiler (~> 0.9.3)
   rdoc
-  robocop
   rspec
+  rubocop
   yard

data/Manifest.txt

@@ -32,7 +32,7 @@ lib/eot/geo_lat_lng_smt.rb
 lib/eot/init.rb
 lib/eot/time_displays.rb
 lib/eot/times.rb
-lib/eot/trigometric.rb
+lib/eot/trigonometric.rb
 lib/eot/utilities.rb
 lib/eot/version.rb
 test/eot/aliased_angles_spec.rb

data/README.rdoc

@@ -20,8 +20,20 @@ Lots of examples to play with for learning about Eot.
   $ irb --simple-prompt
 
         require 'eot'
-        eot = Eot.new()
-        eot.string_eot()
+        eot = Eot.new
+        eot.string_eot          # todays eot
+        eot.addr                # what is the location
+        eot.addr = "huston, tx" #changed location
+        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
+        eot.ajd = 2451545       # ajd set to 2001-01-01 12:00 
+        
 
 == REQUIREMENTS:
 
@@ -37,6 +49,10 @@ After checking out the source, run:
 
   $ rake newb
 
+Or use patch to install as gem
+
+  $ gem install eot
+
 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.4
+# rake release VERSION=4.1.5
 Hoe.spec 'equationoftime' do
   developer('Douglas Allen', 'kb9agt@gmail.com')
   license('MIT')
-  self.version = '4.1.4'
+  self.version = '4.1.5'
   self.readme_file   = 'README.rdoc'
   self.history_file  = 'CHANGELOG.rdoc'
   self.extra_rdoc_files  = FileList['*.rdoc']

data/equationoftime.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['kb9agt@gmail.com']
   spec.summary       = 'Equation of Time calculates time of solar transition.'
   spec.description   = 'Calculate Sunrise and Sunset. Uses native C wrappers.
-                        Lots of examples to play with for learning.'
+                        Use the patch "gem install eot" to install it.'
   # spec.homepage      = "http://equationoftime.herokuapp.com"
   spec.homepage      = 'https://github.com/DouglasAllen/equationoftime'
   spec.license       = 'MIT'

data/examples/my_lst.rb

@@ -4,6 +4,6 @@ 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) }"
-  dur = (1 - 0.0027379093499 / 1.002739093499) / 1.0027379093499
-  sleep dur
+  # the number is syncing my machine. machine may vary in this.
+  sleep 0.99613381875
 end

data/ext/eot/ceot.c

@@ -2,19 +2,19 @@
 
 
 double mlSun(double t)
-{
+{
   double a;
 
   /* Mean geocentric longitude of the Sun */
   a = fmod(      280.4664567    +
   t * (        36000.76982779   +
   t * (            0.0003032028 +
-  t * (   1.0/499310.0          +
-  t * (  1.0/-152990.0          +
-  t * (1.0/-19880000.0 ) ) ) ) ), 360.0 ) * 0.017453292519943295769236907684886;
-
+  t * (   1.0/499310.0          +
+  t * (  1.0/-152990.0          +
+  t * (1.0/-19880000.0 ) ) ) ) ), 360.0 ) * 0.017453292519943295769236907684886;
+
   return a;
-}
+}
 
 double eoe(double t)
 {
@@ -27,9 +27,9 @@ double eoe(double t)
 
   return e; 
 }
-
-double eqc(double ma, double t)
-{             
+
+double eqc(double ma, double t)
+{             
   double a1, a2, a3, a4, a5, s1, s2, s3, s4, s5, e;
   e   = eoe(t);  
   s1  = sin( 1.0 * ma );
@@ -41,14 +41,14 @@ double eqc(double ma, double t)
   a2  = s2 * 5.0/4.0;
   a3  = s3 * 13.0/12.0 - s1 * 1.0/4.0;
   a4  = s4 * 103.0/96.0 - s2 * 11.0/24.0;
-  a5  = s5 * 1097.0/960.0 + s1 * 5.0/96.0 - s3 * 43.0/64.0;
-  /* Equation of Center */
-  //a =  s1 * (e  *    2.0      - e3 * 1.0/4.0 + e5 *  5.0/96.0) +
-  //     s2 * (e2 *    5.0/4.0  - 0.0          - e4 * 11.0/24.0) + 
-  //     s3 * (e3 *   13.0/12.0 - 0.0          - e5 * 43.0/64.0) +
-  //     s4 *  e4 *  103.0/96.0                                  +
-  //     s5 *  e5 * 1097.0/960.0; 
-  return e * (a1 + e * (a2 + e * (a3 + e * (a4 + e * a5))));
+  a5  = s5 * 1097.0/960.0 + s1 * 5.0/96.0 - s3 * 43.0/64.0;
+  /* Equation of Center */
+  //a =  s1 * (e  *    2.0      - e3 * 1.0/4.0 + e5 *  5.0/96.0) +
+  //     s2 * (e2 *    5.0/4.0  - 0.0          - e4 * 11.0/24.0) + 
+  //     s3 * (e3 *   13.0/12.0 - 0.0          - e5 * 43.0/64.0) +
+  //     s4 *  e4 *  103.0/96.0                                  +
+  //     s5 *  e5 * 1097.0/960.0; 
+  return e * (a1 + e * (a2 + e * (a3 + e * (a4 + e * a5))));
 }
 
 double tlSun(double ma, double t)
@@ -75,9 +75,111 @@ double alSun(double ma, double t, double o)
 double cosZ(double zenith)
 {
 
-  double a;
+  double ca;
 
-  a = cos(zenith * 0.017453292519943295769236907684886);
+  ca = cos(zenith * 0.017453292519943295769236907684886);
 
-  return a;
-}                              
+  return ca;
+}
+
+double cos_al_sun(double al_sun) 
+{
+
+  double ca;
+
+  ca = cos(al_sun);
+
+  return ca;
+}
+
+double cos_dec_sun(double dec_sun) 
+{
+
+  double ca;
+
+  ca = cos(dec_sun);
+
+  return ca;
+} 
+
+double cos_lat(double lat) 
+{
+
+  double ca;
+
+  ca = cos(lat);
+
+  return ca;
+}                                   
+
+double cos_tl_sun(double tl_sun) 
+{
+
+  double ca;
+
+  ca = cos(tl_sun);
+
+  return ca;
+}                                               
+
+double cos_to_earth(double to_earth) 
+{
+
+  double ca;
+
+  ca = cos(to_earth);
+
+  return ca;
+} 
+
+double sin_al_sun(double al_sun) 
+{
+
+  double sa;
+
+  sa = sin(al_sun);
+
+  return sa;
+}
+
+double sin_dec_sun(double dec_sun) 
+{
+
+  double sa;
+
+  sa = sin(dec_sun);
+
+  return sa;
+}  
+
+double sin_lat(double lat) 
+{
+
+  double sa;
+
+  sa = sin(lat);
+
+  return sa;
+}                                   
+
+double sin_tl_sun(double tl_sun) 
+{
+
+  double sa;
+
+  sa = sin(tl_sun);
+
+  return sa;
+}                                               
+
+double sin_to_earth(double to_earth) 
+{
+
+  double sa;
+
+  sa = sin(to_earth);
+
+  return sa;
+} 
+
+                                                        

data/ext/eot/ceot.h

@@ -5,4 +5,14 @@ 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 cosZ(double zenith);
+double cosZ(double zenith);
+double cos_al_sun(double al_sun);
+double cos_tl_sun(double tl_sun);
+double cos_to_earth(double to_earth);
+double sin_al_sun(double al_sun);
+double sin_tl_sun(double tl_sun);
+double sin_to_earth(double to_earth);
+double sin_dec_sun(double dec_sun);
+double cos_dec_sun(double dec_sun);
+double sin_lat(double lat);
+double cos_lat(double lat);

data/ext/eot/eot.c

@@ -37,6 +37,56 @@ VALUE func_cosZ(VALUE klass, VALUE vz) {
   return DBL2NUM(cosZ(NUM2DBL(vz)));
 }
 
+VALUE func_cos_al_sun(VALUE klass, VALUE vals) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(cos_al_sun(NUM2DBL(vals)));
+}
+
+VALUE func_cos_tl_sun(VALUE klass, VALUE vtls) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(cos_al_sun(NUM2DBL(vtls)));
+}
+
+VALUE func_cos_to_earth(VALUE klass, VALUE vtoe) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(cos_to_earth(NUM2DBL(vtoe)));
+}
+
+VALUE func_sin_al_sun(VALUE klass, VALUE vals) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(sin_al_sun(NUM2DBL(vals)));
+}
+
+VALUE func_sin_tl_sun(VALUE klass, VALUE vtls) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(sin_al_sun(NUM2DBL(vtls)));
+}
+
+VALUE func_sin_to_earth(VALUE klass, VALUE vtoe) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(sin_to_earth(NUM2DBL(vtoe)));
+}
+
+VALUE func_sin_dec_sun(VALUE klass, VALUE vds) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(sin_dec_sun(NUM2DBL(vds)));
+}
+
+VALUE func_cos_dec_sun(VALUE klass, VALUE vds) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(cos_dec_sun(NUM2DBL(vds)));
+}
+
+VALUE func_sin_lat(VALUE klass, VALUE vlat) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(sin_lat(NUM2DBL(vlat)));
+}
+
+VALUE func_cos_lat(VALUE klass, VALUE vlat) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(cos_lat(NUM2DBL(vlat)));
+}
+
 VALUE cEot;
 void
 Init_eot(void) {
@@ -49,4 +99,14 @@ Init_eot(void) {
   rb_define_method(cEot, "tl", func_tl, 2);
   rb_define_method(cEot, "al", func_al, 3);
   rb_define_method(cEot, "cosZ", func_cosZ, 1);
+  rb_define_method(cEot, "cos_al_sun", func_cos_al_sun, 1);
+  rb_define_method(cEot, "cos_tl_sun", func_cos_tl_sun, 1);
+  rb_define_method(cEot, "cos_to_earth", func_cos_to_earth, 1);
+  rb_define_method(cEot, "sin_al_sun", func_sin_al_sun, 1);
+  rb_define_method(cEot, "sin_tl_sun", func_sin_tl_sun, 1);
+  rb_define_method(cEot, "sin_to_earth", func_sin_to_earth, 1);
+  rb_define_method(cEot, "cos_dec_sun", func_cos_dec_sun, 1);
+  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);
 }

data/lib/eot/angles.rb

@@ -56,8 +56,8 @@ class Eot
   # 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) * sin(@latitude * D2R)
-    bottom   = cos(dec_sun) * cos(@latitude * D2R)
+    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)

data/lib/eot/constants.rb

@@ -121,14 +121,14 @@ class Eot
 
   # Julian Date of Modified Julian Date zero
   # 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
+  # MJD0        = 2400000.5  
 
   # from desktop calculator PI = 3.1415926535897932384626433832795
   PI          = 3.1415926535897932384626433832795
 
+  # 2Pi from Math module = Math::PI * 2.0
+  P2          = PI * 2.0
+
   # from desktop calculator R2D = 57.295779513082320876798154814105
   R2D         = 57.295779513082320876798154814105
 

data/lib/eot/init.rb

@@ -9,9 +9,10 @@ class Eot
   # 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
+    @ta  = ((ajd - DJ00) / DJC).to_f
     @ma  = Celes.falp03(@ta)
   end
 
@@ -52,7 +53,6 @@ class Eot
   # 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

data/lib/eot/times.rb

@@ -48,7 +48,7 @@ class Eot
   # Uses @ajd attribute
   # Returns Sunrise as a Julian Day Number
   def sunrise_jd
-    local_noon_dt.ajd - ha_sun * R2D / 360.0
+    local_noon_dt.ajd - ha_sun / P2
   end
 
   # From times.rb:
@@ -62,7 +62,7 @@ class Eot
   # Uses @ajd attribute
   # Returns Sunset as a Julian Day Number
   def sunset_jd
-    local_noon_dt.ajd + ha_sun * R2D / 360.0
+    local_noon_dt.ajd + ha_sun / P2
   end
 
   # From times.rb:

data/lib/eot/{trigometric.rb → trigonometric.rb}

@@ -5,7 +5,7 @@ class Eot
   # cosine apparent longitude
   # could be useful when dividing
   def cosine_al_sun
-    cos(al(@ma, @ta, Celes.faom03(@ta)))
+    cos_al_sun(al(@ma, @ta, Celes.faom03(@ta)))
   end
   alias_method :cosine_apparent_longitude, :cosine_al_sun
   alias_method :cosalsun, :cosine_al_sun
@@ -14,7 +14,7 @@ class Eot
   # cosine true longitude
   # used in solar right ascension
   def cosine_tl_sun
-    cos(tl(@ma, @ta))
+    cos_tl_sun(tl(@ma, @ta))
   end
   alias_method :cosine_true_longitude, :cosine_tl_sun
 
@@ -22,7 +22,7 @@ class Eot
   # cosine true obliquity
   # used in solar right ascension and equation of equinox
   def cosine_to_earth
-    cos(Celes.nut06a(@ajd, 0)[1] + Celes.obl06(@ajd, 0))
+    cos_to_earth(Celes.nut06a(@ajd, 0)[1] + Celes.obl06(@ajd, 0))
   end
   alias_method :cosine_true_obliquity, :cosine_to_earth
 
@@ -30,7 +30,7 @@ class Eot
   # sine apparent longitude
   # used in solar declination
   def sine_al_sun
-    sin(al(@ma, @ta, Celes.faom03(@ta)))
+    sin_al_sun(al(@ma, @ta, Celes.faom03(@ta)))
   end
   alias_method :sine_apparent_longitude, :sine_al_sun
 
@@ -38,7 +38,7 @@ class Eot
   # sine true longitude
   # used in solar right ascension
   def sine_tl_sun
-    sin(tl(@ma, @ta))
+    sin_tl_sun(tl(@ma, @ta))
   end
   alias_method :sine_true_longitude, :sine_tl_sun
 
@@ -46,6 +46,6 @@ class Eot
   # sine true obliquity angle of Earth
   # used in solar declination
   def sine_to_earth
-    sin(Celes.nut06a(@ajd, 0)[1] + Celes.obl06(@ajd, 0))
+    sin_to_earth(Celes.nut06a(@ajd, 0)[1] + Celes.obl06(@ajd, 0))
   end
 end

data/lib/eot/version.rb

@@ -1,4 +1,4 @@
 # class Eot file = version.rb
 class Eot
-  VERSION = '4.1.4'
+  VERSION = '4.1.5'
 end

data/lib/eot.rb

@@ -12,7 +12,7 @@ require 'eot/init'
 require 'eot/utilities'
 require 'eot/angles'
 require 'eot/deltas'
-require 'eot/trigometric'
+require 'eot/trigonometric'
 require 'eot/times'
 require 'eot/angle_displays'
 require 'eot/time_displays'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: equationoftime
 version: !ruby/object:Gem::Version
-  version: 4.1.4
+  version: 4.1.5
 platform: ruby
 authors:
 - Douglas Allen
@@ -131,7 +131,7 @@ files:
 - lib/eot/init.rb
 - lib/eot/time_displays.rb
 - lib/eot/times.rb
-- lib/eot/trigometric.rb
+- lib/eot/trigonometric.rb
 - lib/eot/utilities.rb
 - lib/eot/version.rb
 - test/eot/aliased_angles_spec.rb