Changeset 360 in Sophya

Timestamp:

Aug 6, 1999, 5:05:47 PM (26 years ago)

Author:

ansari

Message:

auxilliary GPS

File:

• trunk/Poubelle/archTOI.old/auxinterpgps.cc (modified) (2 diffs)

trunk/Poubelle/archTOI.old/auxinterpgps.cc

@@ -13 +13 @@
 
 void AuxInterpGPS::FindElem(double mjd) {
-  ilast = elems.lower_bound(elem(mjd,0,0,0));
-  ilastok = (ilast != elems.end());
+  ilast = elems.upper_bound(elem(mjd,0,0,0));
+  ilastok = (ilast != elems.end() && ilast != elems.begin());
 }
 
@@ -20 +20 @@
 int AuxInterpGPS::getLocation(double mjd, double& lat, double& lon, double& alt) {
   if (!ilastok ||
-      (mjd <= (*ilast).mjd)) {
+      (mjd > (*ilast).mjd)) {
     FindElem(mjd);
   } else {
-    set<elem>::const_iterator i = ilast; i++;
-    if (mjd > (*i).mjd) FindElem(mjd);
+    set<elem>::const_iterator i = ilast; i--;
+    if (mjd <= (*i).mjd) FindElem(mjd);
   }
+  
+  
 
   if (!ilastok) return -1;
-  if (mjd <= (*ilast).mjd) return -1;
-  set<elem>::const_iterator i = ilast; i++;
-  if (mjd > (*i).mjd) return -1;
+  double lastmjd = (*ilast).mjd;
+  if (mjd > lastmjd) return -1;
+  if (ilast == elems.begin()) return -1;
+  set<elem>::const_iterator i = ilast; i--;
+  double prevmjd = (*i).mjd;
+  if (mjd < prevmjd) return -1;
   
-  double x = (mjd - (*ilast).mjd) / ((*i).mjd - (*ilast).mjd);
+  double x = (mjd - prevmjd) / (lastmjd - prevmjd);
   
-  lat = (*ilast).lat*(1-x) + (*i).lat*x;
-  lon = (*ilast).lon*(1-x) + (*i).lon*x;
-  alt = (*ilast).alt*(1-x) + (*i).alt*x;
+  lat = (*i).lat*(1-x) + (*ilast).lat*x;
+  lon = (*i).lon*(1-x) + (*ilast).lon*x;
+  alt = (*i).alt*(1-x) + (*ilast).alt*x;
   
   return 0;