equationoftime 4.1.5 → 4.1.6

data/lib/eot/trigonometric.rb

@@ -1,11 +1,11 @@
 # class Eot file = trigometric.rb
+# methods using trig functions
 class Eot
-  include Math
   # From trigometric.rb:
   # cosine apparent longitude
   # could be useful when dividing
   def cosine_al_sun
-    cos_al_sun(al(@ma, @ta, Celes.faom03(@ta)))
+    cos_al_sun(al_sun)
   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_sun(tl(@ma, @ta))
+    cos_tl_sun(tl_sun)
   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_to_earth(Celes.nut06a(@ajd, 0)[1] + Celes.obl06(@ajd, 0))
+    cos_to_earth(to_earth)
   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_sun(al(@ma, @ta, Celes.faom03(@ta)))
+    sin_al_sun(al_sun)
   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_sun(tl(@ma, @ta))
+    sin_tl_sun(tl_sun)
   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_to_earth(Celes.nut06a(@ajd, 0)[1] + Celes.obl06(@ajd, 0))
+    sin_to_earth(to_earth)
   end
 end

data/lib/eot/utilities.rb

@@ -1,5 +1,5 @@
-# utilities.rb
-# class Eot
+# class Eot file = utilities.rb
+# methods for general use
 class Eot
   # From utilities.rb:
   # A check for default J2000
@@ -29,6 +29,19 @@ class Eot
     dt == 0 ? DT2000 : check_t_nil(dt)
   end
 
+  # From utilities.rb:
+  # formats degree string
+  def f_string(sgn, u, m, s, ds)
+    sgn +
+      format('%03d', u) +
+    ':' +
+      format('%02d', m) +
+    ':' +
+      format('%02d', s) +
+    '.' +
+    format('%3.3d', ds)
+  end
+
   # From utilities.rb:
   # Keeps large angles in range of 360.0
   # aliased by truncate

data/lib/eot/version.rb

@@ -1,4 +1,6 @@
 # class Eot file = version.rb
+# contains gem version
 class Eot
-  VERSION = '4.1.5'
+  # current version
+  VERSION = '4.1.6'
 end

data/run_tests_eclipse.rb

@@ -0,0 +1 @@
+system 'bundle exec rake'

data/test/eot/aliased_angles_spec.rb

@@ -8,25 +8,26 @@ require 'eot'
 
 aliased_angles = Eot.new
 
-describe 'tests ajd of 2456885.0' do
+describe 'tests ajd of 2456885.0 ' do
 
   before(:each) do
     aliased_angles.ajd  = 2_456_885.0
     ajd = aliased_angles.ajd
+    aliased_angles.ma_ta_set
     # somtimes need date to check values somewhere else
     aliased_angles.date = aliased_angles.ajd_to_datetime(ajd)
   end
 
-  it 'expected    2456885.0 for aliased_angles.ajd'do
+  it 'expected   2_456_885.0 for aliased_angles.ajd 'do
     assert_equal(2_456_885.0, aliased_angles.ajd)
   end
 
-  it 'expected    "2014-08-15T12:00:00+00:00" from \
-      aliased_angles.date'.to_s do
+  it 'expected   "2014-08-15T12:00:00+00:00" from \
+      aliased_angles.date.to_s ' do
     assert_equal('2014-08-15T12:00:00+00:00', aliased_angles.date.to_s)
   end
 
-  it 'expected    3.8508003966038915 from aliased_angles.ma'do
+  it 'expected   3.8508003966038915 from aliased_angles.ma 'do
     assert_equal(3.8508003966038915, aliased_angles.ma)
   end
 
@@ -41,12 +42,12 @@ describe 'tests ajd of 2456885.0' do
                  aliased_angles.cosine_apparent_longitude)
   end
 
-  it 'expected    -0.7943772759574919 from \
+  it 'expected   -0.7943772759574919 from \
       aliased_angles.cosine_true_longitude()? ' do
     assert_equal(-0.7943772759574919, aliased_angles.cosine_true_longitude)
   end
 
-  it 'expected    0.9175115346811911 from \
+  it 'expected   0.9175115346811911 from \
       aliased_angles.cosine_true_obliquity()? ' do
     assert_equal(0.9175115346811911, aliased_angles.cosine_true_obliquity)
   end
@@ -72,7 +73,7 @@ describe 'tests ajd of 2456885.0' do
                  aliased_angles.eccentricity_earth_orbit)
   end
 
-  it 'expected    -0.021413249720702462 from \
+  it 'expected   -0.021413249720702462 from \
       aliased_angles.equation_of_center()? ' do
     assert_equal(-0.021413249720702462, aliased_angles.equation_of_center)
   end
@@ -83,9 +84,9 @@ describe 'tests ajd of 2456885.0' do
                  aliased_angles.geometric_mean_longitude)
   end
 
-  it 'expected   1.9143229567859146 from \
-      aliased_angles.horizon_angle()? ' do
-    assert_equal(1.9143229567859146, aliased_angles.horizon_angle)
+  it 'expected   1.5857841877939605 from \
+      aliased_angles.horizon_angle(1)? ' do
+    assert_equal(1.5857841877939605, aliased_angles.horizon_angle(1))
   end
 
   it 'expected   3.8508003966038915 from \
@@ -103,13 +104,13 @@ describe 'tests ajd of 2456885.0' do
     assert_equal(0.40905940254265843, aliased_angles.mean_obliquity)
   end
 
-  it 'expected    0.40905940254265843 from \
+  it 'expected   0.40905940254265843 from \
       aliased_angles.mean_obliquity_of_ecliptic()? ' do
     assert_equal(0.40905940254265843, \
                  aliased_angles.mean_obliquity_of_ecliptic)
   end
 
-  it 'expected    0.40901870461547685 from \
+  it 'expected   0.40901870461547685 from \
       aliased_angles.obliquity_correction()? ' do
     assert_equal(0.40901870461547685, aliased_angles.obliquity_correction)
   end
@@ -119,12 +120,12 @@ describe 'tests ajd of 2456885.0' do
     assert_equal(2.5297411654316497, aliased_angles.right_ascension)
   end
 
-  it 'expected    0.6074784519729512 from \
+  it 'expected   0.6074784519729512 from \
       aliased_angles.sine_apparent_longitude()? ' do
     assert_equal(0.6074784519729512, aliased_angles.sine_apparent_longitude)
   end
 
-  it 'expected    0.6074246812917259 from \
+  it 'expected   0.6074246812917259 from \
       aliased_angles.sine_true_longitude()? ' do
     assert_equal(0.6074246812917259, aliased_angles.sine_true_longitude)
   end
@@ -139,7 +140,7 @@ describe 'tests ajd of 2456885.0' do
     assert_equal(2.48877803069344, aliased_angles.true_longitude)
   end
 
-  it 'expected     2.5101242776531474 from \
+  it 'expected   2.5101242776531474 from \
       aliased_angles.true_longitude_aries()? ' do
     assert_equal(2.5101242776531474, aliased_angles.true_longitude_aries)
   end
@@ -150,30 +151,31 @@ describe 'tests ajd of 2456885.0' do
   end
 end
 
-describe 'tests ajd of 2455055.5' do
+describe 'tests ajd of 2455055.5 ' do
 
   before(:each) do
     aliased_angles.ajd                   = 2_455_055.0
     ajd = aliased_angles.ajd
+    aliased_angles.ma_ta_set
     # check date for this ajd when needed.
     aliased_angles.date = aliased_angles.ajd_to_datetime(ajd)
   end
 
-  it 'expected    455055.0, from aliased_angles.' do
+  it 'expected   2_455_055.0, from aliased_angles.' do
     assert_equal(2_455_055.0, aliased_angles.ajd)
   end
 
-  it 'expected    "2009-08-11T12:00:00+00:00" from \
-      aliased_angles.date.to_s' do
+  it 'expected   "2009-08-11T12:00:00+00:00" from \
+      aliased_angles.date.to_s ' do
     assert_equal('2009-08-11T12:00:00+00:00', aliased_angles.date.to_s)
   end
 
-  it 'expected   3.7871218188949207, from aliased_angles.ma' do
+  it 'expected   3.7871218188949207, from aliased_angles.ma ' do
     assert_equal(3.7871218188949207, aliased_angles.ma)
   end
 
   it 'expected   3.7871218188949207 from \
-      aliased_angles.ma  from Eot_angles.mean_anomaly()' do
+      aliased_angles.ma  from Eot_angles.mean_anomaly() ' do
     assert_equal(3.7871218188949207, aliased_angles.mean_anomaly)
   end
 
@@ -188,22 +190,22 @@ describe 'tests ajd of 2455055.5' do
                  aliased_angles.cosine_apparent_longitude)
   end
 
-  it 'expected    -0.7542060769936684 from \
+  it 'expected   -0.7542060769936684 from \
       aliased_angles.cosine_true_longitude()? ' do
     assert_equal(-0.7542060769936684, aliased_angles.cosine_true_longitude)
   end
 
-  it 'expected    0.9174818088112336 from \
+  it 'expected   0.9174818088112336 from \
       aliased_angles.cosine_true_obliquity()? ' do
     assert_equal(0.9174818088112336, aliased_angles.cosine_true_obliquity)
   end
 
-  it 'expected     0.26426912722944046 from \
+  it 'expected   0.2642691272294404 from \
       aliased_angles.declination()? ' do
-    assert_equal(0.26426912722944046, aliased_angles.declination)
+    assert_equal(0.2642691272294404, aliased_angles.declination)
   end
 
-  it 'expected    -0.04234904897476355 from \
+  it 'expected   -0.04234904897476355 from \
       aliased_angles.delta_t_ecliptic()? ' do
     assert_equal(-0.04234904897476355, aliased_angles.delta_t_ecliptic)
   end
@@ -213,77 +215,77 @@ describe 'tests ajd of 2455055.5' do
     assert_equal(0.019768413456709915, aliased_angles.delta_t_elliptic)
   end
 
-  it 'expected     0.016704576164208475 from \
+  it 'expected   0.016704576164208475 from \
       aliased_angles.eccentricity_earth_orbit()? ' do
     assert_equal(0.016704576164208475, \
                  aliased_angles.eccentricity_earth_orbit)
   end
 
-  it 'expected    -0.019768413456709915 from \
+  it 'expected   -0.019768413456709915 from \
       aliased_angles.equation_of_center()? ' do
     assert_equal(-0.019768413456709915, aliased_angles.equation_of_center)
   end
 
-  it 'expected    2.445008945789877 from \
+  it 'expected   2.445008945789877 from \
       aliased_angles.geometric_mean_longitude()? ' do
     assert_equal(2.445008945789877, aliased_angles.geometric_mean_longitude)
   end
 
-  it 'expected    1.9434600427973594 from \
+  it 'expected   1.585863261753274 from \
       aliased_angles.horizon_angle()? ' do
-    assert_equal(1.9434600427973594, aliased_angles.horizon_angle)
+    assert_equal(1.585863261753274, aliased_angles.horizon_angle(1))
   end
 
-  it 'expected    3.7871218188949207 from \
+  it 'expected   3.7871218188949207 from \
       aliased_angles.mean_anomaly()? ' do
     assert_equal(3.7871218188949207, aliased_angles.mean_anomaly)
   end
 
-  it 'expected    2.444907382260759 from \
+  it 'expected   2.444907382260759 from \
       aliased_angles.mean_longitude_aries()? ' do
     assert_equal(2.444907382260759, aliased_angles.mean_longitude_aries)
   end
 
-  it 'expected    0.4090707793981491 from \
+  it 'expected   0.4090707793981491 from \
       aliased_angles.mean_obliquity()? ' do
     assert_equal(0.4090707793981491, aliased_angles.mean_obliquity)
   end
 
-  it 'expected    0.4090934409048494 from \
+  it 'expected   0.4090934409048494 from \
       aliased_angles.obliquity_correction()? ' do
     assert_equal(0.4090934409048494, aliased_angles.obliquity_correction)
   end
 
-  it 'expected    2.467563113547267 from \
+  it 'expected   2.467563113547267 from \
       aliased_angles.right_ascension()? ' do
     assert_equal(2.467563113547267, aliased_angles.right_ascension)
   end
 
-  it 'expected    0.6566577566139093 from \
+  it 'expected   0.6566577566139093 from \
       aliased_angles.sine_apparent_longitude()? ' do
     assert_equal(0.6566577566139093, aliased_angles.sine_apparent_longitude)
   end
 
-  it 'expected    0.6566377946979757 from \
+  it 'expected   0.6566377946979757 from \
       aliased_angles.sine_true_longitude()? ' do
     assert_equal(0.6566377946979757, aliased_angles.sine_true_longitude)
   end
 
-  it 'expected    3.767353405438211 from aliased_angles.true_anomaly()? ' do
+  it 'expected   3.767353405438211 from aliased_angles.true_anomaly()? ' do
     assert_equal(3.767353405438211, aliased_angles.true_anomaly)
   end
 
-  it 'expected    2.4252405323331674 from \
+  it 'expected   2.4252405323331674 from \
       aliased_angles.true_longitude()? ' do
     assert_equal(2.4252405323331674, aliased_angles.true_longitude)
   end
 
-  it 'expected    2.4449774607872907 from \
+  it 'expected   2.4449774607872907 from \
       aliased_angles.true_longitude_aries()? ' do
     assert_equal(2.4449774607872907, aliased_angles.true_longitude_aries)
   end
 
-  it 'expected    0.4090934409048494 from \
+  it 'expected   0.4090934409048494 from \
       aliased_angles.true_obliquity()? ' do
     assert_equal(0.4090934409048494, aliased_angles.true_obliquity)
   end

data/test/eot/aliased_displays_spec.rb

@@ -13,6 +13,7 @@ describe 'aliased_displays using ajd of 2456885.0' do
   before(:each) do
     aliased_displays.ajd  = 2_456_885.0
     ajd = aliased_displays.ajd
+    aliased_displays.ma_ta_set
     # check date for this ajd when needed.
     aliased_displays.date = aliased_displays.ajd_to_datetime(ajd)
 
@@ -36,9 +37,9 @@ describe 'aliased_displays using ajd of 2456885.0' do
     assert_equal '+142:35:33.356', aliased_displays.apparent_longitude_string
   end
 
-  it 'expected   "+013:58:51.521" \
+  it 'expected   "+013:58:51.522" \
       from aliased_displays.declination_string()? ' do
-    assert_equal '+013:58:51.521', aliased_displays.declination_string
+    assert_equal '+013:58:51.522', aliased_displays.declination_string
   end
 
   it 'expected   "-04m, 29.2s" from \
@@ -81,9 +82,9 @@ describe 'aliased_displays using ajd of 2456885.0' do
                  aliased_displays.julian_period_day_fraction_to_time(0)
   end
 
-  it 'expected   "+220:38:04.597" from \
+  it 'expected   "+220:38:04.598" from \
       aliased_displays.mean_anomaly_string()? ' do
-    assert_equal '+220:38:04.597', aliased_displays.mean_anomaly_string
+    assert_equal '+220:38:04.598', aliased_displays.mean_anomaly_string
   end
 
   it 'expected   "+144:56:36.571" from \
@@ -91,19 +92,19 @@ describe 'aliased_displays using ajd of 2456885.0' do
     assert_equal '+144:56:36.571', aliased_displays.right_ascension_string
   end
 
-  it 'expected   "+219:24:27.797" from \
+  it 'expected   "+219:24:27.798" from \
       aliased_displays.true_anomaly_string()? ' do
-    assert_equal '+219:24:27.797', aliased_displays.true_anomaly_string
+    assert_equal '+219:24:27.798', aliased_displays.true_anomaly_string
   end
 
-  it 'expected   "+142:35:47.3184" from \
+  it 'expected   "+142:35:47.318" from \
       aliased_displays.true_longitude_string()? ' do
     assert_equal '+142:35:47.318', aliased_displays.true_longitude_string
   end
 
-  it 'expected   "+023:26:06.163" from \
+  it 'expected   "+023:26:06.164" from \
       aliased_displays.true_obliquity_string()? ' do
-    assert_equal '+023:26:06.163', aliased_displays.true_obliquity_string
+    assert_equal '+023:26:06.164', aliased_displays.true_obliquity_string
   end
 
 end

data/test/eot/aliased_utilities_spec.rb

@@ -1,32 +1,34 @@
 # aliased_utilities_spec.rb
-
+gem 'minitest'
+require 'minitest/autorun'
 lib = File.expand_path('../../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'eot'
 
-Eot_aliased_utilities = Eot.new
+aliased_utilities = Eot.new
 
 describe 'tests ajd of 2456885.0' do
 
   before(:each) do
-    Eot_aliased_utilities.ajd  = 2_456_885.0
-    ajd = Eot_aliased_utilities.ajd
+    aliased_utilities.ajd  = 2_456_885.0
+    ajd = aliased_utilities.ajd
+    aliased_utilities.ma_ta_set
     # check date for this ajd when needed.
-    Eot_aliased_utilities.date = Eot_aliased_utilities.ajd_to_datetime(ajd)
+    aliased_utilities.date = aliased_utilities.ajd_to_datetime(ajd)
   end
 
-  it 'expected   2456885.0 for Eot_aliased_utilities.ajd'do
-    assert_equal 2_456_885.0, Eot_aliased_utilities.ajd
+  it 'expected   2456885.0 for aliased_utilities.ajd'do
+    assert_equal 2_456_885.0, aliased_utilities.ajd
   end
 
-  it 'expected   3.8508003966038915 for Eot_aliased_utilities.ma'do
-    assert_equal 3.8508003966038915, Eot_aliased_utilities.ma
+  it 'expected   3.8508003966038915 for aliased_utilities.ma'do
+    assert_equal 3.8508003966038915, aliased_utilities.ma
   end
 
-  it 'expected   0.0 returned by Eot_aliased_utilities.truncate() ' do
-    assert_equal 0.0, Eot_aliased_utilities.truncate
-    assert_equal 0.0, Eot_aliased_utilities.truncate(nil)
-    assert_equal 0.0, Eot_aliased_utilities.truncate(0)
+  it 'expected   0.0 returned by aliased_utilities.truncate() ' do
+    assert_equal 0.0, aliased_utilities.truncate
+    assert_equal 0.0, aliased_utilities.truncate(nil)
+    assert_equal 0.0, aliased_utilities.truncate(0)
   end
 
 end