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

Timestamp:

May 18, 2021, 5:15:10 PM (3 years ago)

Author:

stuerze

Message:

update regarding PPP

File:

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

trunk/BNC/src/PPP/pppFilter.cpp

@@ -130 +130 @@
       OPT->_obsModelType == OPT->DCMphaseBias) {
     preProcessing = true;
-    unsigned usableSys = 0;
-    for (unsigned iSys = 0; iSys < OPT->systems().size(); iSys++) {
-      char sys = OPT->systems()[iSys];
+    QList<char>& usedSystems = _parlist->usedSystems();
+    for (int iSys = 0; iSys < usedSystems.size(); iSys++) {
+      char sys = usedSystems[iSys];
       _refPrn = (_obsPool->getRefSatMapElement(sys))->prn();
      vector<t_pppSatObs*> obsVector;
@@ -140 +140 @@
         }
       }
-      if (!obsVector.size()) {
-        continue;
-      }
-      else {
-        ++usableSys;
-        if (usableSys == 1) {
-          _datumTrafo->setFirstSystem(sys);
-        }
+      if (iSys == 0) {
+        _datumTrafo->setFirstSystem(sys);
       }
       if (processSystem(OPT->LCs(sys), obsVector, _refPrn,
@@ -171 +165 @@
   // ------------------------------------
   preProcessing = false;
-  unsigned usableSys = 0;
-  for (unsigned iSys = 0; iSys < OPT->systems().size(); iSys++) {
-    char sys = OPT->systems()[iSys];
+  QList<char>& usedSystems = _parlist-> usedSystems();
+  for (int iSys = 0; iSys < usedSystems.size(); iSys++) {
+    char sys = usedSystems[iSys];
     if (OPT->_refSatRequired) {
       _refPrn = (_obsPool->getRefSatMapElement(sys))->prn();
@@ -188 +182 @@
       }
     }
-    if (!num) {
-      continue;
-    }
-    else {
-      ++usableSys;
-      if (usableSys == 1 &&
-          OPT->_obsModelType == OPT->UncombPPP) {
-        _datumTrafo->setFirstSystem(sys);
-      }
+    if (iSys == 0 && OPT->_obsModelType == OPT->UncombPPP) {
+      _datumTrafo->setFirstSystem(sys);
     }
     LOG << epoTimeStr << " SATNUM " << sys << ' ' << right << setw(2) << num << endl;
@@ -299 +286 @@
           PP[iObs] = 1.0 / (obs->sigma(tLC) * obs->sigma(tLC));
         }
+      }
+    }
+    if (OPT->_obsModelType == OPT->DCMcodeBias ||
+        OPT->_obsModelType == OPT->DCMphaseBias) {
+      if (iObs < 2) { // TODO SATNUM => usableSys has to be removed 
+        return failure;
       }
     }
@@ -394 +387 @@
       t_pppSatObs* obs = usedObs[maxOutlierIndex];
       t_pppParam* par = 0;
-#ifdef BNC_DEBUG_PPP
       LOG << epoTimeStr << " Outlier ("
           << ((preProcessing) ? "pre-processing) " : "fin-processing) ") << t_lc::toString(maxOutlierLC) << ' '
           << obs->prn().toString()                        << ' '
           << setw(8) << setprecision(4) << maxOutlier << endl;
-#endif
       for (unsigned iPar = 0; iPar < params.size(); iPar++) {
         t_pppParam* hlp = params[iPar];
@@ -710 +701 @@
   // =============================================================
   if (resetRefSatellitesLastEpoch(allObs) != true) {
-    LOG  << "resetRefSatellitesLastEpoch = failure" << endl;
-    return failure;
+    LOG  << "refsatChange required" << endl;
+    return success;
   }
 
@@ -725 +716 @@
   }
   vector<t_pppParam*>& params = parlist->params();
+  unsigned nPar = parlist->nPar();
 #ifdef BNC_DEBUG_PPP
   LOG << " parameters of last epoch" << endl;
-  for (unsigned iPar = 0; iPar < params.size(); iPar++) {
+  for (unsigned iPar = 0; iPar < nPar; iPar++) {
     LOG << params[iPar]->toString() << "\t\t" << endl;
   }
 #endif
-  unsigned nPar = parlist->nPar();
-  unsigned usableSys = 0;
-  for (unsigned iSys = 0; iSys < OPT->systems().size(); iSys++) {
-    char sys = OPT->systems()[iSys];
+  QList<char>& usedSystems = _parlist->usedSystems();
+  for (int iSys = 0; iSys < usedSystems.size(); iSys++) {
+    char sys = usedSystems[iSys];
     t_prn refPrn = (_obsPool->getRefSatMapElement(sys))->prn();
     vector<t_pppSatObs*> obsVector;
@@ -742 +733 @@
       }
     }
-    if (!obsVector.size()) {
-      continue;
-    }
-    else {
-      ++usableSys;
-      if (usableSys == 1) {
-        _datumTrafo->setFirstSystem(sys);
-      }
+    if (iSys == 0) {
+      _datumTrafo->setFirstSystem(sys);
     }
     vector<t_lc::type> LCs = OPT->LCs(sys);
@@ -839 +824 @@
   // Reset Ambiguities after Datum Transformation
   // ============================================
-  for (unsigned iSys = 0; iSys < OPT->systems().size(); iSys++) {
-    char sys = OPT->systems()[iSys];
+  for (int iSys = 0; iSys < usedSystems.size(); iSys++) {
+    char sys = usedSystems[iSys];
     t_prn refPrnOld = _obsPool->getRefSatMapElementLastEpoch(sys);
     t_prn refPrnNew = (_obsPool->getRefSatMapElement(sys))->prn();
@@ -868 +853 @@
                                           bool pseudoObsIono) {
   unsigned trafoObs = 0;
-  for (unsigned iSys = 0; iSys < OPT->systems().size(); iSys++) {
-    char sys = OPT->systems()[iSys];
+  QList<char>& usedSystems = _parlist-> usedSystems();
+  for (int iSys = 0; iSys < usedSystems.size(); iSys++) {
+    char sys = usedSystems[iSys];
     int satNum = 0;
     for (unsigned jj = 0; jj < allObs.size(); jj++) {
@@ -875 +861 @@
         satNum++;
       }
-    }
-    if (!satNum) {
-      continue;
     }
     // all LCs
@@ -905 +888 @@
 //////////////////////////////////////////////////////////////////////////////
 bool t_pppFilter::resetRefSatellitesLastEpoch(std::vector<t_pppSatObs*>& obsVector) {
-
-  bool resetRefSat = false;
+  bool resetRefSat;
   // reference satellite definition per system
-  for (unsigned iSys = 0; iSys < OPT->systems().size(); iSys++) {
-    char sys = OPT->systems()[iSys];
+  QList<char>& usedSystems = _parlist-> usedSystems();
+  for (int iSys = 0; iSys < usedSystems.size(); iSys++) {
+    resetRefSat = false;
+    char sys = usedSystems[iSys];
     t_pppRefSat* refSat = _obsPool->getRefSatMapElement(sys);
     t_prn newPrn = refSat->prn();
@@ -928 +912 @@
      it++;
     }
+    if (!resetRefSat) {
+      _obsPool->setRefSatChangeRequired(sys, true);
+      return resetRefSat;
+    }
   }
   return resetRefSat;