Changeset 9527 in ntrip for trunk/BNC/src/PPP/pppParlist.cpp

Timestamp:

Nov 2, 2021, 5:00:00 PM (2 years ago)

Author:

stuerze

Message:

update regarding PPP

File:

• trunk/BNC/src/PPP/pppParlist.cpp (modified) (4 diffs)

trunk/BNC/src/PPP/pppParlist.cpp

@@ -452 +452 @@
         char sys = par->prn().system();
         t_prn refPrn = (refSatMap[sys])->prn();
-        if (par->lastObsTime().valid() &&
-            ((epoTime - par->lastObsTime() > 1.0) || (par->prn() == refPrn))) {
+        if (par->lastObsTime().valid() && par->prn() == refPrn) {
             remove = true;
         }
@@ -465 +464 @@
 
     else if (par->type() == t_pppParam::ion) {
-      if (OPT->_obsModelType == OPT->DCMcodeBias ||
-          OPT->_obsModelType == OPT->DCMphaseBias) {
-        if (par->lastObsTime().valid() && (epoTime - par->lastObsTime() > 1.0)) {
-            remove = true;
-        }
-      }
-      else {
-        if (par->lastObsTime().valid() && (epoTime - par->lastObsTime() > 60.0)) {
-            remove = true;
-        }
+      if (par->lastObsTime().valid() && (epoTime - par->lastObsTime() > 60.0)) {
+          remove = true;
       }
     }
     if (remove) {
 #ifdef BNC_DEBUG_PPP
-      LOG << "remove " << par->toString() << std::endl;
+      LOG << "remove0 " << par->toString() << std::endl;
 #endif
       delete par;
@@ -513 +504 @@
   }
 
-  // Check if ambiguity parameters have observations
-  // -----------------------------------------------
+
   if (OPT->_obsModelType == OPT->DCMcodeBias ||
       OPT->_obsModelType == OPT->DCMphaseBias) {
+    // Check if ambiguity parameters have observations
+    // -----------------------------------------------
     vector<t_pppParam*>::iterator it = _params.begin();
+    QList<t_prn> lostSats;
     while (it != _params.end()) {
       t_pppParam* par = *it;
-      bool remove = false;
-      if (par->type() == t_pppParam::amb && !par->lastObsTime().valid()) {
-        remove = true;
-      }
-      if (remove) {
+      if ((par->type() == t_pppParam::amb) &&
+          (!par->lastObsTime().valid() || epoTime - par->lastObsTime() == 1.0)) {
 #ifdef BNC_DEBUG_PPP
-        LOG << "remove " << par->toString() << std::endl;
+        LOG << "remove1 " << par->toString() << std::endl;
 #endif
+        lostSats.append(par->prn());
+        delete par;
+        it = _params.erase(it);
+      }
+      else {
+        ++it;
+      }
+    }
+    // remove respective iono parameters
+    // ---------------------------------
+    it = _params.begin();
+    while (it != _params.end()) {
+      t_pppParam* par = *it;
+      if ((par->type() == t_pppParam::ion) &&
+          (lostSats.contains(par->prn()) || epoTime - par->lastObsTime() == 1.0)) {
+    #ifdef BNC_DEBUG_PPP
+        LOG << "remove1 " << par->toString() << std::endl;
+    #endif
         delete par;
         it = _params.erase(it);
@@ -828 +836 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-void t_pppParlist::printParams() {
+void t_pppParlist::printParams(const bncTime& epoTime) {
 
   for (unsigned iPar = 0; iPar < _params.size(); iPar++) {
-    LOG << "t_pppFilter::processEpoch par_cur " << _params[iPar]->toString()
-        << "  lastObsTime().valid() " << _params[iPar]->lastObsTime().valid() << endl;
-  }
-}
-
+    LOG << _params[iPar]->toString()
+        << "\t  lastObsTime().valid() \t" << _params[iPar]->lastObsTime().valid()
+        << "\t  epoTime - par->lastObsTime() \t" << (epoTime - _params[iPar]->lastObsTime())
+        << endl;
+  }
+}
+