Changeset 1218 in ntrip for trunk/BNC/RTCM

Timestamp:

Nov 19, 2008, 2:56:05 PM (16 years ago)

Author:

mervart

Message:

Zdenek Lukes:
a) changed logic how the ephemerides are stored for decoding of message 20/21 RTCM 2.3
b) added some debugging output (enabled is macro DEBUG_RTCM2_2021 is defined)

Location:

trunk/BNC/RTCM

Files:

• GPSDecoder.h (modified) (2 diffs)
• RTCM2Decoder.cpp (modified) (10 diffs)
• RTCM2Decoder.h (modified) (4 diffs)

trunk/BNC/RTCM/GPSDecoder.h

@@ -27 +27 @@
 
 #include <iostream>
+#include <vector>
+#include <string>
 #include <QPointer>
 #include <QList>
@@ -121 +123 @@
 class GPSDecoder {
  public:
-  virtual t_irc Decode(char* buffer, int bufLen) = 0;
+  virtual t_irc Decode(char* buffer, int bufLen, std::vector<std::string>& errmsg) = 0;
 
   virtual ~GPSDecoder() {

trunk/BNC/RTCM/RTCM2Decoder.cpp

@@ -42 +42 @@
 #include <sstream>
 #include <iomanip>
+#include <set>
 
 #include "../bncutils.h"
@@ -64 +65 @@
 
 RTCM2Decoder::~RTCM2Decoder() {
-  for (t_pairMap::iterator ii = _ephPair.begin(); ii != _ephPair.end(); ii++) {
+  for (t_listMap::iterator ii = _ephList.begin(); ii != _ephList.end(); ii++) {
     delete ii->second;
   }
@@ -104 +105 @@
 
 //
-t_irc RTCM2Decoder::Decode(char* buffer, int bufLen) {
+t_irc RTCM2Decoder::Decode(char* buffer, int bufLen, vector<string>& errmsg) {
+
+  errmsg.clear();
 
   _buffer.append(buffer, bufLen);
@@ -165 +168 @@
       if (_msg2021.valid()) {
         decoded = true;
-        translateCorr2Obs();
+        translateCorr2Obs(errmsg);
       } 
     }
@@ -182 +185 @@
 
 
-void RTCM2Decoder::storeEph(const gpsephemeris& gpseph) {
+bool RTCM2Decoder::storeEph(const gpsephemeris& gpseph, string& storedPRN, vector<int>& IODs) {
   t_ephGPS eph; eph.set(&gpseph);
 
-  storeEph(eph);
-}
-
-
-void RTCM2Decoder::storeEph(const t_ephGPS& gpseph) {
+  return storeEph(eph, storedPRN, IODs);
+}
+
+
+bool RTCM2Decoder::storeEph(const t_ephGPS& gpseph, string& storedPRN, vector<int>& IODs) {
   t_ephGPS* eph = new t_ephGPS(gpseph);
 
   string prn = eph->prn();
 
-  t_pairMap::iterator ip = _ephPair.find(prn);
-  if (ip == _ephPair.end() ) {
-    ip = _ephPair.insert(pair<string, t_ephPair*>(prn, new t_ephPair)).first;
-  }
-  t_ephPair* pair = ip->second;
-
-  if ( !pair->eph || eph->isNewerThan(pair->eph) ) {
-    delete pair->oldEph;
-    pair->oldEph = pair->eph;
-    pair->eph    = eph;
-
-    return;
+  t_listMap::iterator ip = _ephList.find(prn);
+  if (ip == _ephList.end() ) {
+    ip = _ephList.insert(pair<string, t_ephList*>(prn, new t_ephList)).first;
+  }
+  t_ephList* ephList = ip->second;
+
+  bool stored = ephList->store(eph);
+
+  if ( stored ) {
+    storedPRN = eph->prn();
+    ephList->getIODs(IODs);
+    return true;
   }
 
   delete eph;
+
+  return false;
 }
   
   
-void RTCM2Decoder::translateCorr2Obs() {
+void RTCM2Decoder::translateCorr2Obs(vector<string>& errmsg) {
 
   if ( !_msg03.validMsg || !_msg2021.valid() ) {
@@ -248 +253 @@
     const RTCM2_2021::HiResCorr* corr = icorr->second;
 
+    // beg test
+    if ( corr->PRN >= 200 ) {
+      continue;
+    }
+    // end test
+
+
     ostringstream oPRN; oPRN.fill('0');
 
@@ -255 +267 @@
     string PRN(oPRN.str());
 
-    t_pairMap::const_iterator ieph = _ephPair.find(PRN);
-    const t_eph* eph0 = 0;
-    const t_eph* eph1 = 0;
-
-    if ( ieph != _ephPair.end() ) {
-      eph0 = ieph->second->eph;
-      eph1 = ieph->second->oldEph;
-    }
-
-    if ( !eph0 && !eph1 ) {
+    t_listMap::const_iterator ieph = _ephList.find(PRN);
+
+    if ( ieph == _ephList.end() ) {
+      errmsg.push_back("missing eph for " + PRN);
       continue;
     }
@@ -277 +283 @@
     p_obs new_obs = 0;
 
+    // missing IOD
+    vector<string> missingIOD;
+    vector<string>     hasIOD;
     for (unsigned ii = 0; ii < 4; ii++) {
       int          IODcorr = 0;
@@ -312 +321 @@
       }
 
-      eph = 0;
-      if      ( eph0 && eph0->IOD() == IODcorr ) 
-        eph = eph0;
-      else if ( eph1 && eph1->IOD() == IODcorr ) 
-        eph = eph1;
-      if ( eph && corr ) {
+      eph = ieph->second->getEph(IODcorr);
+
+      if ( eph ) {
+        ostringstream msg;
+        msg << obsT << ':' << setw(3) << eph->IOD();
+        hasIOD.push_back(msg.str());
+
+
         int    GPSWeek_tot;
         double GPSWeeks_tot;
@@ -372 +383 @@
         }
       }
+      else if ( IODcorr != 0 ) {
+        ostringstream msg;
+        msg << obsT << ':' << setw(3) << IODcorr;
+        missingIOD.push_back(msg.str());
+      }
     } // loop over frequencies
-    
+   
+    // Error report
+    if ( missingIOD.size() ) {
+      ostringstream missingIODstr;
+
+      copy(missingIOD.begin(), missingIOD.end(), ostream_iterator<string>(missingIODstr, "   "));
+
+      errmsg.push_back("missing eph for " + PRN + " , IODs " + missingIODstr.str());
+    }
+
+    // Store new observation
     if ( new_obs ) {
       _obsList.push_back( new_obs );
-    }
-  }
-}
+
+      ///ostringstream hasIODstr;
+      ///copy(hasIOD.begin(), hasIOD.end(), ostream_iterator<string>(hasIODstr, "    "));
+      ///errmsg.push_back("decoded PRN " + PRN + " : " + hasIODstr.str());
+    }
+  }
+}

trunk/BNC/RTCM/RTCM2Decoder.h

@@ -27 +27 @@
 
 #include <map>
+#include <vector>
+#include <list>
 
 #include "GPSDecoder.h"
@@ -39 +41 @@
     RTCM2Decoder(const std::string& ID);
     virtual ~RTCM2Decoder();
-    virtual t_irc Decode(char* buffer, int bufLen);
+    virtual t_irc Decode(char* buffer, int bufLen, std::vector<std::string>& errmsg);
 
-    void  storeEph(const gpsephemeris& gpseph);
-    void  storeEph(const t_ephGPS&     gpseph);
+    bool  storeEph(const gpsephemeris& gpseph, std::string& storedPRN, std::vector<int>& IODs);
+    bool  storeEph(const t_ephGPS&     gpseph, std::string& storedPRN, std::vector<int>& IODs);
 
     t_irc getStaCrd(double& xx, double& yy, double& zz);
 
-    t_irc getStaCrd(double& xx, double& yy, double& zz,
+    t_irc getStaCrd(double& xx,  double& yy,  double& zz,
                     double& dx1, double& dy1, double& dz1,
                     double& dx2, double& dy2, double& dz2);
@@ -56 +58 @@
   private:
 
-    class t_ephPair {
+    class t_ephList {
     public:
-      t_ephPair() {
-        eph    = 0;
-        oldEph = 0;
+      t_ephList() {}
+      
+      ~t_ephList() {
+        for (std::list<t_eph*>::iterator ii = _eph.begin(); ii != _eph.end(); ii++) {
+          delete  (*ii);
+        }
+      }
+
+      bool store(t_eph* eph) {
+        if ( _eph.size() == 0 ) {
+          _eph.push_back(eph);
+          return true;
+        }
+          
+        std::list<t_eph*>::iterator ii = _eph.begin();
+        while (ii != _eph.end()) {
+          if ( eph->IOD() == (*ii)->IOD() ) {
+            return false;
+          }
+          if ( ! eph->isNewerThan(*ii) ) {
+            break;
+          }
+          ++ii;
+        }
+
+        if ( ii == _eph.begin() && _eph.size() == MAXSIZE) {
+          return false;
+        }
+
+        _eph.insert(ii, eph);
+
+        while ( _eph.size() > MAXSIZE ) {
+          delete _eph.front();
+          _eph.pop_front();
+        }
+
+        return true;
       }
       
-      ~t_ephPair() {
-        delete eph;
-        delete oldEph;
+      const t_eph* getEph(int IOD) const {
+        for (std::list<t_eph*>::const_iterator ii = _eph.begin(); ii != _eph.end(); ii++) {
+          if ( (*ii)->IOD() == IOD ) {
+            return (*ii);
+          }
+        }
+        return 0;
       }
-      
-      t_eph* eph;
-      t_eph* oldEph;
+
+      void getIODs(std::vector<int>& IODs) const {
+        IODs.clear();
+        for (std::list<t_eph*>::const_iterator ii = _eph.begin(); ii != _eph.end(); ii++) {
+          IODs.push_back((*ii)->IOD());
+        }
+      }
+
+      static const unsigned MAXSIZE = 3;
+
+      std::list<t_eph*> _eph;
     };
 
-    void translateCorr2Obs();
+    void translateCorr2Obs(std::vector<std::string>& errmsg);
 
     std::string            _ID;
@@ -86 +134 @@
     rtcm2::RTCM2_22           _msg22;
     rtcm2::RTCM2_2021         _msg2021;
-    std::map<std::string, t_ephPair*> _ephPair;
+    std::map<std::string, t_ephList*> _ephList;
 
-    typedef std::map<std::string, t_ephPair*> t_pairMap;
+    typedef std::map<std::string, t_ephList*> t_listMap;
 };