equationoftime 4.0.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ffd7f20110660ab1c68e7b8d811106c487808f1
-  data.tar.gz: d5edf33341d270becd60e42550e1edd46d53c1fd
+  metadata.gz: 9bbe68b6f756ff39bd440ad62c0f6209c87399db
+  data.tar.gz: b5927f2e937a02fa15c48a09eb04d4abbe54c358
 SHA512:
-  metadata.gz: 30aaae71fe66cbae8b59b2eda84ed0c8408f1f08d797cd362391249f44ce335bd00a7c9723ce91c3ca4276f1d5a760d2ca37ceda7b30a2705efc07e878a0a456
-  data.tar.gz: cb9a772a410188fa3ed27e71e959b318e9bbaef529b8564792f35c4048c041f9e5c5a589e561bc9a651823febfcd3adfa6e4f95fda16a11e2718bab46fffd200
+  metadata.gz: b64380f519afa2d4d1caaabd7a7991dd222430475ca4f1c40fce4e8f76f2be889bec4d16d01dc3e06db1f454f92d32d1b4780fbd1f51b822b9217970ccdb00bb
+  data.tar.gz: f4c5c5b927e7a0dd1aa66d40746d339563ed8bca8462fcea8d183b628a22b8edce2a55709c4e02febc8e4ce142b90e81280449b4bfca800801e15a17657df284

data/.gitignore

@@ -1,15 +1,16 @@
-*.gem
-*.rbc
+.gem
+.rbc
 .rspec
 .bundle
 .config
+.settings
 .yardoc
 Gemfile.lock
+
 InstalledFiles
 _yardoc
 coverage
 doc
-
 lib/bundler/man
 pkg
 rdoc
@@ -17,3 +18,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+ext/ceot/*.o
+ext/ceot/*.so
+ext/ceot/Makefile
+lib/*.so

data/Gemfile.lock

@@ -0,0 +1,48 @@
+PATH
+  remote: .
+  specs:
+    equationoftime (4.1.1)
+      celes
+      multi_xml
+      rest-client
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    celes (0.0.1)
+    diff-lcs (1.2.5)
+    mime-types (2.3)
+    minitest (5.4.1)
+    multi_xml (0.5.5)
+    netrc (0.7.7)
+    rake (10.3.2)
+    rake-compiler (0.9.3)
+      rake
+    rest-client (1.7.2)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
+    yard (0.8.7.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.5)
+  equationoftime!
+  minitest
+  rake
+  rake-compiler
+  rspec
+  yard

data/README.md

@@ -1,7 +1,11 @@
 [![Gem Version](https://badge.fury.io/rb/equationoftime.png)](http://badge.fury.io/rb/equationoftime)
-##[*RDocs*](http://rubydoc.info/gems/equationoftime/3.0.0/frames)
-##[*Graphic Plot 1*](https://github.com/DouglasAllen/equationoftime-3.0.0/blob/master/examples/figure_1.jpg) created from [*equation_of_time.py*](https://bitbucket.org/cmcqueen1975/sundials/src/26a0f54a7c18fc3b54a3a4cff4f79192fcef1a91/equation_of_time.py?at=default)
-##[*Graphic Plot 2*](https://github.com/DouglasAllen/equationoftime-3.0.0/blob/master/examples/Equation_of_Time.jpg) created from [*R script*](http://en.wikipedia.org/wiki/File:Zeitgleichung.png)
+
+##[*Graphic Plot 1*](https://github.com/DouglasAllen/equationoftime/blob/master/examples/figure_1.jpg) 
+created from [*equation_of_time.py*](https://bitbucket.org/cmcqueen1975/sundials/src/26a0f54a7c18fc3b54a3a4cff4f79192fcef1a91/equation_of_time.py?at=default)
+
+[*Graphic Plot 1*](https://github.com/DouglasAllen/equationoftime/blob/master/examples/equation_of_time.py)
+
+##[*Graphic Plot 2*](https://github.com/DouglasAllen/equationoftime/blob/master/examples/Equation_of_Time.jpg) created from [*R script*](http://en.wikipedia.org/wiki/File:Zeitgleichung.png)
 ##[*Solar Time*](http://www.maa.mhn.de/Scholar/times.html#solar)
 ##[*Web Calculator*](http://www.nature1st.net/bogan/astro/time/jsjdetst.html)
 # equationoftime gem
@@ -12,23 +16,23 @@
  
 Fork it and Clone it:
 
-	$ git clone git@github.com:DouglasAllen/equationoftime-3.0.0.git
+	$ git clone git@github.com:DouglasAllen/equationoftime.git
    
 Enter dir:
 
-	$ cd  equationoftime-3.0.0
+	$ cd  equationoftime
 
 Execute:
 
-	$ bundle
+	$ bundle install
 
-Run minitest tests:
+Build extension:
 
-	$ rake
+	$ rake compile:ceot
 
-Build gem:
+Run minitest tests:
 
-	$ rake build    
+	$ rake   
 
 Local install of gem build:
  
@@ -41,7 +45,7 @@ Add this line to your application's Gemfile:
 
 And then execute:
 
-	$ bundle
+	$ bundle install
 
 Or install it yourself as:
 
@@ -52,24 +56,23 @@ Or install it yourself as:
 	$ irb --simple-prompt
 
 	require 'eot'
-	eot = Eot.new; "note: nutation data loading is normal if you leave this off."
+	eot = Eot.new
 	eot.string_eot()
 
-#[Wikis](https://github.com/DouglasAllen/equationoftime-3.0.0/blob/master/wiki.md)
-
-
-Notes:
-
-1. for other time equations see:[*gist 2032003*](https://gist.github.com/2032003)
+#[Wikis](https://github.com/DouglasAllen/equationoftime/blob/master/wiki.md)
 
 
 Suggestions:
 
 1. http://equationoftime.herokuapp.com/analemma Itererates through a years worth of dates and computes analemma data.
 2. A file is included in examples named analemma_data_generator.rb and may help you get started.
-3. See the [*astro dog*](https://github.com/DouglasAllen/Sinatra-projects/tree/master/astro_dog) project here and the web post of it on [*Heroku*](http://equationoftime.herokuapp.com/) for more info about the Equation of Time.
+3. See the [*astro dog*](https://github.com/DouglasAllen/Sinatra-projects/tree/master/astro_dog) project or the web post [*Heroku*](http://equationoftime.herokuapp.com/) for more info about the Equation of Time.
 4. See the wikis for more usage examples.
 
+Notes:
+
+1. for other time equations see:[*gist 2032003*](https://gist.github.com/2032003)
+
 Contributing:
 
 1. Fork it

data/Rakefile

@@ -1,5 +1,5 @@
 require "bundler/gem_tasks"
-
+=begin
 require 'thor'
 require 'bundler'
 require 'rbconfig'
@@ -35,7 +35,7 @@ module Bundler
     end
   end
 end
-
+=end
 # require "bundler/install_tasks"
 
 require 'rspec/core/rake_task'
@@ -43,10 +43,17 @@ require 'rspec/core/rake_task'
 
 task :default => [ :test ]
 
-#RSpec::Core::RakeTask.new(:spec) do | t |
-#  t.pattern = "./tests/spec/*_spec.rb"
-#  t.rspec_opts = []
-#end
+RSpec::Core::RakeTask.new(:spec) do | t |
+  t.pattern = "./tests/minitest/*_spec.rb"
+  t.rspec_opts = []
+end
+
+require 'rake/extensiontask'
+spec = Gem::Specification.load('equationoftime.gemspec')
+Rake::ExtensionTask.new('ceot', spec)
+#Rake::ExtensionTask.new "ceot" do |ext|
+  #ext.lib_dir = "lib"
+#end
 
 require 'rake/testtask'
 
@@ -114,4 +121,4 @@ Rake::RDocTask.new(:rdox) do |rd|
  
   rd.options << '--line-numbers'
   
-end
+end

data/equationoftime.gemspec

@@ -10,22 +10,25 @@ Gem::Specification.new do |spec|
      spec.authors       = ["DouglasAllen"]
      spec.email         = ["kb9agt@gmail.com"]
      spec.summary       = %q{Equation of Time calculates time of solar transition.}
-     spec.description   = %q{Calculate Sunrise and Sunset, GMST, and GAST for just about any date and location.
-	                     Lots of examples to play with included.}
-     spec.homepage      = "http://equationoftime.herokuapp.com"
-     #spec.source        = "https://github.com/DouglasAllen/equationoftime-3.0.0"
+     spec.description   = %q{Calculate Sunrise and Sunset. Now uses native C wrappers.
+	                     Lots of examples to play with for learning.}
+     #spec.homepage      = "http://equationoftime.herokuapp.com"
+     spec.homepage      = "https://github.com/DouglasAllen/equationoftime"
      spec.license       = "MIT"
 	
 
      # Manifest
-     #spec.files         = Dir.glob("{examples, lib}/**/*") + %w(LICENSE README}
-     spec.files         = `git ls-files -z`.split("\x0")
+     spec.files         = Dir.glob("ext/**/*.{c,h,rb, so}") + Dir.glob("**") +
+                          Dir.glob("lib/**/*.rb") + Dir.glob(".*")
+     #spec.files         = `git ls-files -z`.split($/)#split("\x0")
+     spec.extensions    << "ext/ceot/extconf.rb"
      spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
      spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
      spec.require_paths = ["lib"]
      spec.platform      = Gem::Platform::RUBY
      spec.add_development_dependency "bundler", "~> 1.5"
      spec.add_development_dependency "rake"
+     spec.add_development_dependency "rake-compiler"
      spec.add_development_dependency "minitest"	 
      spec.add_development_dependency "rspec"
      spec.add_development_dependency "yard"

data/ext/ceot/ceot.c

@@ -0,0 +1,52 @@
+#include "ruby.h"
+#include "eot.h"
+
+#ifndef DBL2NUM
+# define DBL2NUM(dbl) rb_float_new(dbl)
+#endif
+
+ID id_status;
+
+VALUE func_ml(VALUE klass, VALUE vt) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(mlSun(NUM2DBL(vt)));
+}
+
+VALUE func_eoe(VALUE klass, VALUE vt) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(eoe(NUM2DBL(vt)));
+}
+
+VALUE func_eqc(VALUE klass, VALUE vma, VALUE vt) {
+ rb_ivar_set(klass, id_status, INT2FIX(0));
+ return DBL2NUM(eqc(NUM2DBL(vma), NUM2DBL(vt)));  
+}
+
+VALUE func_tl(VALUE klass, VALUE vma, VALUE vt) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(tlSun(NUM2DBL(vma), NUM2DBL(vt)));
+}
+
+VALUE func_al(VALUE klass, VALUE vma, VALUE vt, VALUE vo) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(alSun(NUM2DBL(vma), NUM2DBL(vt), NUM2DBL(vo)));
+}
+
+VALUE func_cosZ(VALUE klass, VALUE vz) {
+  rb_ivar_set(klass, id_status, INT2FIX(0));
+  return DBL2NUM(cosZ(NUM2DBL(vz)));
+}
+
+VALUE cEot;
+void
+Init_ceot(void) {
+
+  VALUE cEot = rb_define_class("Eot", rb_cObject);
+  id_status = rb_intern("@status");
+  rb_define_method(cEot, "ml", func_ml, 1);
+  rb_define_method(cEot, "eoe", func_eoe, 1);
+  rb_define_method(cEot, "eqc", func_eqc, 2);
+  rb_define_method(cEot, "tl", func_tl, 2);
+  rb_define_method(cEot, "al", func_al, 3);
+  rb_define_method(cEot, "cosZ", func_cosZ, 1);
+}

data/ext/ceot/eot.c

@@ -0,0 +1,79 @@
+#include "eot.h"
+
+
+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;
+
+  return a;
+}
+
+double eoe(double t)
+{
+  double e;
+
+  /* Eccentricity of Earth orbit */
+  e = (0.016708617   +
+       t * (-0.000042037 +
+       t * -0.0000001235));
+
+  return e; 
+}
+
+double eqc(double ma, double t)
+{             
+  double a, e, e2, e3, e4, e5;
+  e   = eoe(t);
+  e2  = pow(e, 2);
+  e3  = pow(e, 3);
+  e4  = pow(e, 4);
+  e5  = pow(e, 5);
+
+  /* Equation of Center */
+  a = sin( 1.0 * ma ) * (e  *    2.0      - e3 * 1.0/4.0 + e5 *  5.0/96.0) +
+      sin( 2.0 * ma ) * (e2 *    5.0/4.0  - 0.0          - e4 * 11.0/24.0) + 
+      sin( 3.0 * ma ) * (e3 *   13.0/12.0 - 0.0          - e5 * 43.0/64.0) +
+      sin( 4.0 * ma ) *  e4 *  103.0/96.0                                  +
+      sin( 5.0 * ma ) *  e5 * 1097.0/960.0; 
+
+  return a;
+}
+
+double tlSun(double ma, double t)
+{
+  double a;
+
+  a = fmod( mlSun(t) + eqc(ma, t), 57.295779513082320876798154814105);
+
+  return a;
+}
+
+double alSun(double ma, double t, double o)
+{
+  double a;
+
+  a = fmod(tlSun(ma, t) - 
+           0.00569 * 0.017453292519943295769236907684886 - 
+           0.00478 * 0.017453292519943295769236907684886 * 
+           sin(o), 57.295779513082320876798154814105);
+
+  return a;
+}
+
+double cosZ(double zenith)
+{
+
+  double a;
+
+  a = cos(zenith * 0.017453292519943295769236907684886);
+
+  return a;
+}                              

data/ext/ceot/eot.h

@@ -0,0 +1,8 @@
+#include "math.h"
+
+double mlSun(double t);
+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);

data/ext/ceot/extconf.rb

@@ -0,0 +1,5 @@
+require "mkmf"
+#create_makefile('ceot')
+extension_name = 'ceot'
+dir_config(extension_name)
+create_makefile(extension_name)

data/lib/eot.rb

@@ -1,5 +1,6 @@
 # eot.rb
 
+require 'ceot'
 require 'eot/version'
 require 'eot/constants'
 require 'eot/init'
@@ -8,4 +9,4 @@ require 'eot/angles'
 require 'eot/times'
 require 'eot/displays'
 require 'eot/nutation'
-require 'eot/geo_lat_lng_smt'
+require 'eot/geo_lat_lng_smt'

data/lib/eot/angles.rb

@@ -7,7 +7,8 @@ class Eot
   # From angles.rb:<br> 
   # Apparent solar longitude = true longitude - aberation   
   def al_Sun()    
-    Celes.anp(tl_Sun() - 0.00569 * D2R - 0.00478 * D2R * sin(omega()))
+    #Celes.anp(tl_Sun() - 0.00569 * D2R - 0.00478 * D2R * sin(omega()))
+    al(@ma, @ta, Celes.faom03(@ta))
   end 
   alias_method  :apparent_longitude, :al_Sun 
   alias_method  :alsun, :al_Sun
@@ -23,7 +24,7 @@ class Eot
   # From angles.rb:<br>
   # one time component to total equation of time
   def angle_delta_oblique()           
-    tl_Sun() - ra_Sun()        
+    al(@ma, @ta, Celes.faom03(@ta)) - ra_Sun()        
   end
   alias_method :delta_t_ecliptic, :angle_delta_oblique
   alias_method :delta_oblique, :angle_delta_oblique
@@ -31,7 +32,7 @@ class Eot
   # From angles.rb:<br> 
   # one time component to total equation of time
   def angle_delta_orbit()           
-    @ma - ta_Sun() 
+    @ma - Celes.anp(@ma + eqc( @ma, @ta )) 
   end  
   alias_method :delta_t_elliptic, :angle_delta_orbit
   alias_method :delta_orbit, :angle_delta_orbit
@@ -48,7 +49,7 @@ class Eot
   # total equation of time  
   def angle_equation_of_time()    
     #~ @ma = ma_Sun()    
-    angle_delta_oblique() + angle_delta_orbit()    
+    @ma - Celes.anp(@ma + eqc( @ma, @ta )) + al(@ma, @ta, Celes.faom03(@ta)) - ra_Sun()    
   end
   alias_method :eot, :angle_equation_of_time 
 
@@ -56,20 +57,21 @@ class Eot
   # equation of centre
   # added to mean anomaly to get true anomaly. 
   def center()      
-    sine_1M = sin( 1.0 * @ma )
-    sine_2M = sin( 2.0 * @ma )
-    sine_3M = sin( 3.0 * @ma )
-    sine_4M = sin( 4.0 * @ma )
-    sine_5M = sin( 5.0 * @ma )
-    e = eccentricity_Earth()
-    sine_1M * (     2.0  * e    - e**3/4.0 + 5/96.0 * e**5 ) +  
-    sine_2M * (   5/4.0  * e**2 - 11/24.0 * e**4 )           + 
-    sine_3M * ( 13/12.0  * e**3 - 43/64.0 * e**5 )           +
-    sine_4M *  103/96.0  * e**4                              +
-    sine_5M * 1097/960.0 * e**5                              
-    # sine_1M *( 1.914602 - ta[ 0 ] * ( 0.004817 + ta[ 0 ] * 0.000014 )) +                                               +
-    # sine_2M *( 0.019993 - ta[ 0 ] * 0.000101 )                         +                                              +
+    # sine_1M = sin( 1.0 * @ma )
+    # sine_2M = sin( 2.0 * @ma )
+    # sine_3M = sin( 3.0 * @ma )
+    # sine_4M = sin( 4.0 * @ma )
+    # sine_5M = sin( 5.0 * @ma )
+    # e = eccentricity_Earth()
+    # sine_1M * (  2.0       * e    - e**3 * 1.0/4.0 + 5/96.0 * e**5 ) +  
+    # sine_2M * (  5.0/4.0   * e**2 - 11/24.0 * e**4 )               + 
+    # sine_3M * ( 13.0/12.0  * e**3 - 43/64.0 * e**5 )               +
+    # sine_4M *  103.0/96.0  * e**4                                  +
+    # sine_5M * 1097.0/960.0 * e**5                              
+    # sine_1M * ( 1.914602 - @ta * ( 0.004817 + @ta * 0.000014 )) +                                               +
+    # sine_2M * ( 0.019993 - @ta * 0.000101 )                     +                                              +
     # sine_3M *  0.000289
+    eqc( @ma, @ta )
   end
   alias_method :equation_of_center, :center
   
@@ -77,7 +79,7 @@ class Eot
   # cosine apparent longitude
   # could be useful when dividing 
   def cosine_al_Sun()    
-    cos( alsun() ) 
+    cos( al(@ma, @ta, Celes.faom03(@ta)) ) 
   end
   alias_method :cosine_apparent_longitude, :cosine_al_Sun
   alias_method :cosalsun, :cosine_al_Sun
@@ -86,7 +88,7 @@ class Eot
   # cosine true longitude
   # used in solar right ascension  
   def cosine_tl_Sun()    
-    cos( tl_Sun() ) 
+    cos( tl(@ma, @ta) ) 
   end
   alias_method :cosine_true_longitude, :cosine_tl_Sun
   
@@ -94,15 +96,15 @@ class Eot
   # cosine true obliquity
   # used in solar right ascension and equation of equinox 
   def cosine_to_Earth()    
-    cos( to_Earth() ) 
+    cos( Celes.nut06a(@ajd, 0)[ 1 ] + Celes.obl06(@ajd, 0) ) 
   end
   alias_method :cosine_true_obliquity, :cosine_to_Earth
   
   # From angles.rb:<br>
   # solar declination
   def dec_Sun()   
-    sine_declination = sine_to_Earth()  * sine_al_Sun()
-    asin( sine_declination ) 
+    asin( sin(Celes.nut06a(@ajd, 0)[ 1 ] + Celes.obl06(@ajd, 0)) * 
+            sin( al(@ma, @ta, Celes.faom03(@ta)))) 
   end
   alias_method :declination, :dec_Sun
   
@@ -111,7 +113,8 @@ class Eot
   # eccentricity of elliptical Earth orbit around Sun
   # Horners' calculation method  
   def eccentricity_Earth()
-    [-0.0000001235, -0.000042037, 0.016708617].inject(0.0) {|p, a| p * @ta + a} 
+    # [-0.0000001235, -0.000042037, 0.016708617].inject(0.0) {|p, a| p * @ta + a}
+    eoe(@ta) 
   end
   alias_method :eccentricity_earth_orbit, :eccentricity_Earth
   
@@ -120,7 +123,7 @@ class Eot
   # used for true longitude of Aries 
   # Depricated by Celes.gst06a()  
   def eq_of_equinox()   
-    cosine_to_Earth() * delta_psi()
+    cos( Celes.nut06a(@ajd, 0)[ 1 ] + Celes.obl06(@ajd, 0) ) * Celes.nut06a(@ajd, 0)[ 0 ]
   end
   
 
@@ -128,9 +131,10 @@ class Eot
   # angle geometric mean longitude
   # needed to get true longitude for low accuracy.  
   def gml_Sun()    
-    total = [ 1.0/-19880000.0, 1.0/-152990.0, 1.0/499310.0,
-		 0.0003032028, 36000.76982779, 280.4664567 ] 
-    mod_360(total.inject(0.0) {|p, a| p * @ta + a}) * D2R
+    #total = [ 1.0/-19880000.0, 1.0/-152990.0, 1.0/499310.0,
+    #		 0.0003032028, 36000.76982779, 280.4664567 ] 
+    # mod_360(total.inject(0.0) {|p, a| p * @ta + a}) * D2R
+    ml(@ta)
   end
   alias_method :geometric_mean_longitude, :gml_Sun
 
@@ -138,14 +142,9 @@ class Eot
   # horizon angle for provided geo coordinates
   # used for angles from transit to horizons  
   def ha_Sun()
-    zenith              = 90.8333 * D2R
-    cosine_zenith       = cos( zenith ) 
-    cosine_declination  = cos( dec_Sun() ) 
-    sine_declination    = sin( dec_Sun() )   
-    cosine_latitude     = cos( @latitude * D2R )
-    sine_latitude       = sin( @latitude * D2R )
-    top                 = cosine_zenith - sine_declination * sine_latitude
-    bottom              = cosine_declination * cosine_latitude
+    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 )
     t_cosine = top / bottom 
     t_cosine > 1.0 || t_cosine < -1.0 ? cos = 1.0 : cos = t_cosine
     acos( cos )  
@@ -212,8 +211,9 @@ class Eot
   # From angles.rb:<br>
   # solar right ascension
   def ra_Sun()    
-    y0 = sine_al_Sun() * cosine_to_Earth()
-    Celes.anp(180.0 * PI / 180.0 + atan2( -y0, -cosine_al_Sun() ) )  
+    y0 = sin( al(@ma, @ta, Celes.faom03(@ta)) ) * cos( Celes.nut06a(@ajd, 0)[ 1 ] + 
+         Celes.obl06(@ajd, 0) )
+    Celes.anp( PI + atan2( -y0, -cos( al(@ma, @ta, Celes.faom03(@ta)) ) ) )  
   end
   alias_method :right_ascension, :ra_Sun
   
@@ -221,7 +221,7 @@ class Eot
   # sine apparent longitude
   # used in solar declination  
   def sine_al_Sun()
-    sin( al_Sun() ) 
+    sin( al(@ma, @ta, Celes.faom03(@ta)) ) 
   end
   alias_method :sine_apparent_longitude, :sine_al_Sun
   
@@ -229,7 +229,7 @@ class Eot
   # sine true longitude
   # used in solar right ascension 
   def sine_tl_Sun()    
-    sin( tl_Sun() ) 
+    sin( tl(@ma, @ta) ) 
   end
   alias_method :sine_true_longitude, :sine_tl_Sun
   
@@ -237,14 +237,14 @@ class Eot
   # sine true obliquity angle of Earth
   # used in solar declination 
   def sine_to_Earth()
-    sin(to_Earth())
+    sin(Celes.nut06a(@ajd, 0)[ 1 ] + Celes.obl06(@ajd, 0))
   end
 
   # From angles.rb:<br>
   # angle true anomaly
   # used in equation of time  
   def ta_Sun()     
-    Celes.anp(@ma + center())	
+    Celes.anp(@ma + eqc( @ma, @ta ))	
   end
   alias_method :true_anomaly, :ta_Sun 
 
@@ -263,7 +263,8 @@ class Eot
   # angle of true longitude sun
   # used in equation of time 
   def tl_Sun()   
-    Celes.anp(gml_Sun() + center()) 	 
+    #Celes.anp(gml_Sun() + center())
+    tl(@ma, @ta) 	 
   end
   alias_method :true_longitude, :tl_Sun
   alias_method :ecliptic_longitude, :tl_Sun
@@ -272,7 +273,7 @@ class Eot
   # From angles.rb:<br>
   # true obliquity considers nutation  
   def to_Earth()   
-    Celes.anp(delta_epsilon() + mo_Earth())     
+    Celes.nut06a(@ajd, 0)[ 1 ] + Celes.obl06(@ajd, 0)     
   end
   alias_method :obliquity_correction, :to_Earth
   alias_method :true_obliquity, :to_Earth