Changeset 10018 in ntrip

Timestamp:

Mar 22, 2023, 10:28:06 PM (20 months ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (5 diffs)
• pppFilter.cpp (modified) (7 diffs)
• pppFilter.h (modified) (3 diffs)
• pppObsPool.cpp (modified) (1 diff)
• pppParlist.cpp (modified) (8 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -568 +568 @@
     if (OPT->_obsModelType == OPT->DCMcodeBias ||
         OPT->_obsModelType == OPT->DCMphaseBias) {
-      if (ind == 1 || ind > 7) {
+      if (ind == 1 || ind == 6 || ind > 7) {
         reset();
       }
+      //else {_filter->restoreState(ind);}
     }
   }
@@ -640 +641 @@
     do {
       _numEpoProcessing++;
-#ifdef BNC_DEBUG_PPP
-      LOG << "_numEpoProcessing " << _numEpoProcessing  << endl;
-#endif
       if (_obsPool->refSatChanged()) {
         if(_filter->datumTransformation(_refSatMap) != success) {
@@ -678 +676 @@
       }
 
+      if (int(_obsRover.size()) < _opt->_minObs) {
+        LOG << "t_pppClient::processEpoch not enough observations" << endl;
+        return finish(failure,5);
+      }
+
       if (_opt->_refSatRequired) {
         if (handleRefSatellites(_obsRover) != success) {
@@ -683 +686 @@
         }
         if (_obsPool->refSatChanged()) {
-          LOG << "t_pppFilter: refSatChanged()" << endl;
+          if (_numEpoProcessing >1 &&
+              (OPT->_obsModelType == OPT->DCMcodeBias ||
+               OPT->_obsModelType == OPT->DCMphaseBias)) {
+            _obsPool->deleteLastEpoch();
+          }
           epochReProcessing = true;
           continue;
         }
-      }
-
-      if (int(_obsRover.size()) < _opt->_minObs) {
-        LOG << "t_pppClient::processEpoch not enough observations" << endl;
-        return finish(failure,5);
       }
 
@@ -719 +721 @@
         LOG << "pppClient: _obsPool->refSatChangeRequired() " << endl;
         epochReProcessing = true;
-        _obsPool->deleteLastEpoch();
         _filter->restoreState(0);
         setHistoricalRefSats();
       }
       else {
-        epochReProcessing = false;
-        if (OPT->_obsModelType == OPT->DCMcodeBias ||
-            OPT->_obsModelType == OPT->DCMphaseBias) {
-          _filter->rememberState(0);
-        }
+         epochReProcessing = false;
+         if (OPT->_obsModelType == OPT->DCMcodeBias ||
+             OPT->_obsModelType == OPT->DCMphaseBias) {
+           _filter->rememberState(0);
+         }
       }
     } while (epochReProcessing);

trunk/BNC/src/PPP/pppFilter.cpp

@@ -83 +83 @@
   if (OPT->_obsModelType == OPT->DCMcodeBias ||
       OPT->_obsModelType == OPT->DCMphaseBias) {
-    _parlist.printParams(_epoTime);
+//    _parlist.printParams(_epoTime);
   }
 #endif
@@ -100 +100 @@
       }
     }
-    if (num < OPT->_minObs) {
-      setNeuNoiseToZero = true;
-    }
+//    if (num < OPT->_minObs) {
+//      setNeuNoiseToZero = true;
+//    }
   }
   setStateVectorAndVarCovMatrix(xFltOld, QFltOld, setNeuNoiseToZero);
@@ -132 +132 @@
         _xFlt = xFltOld;
         _QFlt = QFltOld;
-        _obsPool->deleteLastEpoch();
-        restoreState(2);
+        restoreState(1);
         return failure;
       }
@@ -177 +176 @@
         _xFlt = xFltOld;
         _QFlt = QFltOld;
-        _obsPool->deleteLastEpoch();
-        restoreState(3);
+        restoreState(2);
       }
       return failure;
@@ -277 +275 @@
     // Check number of observations
     // ----------------------------
-    if (iObs == -1) {
-      LOG << " number of observations == " << iObs + 1 << "\n";
+    if ((iObs +1) < OPT->_minObs) {
+      LOG << "t_pppFilter::processSystem not enough observations: " << iObs + 1 << "\n";
       if (preProcessing) {
         _obsPool->setRefSatChangeRequired(sys, true);
@@ -363 +361 @@
       if (preProcessing) {
         if (obs->prn() == refPrn) {
-          LOG << epoTimeStr << " Outlier ("
-              << ((preProcessing) ? "pre-processing) " : "fin-processing) ")
-              << t_lc::toString(maxOutlierLC) << ' ' << obs->prn().toString()
-              << ' ' << setw(8) << setprecision(4) << maxOutlier << endl;
-          _obsPool->setRefSatChangeRequired(sys, true);
-          break;
-        } else {
-          obs->setOutlier();
-        }
-      } else {    // fin-processing
-        LOG << epoTimeStr << " Outlier " << t_lc::toString(maxOutlierLC) << ' '
-            << obs->prn().toString() << ' ' << setw(8) << setprecision(4)
-            << maxOutlier << endl;
-        if (par) {
-          resetAmb(par->prn(), obsVector, maxOutlierLC, &QSav, &xSav);
+            LOG << epoTimeStr << " Outlier ("
+                << ((preProcessing) ? "pre-processing) " : "fin-processing) ")
+                << t_lc::toString(maxOutlierLC) << ' ' << obs->prn().toString()
+                << ' ' << setw(8) << setprecision(4) << maxOutlier << endl;
+            _obsPool->setRefSatChangeRequired(sys, true);
+            break;
         }
         else {
           obs->setOutlier();
+        }
+      } else {    // fin-processing
+        if (obs->prn() != refPrn) {
+          LOG << epoTimeStr << " Outlier " << t_lc::toString(maxOutlierLC) << ' '
+              << obs->prn().toString() << ' ' << setw(8) << setprecision(4)
+              << maxOutlier << endl;
+          if (par) {
+            resetAmb(par->prn(), obsVector, maxOutlierLC, &QSav, &xSav);
+          }
+          else {
+            obs->setOutlier();
+          }
         }
       }
@@ -715 +716 @@
   }
 #ifdef BNC_DEBUG_PPP
-  _parlist.printParams(_epoTime);
+  //_parlist.printParams(_epoTime);
 #endif
 

trunk/BNC/src/PPP/pppFilter.h

@@ -31 +31 @@
   void restoreState(int num)  {
 #ifdef BNC_DEBUG_PPP
-    LOG << "Restore parameter from last epoch    : _parlist = _parlist_sav ("<<  num << ")\n";
+    LOG << "Restore parameter from last successful epoch: _parlist = _parlist_sav ("<<  num << ")\n";
 #endif
     _QFlt    = _QFlt_sav;
@@ -38 +38 @@
   void rememberState(int num) {
 #ifdef BNC_DEBUG_PPP
-    LOG << "Remember parameters from last epoch  : _parlist_sav = _parlist ("<<  num << ")\n";
+    LOG << "Remember parameters from successful epoch   : _parlist_sav = _parlist ("<<  num << ")\n";
 #endif
     _QFlt_sav    = _QFlt;
@@ -141 +141 @@
         Prep = &_AA1;
       }
-
       if (AA.Ncols() != _numPar) {
         LOG << "t_pppFilter::prepareAA: AA.Ncols() != _numPar: " << AA.Ncols() << " != " << _numPar << "\n RETURN FAILURE" <<  std::endl;

trunk/BNC/src/PPP/pppObsPool.cpp

@@ -131 +131 @@
 
   if (!_epochs.empty()) {
+    //LOG << " " << _epochs.back()->epoTime().timestr().c_str() << endl;
     delete _epochs.back();
     _epochs.pop_back();

trunk/BNC/src/PPP/pppParlist.cpp

@@ -465 +465 @@
     if (remove) {
 #ifdef BNC_DEBUG_PPP
-      LOG << "remove0 " << par->toString() << std::endl;
+//      LOG << "remove0 " << par->toString() << std::endl;
 #endif
       delete par;
@@ -521 +521 @@
           (!par->lastObsTime().valid() || (epoTime - par->lastObsTime() > 0.0))) {
 #ifdef BNC_DEBUG_PPP
-        LOG << "remove1 " << par->toString() << std::endl;
+//        LOG << "remove1 " << par->toString() << std::endl;
 #endif
         lostSats.append(par->prn());
@@ -534 +534 @@
                 par->type() == t_pppParam::pBiasG2) && !usedSystems().contains('G')) {
 #ifdef BNC_DEBUG_PPP
-        LOG << "remove1 " << par->toString() << std::endl;
+        //LOG << "remove1 " << par->toString() << std::endl;
 #endif
         delete par;
@@ -544 +544 @@
                 par->type() == t_pppParam::pBiasR2) && !usedSystems().contains('R')) {
 #ifdef BNC_DEBUG_PPP
-        LOG << "remove1 " << par->toString() << std::endl;
+//        LOG << "remove1 " << par->toString() << std::endl;
 #endif
         delete par;
@@ -554 +554 @@
                 par->type() == t_pppParam::pBiasE2) && !usedSystems().contains('E')) {
 #ifdef BNC_DEBUG_PPP
-        LOG << "remove1 " << par->toString() << std::endl;
+//        LOG << "remove1 " << par->toString() << std::endl;
 #endif
         delete par;
@@ -564 +564 @@
                 par->type() == t_pppParam::pBiasC2) && !usedSystems().contains('C')) {
 #ifdef BNC_DEBUG_PPP
-        LOG << "remove1 " << par->toString() << std::endl;
+//        LOG << "remove1 " << par->toString() << std::endl;
 #endif
         delete par;
@@ -581 +581 @@
           (lostSats.contains(par->prn()) || (epoTime - par->lastObsTime() > 0.0))) {
 #ifdef BNC_DEBUG_PPP
-        LOG << "remove1 " << par->toString() << std::endl;
+        //LOG << "remove1 " << par->toString() << std::endl;
 #endif
         delete par;
@@ -761 +761 @@
     else {
 #ifdef BNC_DEBUG_PPP
-      LOG << "push_back  parReq " << parReq->toString() << std::endl;
+//      LOG << "push_back  parReq " << parReq->toString() << std::endl;
 #endif
       _params.push_back(parReq);