Changeset 10018 in ntrip for trunk/BNC/src/PPP/pppFilter.cpp

Timestamp:

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

Author:

stuerze

Message:

minor changes

File:

• trunk/BNC/src/PPP/pppFilter.cpp (modified) (7 diffs)

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