Changeset 9527 in ntrip

Timestamp:

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

Author:

stuerze

Message:

update regarding PPP

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (4 diffs)
• pppFilter.cpp (modified) (10 diffs)
• pppFilter.h (modified) (2 diffs)
• pppParlist.cpp (modified) (4 diffs)
• pppParlist.h (modified) (1 diff)

trunk/BNC/src/PPP/pppClient.cpp

@@ -617 +617 @@
         else {
           LOG << "t_pppFilter::datumTransformation() == success" << endl;
+          _filter->rememberState(1);
         }
       }
@@ -648 +649 @@
         if (_obsPool->refSatChanged()) {
           LOG << "t_pppFilter: refSatChanged()" << endl;
-            epochReProcessing = true;
-            continue;
+          epochReProcessing = true;
+          continue;
         }
       }
@@ -682 +683 @@
         epochReProcessing = true;
         _obsPool->deleteLastEpoch();
+        _filter->restoreState(0);
         setHistoricalRefSats();
       }
       else {
         epochReProcessing = false;
+        _filter->rememberState(0);
       }
 
@@ -879 +882 @@
   t_pppObsPool::t_epoch* epoch = _obsPool->lastEpoch();
   const QMap<char, t_pppRefSat*>& refSatMapLastEpoch = epoch->refSatMap();
-  
+
   QMapIterator<char, t_pppRefSat*> it(_refSatMap);
   while (it.hasNext()) {

trunk/BNC/src/PPP/pppFilter.cpp

@@ -73 +73 @@
 
   const QMap<char, t_pppRefSat*>& refSatMap = epoch->refSatMap();
-
-  if (OPT->_obsModelType == OPT->DCMcodeBias ||
-      OPT->_obsModelType == OPT->DCMphaseBias) {
-    rememberState();
-  }
-
   //--
   // Set Parameters
@@ -85 +79 @@
   }
 
+  if (OPT->_obsModelType == OPT->DCMcodeBias ||
+      OPT->_obsModelType == OPT->DCMphaseBias) {
 #ifdef BNC_DEBUG_PPP
-  _parlist.printParams();
+  LOG << "processEpoch: printParams after set" << endl;
+  _parlist.printParams(_epoTime);
 #endif
-
+  }
   // Status Vector, Variance-Covariance Matrix
   // -----------------------------------------
@@ -94 +91 @@
   SymmetricMatrix QFltOld = _QFlt;
   setStateVectorAndVarCovMatrix(xFltOld, QFltOld);
-
 
   // Pre-Process Satellite Systems separately
@@ -122 +118 @@
         _xFlt = xFltOld;
         _QFlt = QFltOld;
+        restoreState(2);
         return failure;
       }
@@ -130 +127 @@
       _xFlt = xFltOld;
       _QFlt = QFltOld;
-      restoreState();
       return success;
     }
@@ -709 +705 @@
   // =============================================================
   if (resetRefSatellitesLastEpoch(allObs, refSatMap, refSatMapLastEpoch) != true) {
-    LOG  << "refsatChange required" << endl;
+    LOG  << "datumTransformation: refsatChange required" << endl;
     return success;
   }
@@ -724 +720 @@
 
 #ifdef BNC_DEBUG_PPP
-  _parlist.printParams();
+  LOG << "datumTransformation: printParams after set" << endl;
+  _parlist.printParams(_epoTime);
 #endif
 
@@ -812 +809 @@
   // ====================
 #ifdef BNC_DEBUG_PPP
-      LOG << "AA1\n"; _datumTrafo->printMatrix(_datumTrafo->AA1(), _datumTrafo->numObs(), _datumTrafo->numPar());
-      LOG << "AA2\n"; _datumTrafo->printMatrix(_datumTrafo->AA2(), _datumTrafo->numObs(), _datumTrafo->numPar());
+      //LOG << "AA1\n"; _datumTrafo->printMatrix(_datumTrafo->AA1(), _datumTrafo->numObs(), _datumTrafo->numPar());
+      //LOG << "AA2\n"; _datumTrafo->printMatrix(_datumTrafo->AA2(), _datumTrafo->numObs(), _datumTrafo->numPar());
 #endif
   if(_datumTrafo->computeTrafoMatrix() != success) {
@@ -828 +825 @@
 
 #ifdef BNC_DEBUG_PPP
-  LOG << "xFltOld:\n" << xFltOld << endl;
-  LOG << "xFlt   :\n" << _xFlt   << endl;
+  //LOG << "xFltOld:\n" << xFltOld << endl;
+  //LOG << "xFlt   :\n" << _xFlt   << endl;
 #endif
 
@@ -853 +850 @@
 
   _obsPool->putEpoch(_epoTime, allObs, peseudoObsIono, refSatMap);
-
-  rememberState();
 
   return success;

trunk/BNC/src/PPP/pppFilter.h

@@ -29 +29 @@
   void initDatumTransformation(const std::vector<t_pppSatObs*>& allObs, bool pseudoObsIono);
   unsigned setTrafoObs();
-  void restoreState()  {    LOG << "restore parameter from last epoch: _parlist = _parlist_old" << endl;
+  void restoreState(int num)  {    LOG << "Restore parameter from last epoch    : _parlist = _parlist_sav ("<<  num << ")\n";
     _QFlt    = _QFlt_sav;
     _parlist = _parlist_sav;
   }
-  void rememberState() {    LOG << "Remember parameters from epoch before: _parlist_old = _parlist" << endl;
+  void rememberState(int num) {    LOG << "Remember parameters from epoch before: _parlist_sav = _parlist ("<<  num << ")\n";
     _QFlt_sav    = _QFlt;
     _parlist_sav = _parlist;
@@ -128 +128 @@
       _D21.ReSize(_numPar, _numPar); _D21 = 0.0;
     }
-    t_irc prepareAA(const Matrix& AA, int ind) {
+    t_irc prepareAA(const Matrix& AA, int ind) {//LOG << "prepare AA" << ind << "\n";
       Matrix* Prep = &_AA2;
       if (ind == 1) {

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;
+  }
+}
+

trunk/BNC/src/PPP/pppParlist.h

@@ -113 +113 @@
   void printResult(const bncTime& epoTime, const SymmetricMatrix& QQ,
                    const ColumnVector& xx) const;
-  void printParams();
+  void printParams(const bncTime& epoTime);
 
  private: