Yest more tests and some tweaks

Author: attipaci

src/novas.c

@@ -1226,23 +1226,19 @@ short mean_star(double jd_tt, double ra, double dec, enum novas_accuracy accurac
     prop_error(app_star(jd_tt, &star, accuracy, &ra1, &dec1), 20);
 
     // If within tolerance, we are done
-    if(fabs(ra - ra1) < 1.0e-12 && fabs(dec - dec1) < 1.0e-11)
-      break;
+    if(fabs(ra - ra1) < 1.0e-12 && fabs(dec - dec1) < 1.0e-11) {
+      *ira = star.ra < 0.0 ? star.ra + DAY_HOURS : star.ra;
+      *idec = star.dec;
+      return 0;
+    }
 
     // Correct for overshoot
     star.ra = remainder(star.ra + (ra - ra1), DAY_HOURS);
     star.dec = remainder(star.dec + (dec - dec1), DEG360);
   }
 
-  *ira = star.ra < 0.0 ? star.ra + DAY_HOURS : star.ra;
-  *idec = star.dec;
-
-  if(iter < 0) {
-    errno = ECANCELED;
-    return 1;
-  }
-
-  return 0;
+  errno = ECANCELED;
+  return 1;
 }
 
 /**
@@ -1932,11 +1928,13 @@ int itrs_to_hor(const on_surface *location, const double *in, double *az, double
   double lat, lon, coslat, sinlat, coslon, sinlon;
   double pn, pw, pz, proj;
 
+  // Default output values in case of error return.
+  if(az)
+    *az = NAN;
+  if(za)
+    *za = NAN;
+
   if(!location || !in) {
-    if(az)
-      *az = NAN;
-    if(za)
-      *za = NAN;
     errno = EINVAL;
     return -1;
   }
@@ -2123,16 +2121,21 @@ int equ2hor(double jd_ut1, double ut1_to_tt, enum novas_accuracy accuracy, doubl
   double uze[3], une[3], uwe[3], uz[3], un[3], uw[3], p[3];
   double pz, pn, pw, proj, pr[3];
 
-  if(!location || !zd || !az) {
-    errno = EINVAL;
-    return -1;
-  }
-
+  // Default output values in case of error return;
+  if(az)
+    *az = NAN;
+  if(zd)
+    *zd = NAN;
   if(rar)
     *rar = ra;
   if(decr)
     *decr = dec;
 
+  if(!location || !zd || !az) {
+    errno = EINVAL;
+    return -1;
+  }
+
   lon = location->longitude * DEGREE;
   lat = location->latitude * DEGREE;
 
@@ -2219,8 +2222,7 @@ int equ2hor(double jd_ut1, double ut1_to_tt, enum novas_accuracy accuracy, doubl
       proj = sqrt(pr[0] * pr[0] + pr[1] * pr[1]);
 
       if(rar) {
-        if(proj > 0.0)
-          *rar = atan2(pr[1], pr[0]) / HOURANGLE;
+        *rar = proj ? atan2(pr[1], pr[0]) / HOURANGLE : 0.0;
         if(*rar < 0.0)
           *rar += DAY_HOURS;
       }

test/src/test-errors.c

@@ -272,12 +272,12 @@ static int test_place() {
 
 static int test_radec_planet() {
   object o;
-  observer loc;
+  observer loc = {};
   double ra, dec, dis, rv;
 
   o.type = NOVAS_CATALOG_OBJECT;
+  if(check("radec_planet:cat", -1, radec_planet(NOVAS_JD_J2000, &o, &loc, 0.0, NOVAS_GCRS, NOVAS_REDUCED_ACCURACY, &ra, &dec, &dis, &rv))) return 1;
 
-  if(check("radec_planet", -1, radec_planet(0.0, &o, &loc, 0.0, NOVAS_GCRS, NOVAS_FULL_ACCURACY, &ra, &dec, &dis, &rv))) return 1;
   return 0;
 }
 

test/src/test-super.c

@@ -139,14 +139,16 @@ static int test_itrs_hor_itrs() {
 }
 
 static int test_equ2hor() {
-  double az, za, ra, dec, rar, decr;
+  int a;
 
   if(obs.where != NOVAS_OBSERVER_ON_EARTH) return 0;
 
-  vector2radec(pos0, &ra, &dec);
+  for(a = 0; a < 24.0; a += 3) {
+    double ra = a, dec = 0.0, az, za, rar, decr;
 
-  if(!is_ok("itrs_to_hor:rar:null", equ2hor(tdb, 0.0, NOVAS_FULL_ACCURACY, 0.0, 0.0, &obs.on_surf, NOVAS_STANDARD_ATMOSPHERE, ra, dec, &az, &za, NULL, &decr))) return 1;
-  if(!is_ok("itrs_to_hor:decr:null", equ2hor(tdb, 0.0, NOVAS_FULL_ACCURACY, 0.0, 0.0, &obs.on_surf, NOVAS_STANDARD_ATMOSPHERE, ra, dec, &az, &za, &rar, NULL))) return 1;
+    if(!is_ok("itrs_to_hor:rar:null", equ2hor(tdb, 0.0, NOVAS_REDUCED_ACCURACY, 0.0, 0.0, &obs.on_surf, NOVAS_STANDARD_ATMOSPHERE, ra, dec, &az, &za, NULL, &decr))) return 1;
+    if(!is_ok("itrs_to_hor:decr:null", equ2hor(tdb, 0.0, NOVAS_REDUCED_ACCURACY, 0.0, 0.0, &obs.on_surf, NOVAS_STANDARD_ATMOSPHERE, ra, dec, &az, &za, &rar, NULL))) return 1;
+  }
 
   return 0;
 }
@@ -745,8 +747,8 @@ static int test_iau2000a() {
 static int test_iau2000b() {
   double dpsi, deps;
 
-  if(!is_ok("iau2000a:dspi:null", iau2000a(tdb, 0.0, NULL, &deps))) return 1;
-  if(!is_ok("iau2000a:deps:null", iau2000a(tdb, 0.0, &dpsi, NULL))) return 1;
+  if(!is_ok("iau2000a:dspi:null", iau2000b(tdb, 0.0, NULL, &deps))) return 1;
+  if(!is_ok("iau2000a:deps:null", iau2000b(tdb, 0.0, &dpsi, NULL))) return 1;
 
   return 0;
 }