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

Timestamp:

Dec 3, 2025, 5:37:16 PM (4 weeks ago)

Author:

mervart

Message:

BNC Multifrequency and PPPAR Client (initial version)

File:

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

trunk/BNC/src/PPP/pppFilter.cpp

@@ -16 +16 @@
 
 #include <iostream>
+#include <sstream>
 #include <iomanip>
 #include <cmath>
@@ -28 +29 @@
 #include "pppStation.h"
 #include "pppClient.h"
+#include "ambres.h"
 
 using namespace BNC_PPP;
@@ -107 +109 @@
   }
 
-  // close epoch processing
+  // Dillution of Precision
   // ----------------------
   cmpDOP(allObs);
-  _parlist->printResult(_epoTime, _QFlt, _xFlt);
+  
+  // Ambiguity Resolution
+  // --------------------
+  if (OPT->ambRes()) {
+    AmbRes ambRes;
+    ostringstream msg;
+    ColumnVector    xFix     = _xFlt;
+    SymmetricMatrix QFix     = _QFlt;
+    double          fixRatio = 0.0;
+    ambRes.run(_epoTime, _parlist->params(), QFix, xFix, fixRatio, msg);
+    LOG << msg.str();
+    _parlist->printResult(_epoTime, QFix, xFix, fixRatio);
+  }
+
+  // Float Solution
+  // --------------
+  else {
+    _parlist->printResult(_epoTime, _QFlt, _xFlt);
+  }
+
   _lastEpoTimeOK = _epoTime; // remember time of last successful epoch processing
+
   return success;
 }
@@ -117 +139 @@
 // Process Selected LCs
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_pppFilter::processSystem(const vector<t_lc::type> &LCs,
+t_irc t_pppFilter::processSystem(const vector<t_lc>& LCs,
                                  const vector<t_pppSatObs*> &obsVector,
                                  bool pseudoObsIonoAvailable) {
@@ -158 +180 @@
     int iObs = -1;
     vector<t_pppSatObs*> usedObs;
-    vector<t_lc::type> usedTypes;
+    vector<t_lc>         usedTypes;
 
     // Real Observations
@@ -171 +193 @@
         nSat++;
         for (unsigned jj = 0; jj < usedLCs; jj++) {
-          const t_lc::type tLC = LCs[jj];
-          if (tLC == t_lc::GIM) {
+          const t_lc LC = LCs[jj];
+          if (LC._type == t_lc::GIM) {
+            continue;
+          }
+          if (LC._frq1 == t_frequency::G5 && !obs->isValid(LC)) {
             continue;
           }
           ++iObs;
           usedObs.push_back(obs);
-          usedTypes.push_back(tLC);
+          usedTypes.push_back(LC);
           for (unsigned iPar = 0; iPar < nPar; iPar++) {
             const t_pppParam *par = params[iPar];
-            AA[iObs][iPar] = par->partial(_epoTime, obs, tLC);
-          }
-
-          ll[iObs] = obs->obsValue(tLC) - obs->cmpValue(tLC) - DotProduct(_x0, AA.Row(iObs + 1));
-          PP[iObs] = 1.0 / (obs->sigma(tLC) * obs->sigma(tLC));
+            AA[iObs][iPar] = par->partial(_epoTime, obs, LC);
+          }
+
+          ll[iObs] = obs->obsValue(LC) - obs->cmpValue(LC) - DotProduct(_x0, AA.Row(iObs + 1));
+          PP[iObs] = 1.0 / (obs->sigma(LC) * obs->sigma(LC));
         }
       }
@@ -202 +227 @@
         if (!obs->outlier()) {
           for (unsigned jj = 0; jj < usedLCs; jj++) {
-            const t_lc::type tLC = LCs[jj];
-            if (tLC == t_lc::GIM) {
+            const t_lc LC = LCs[jj];
+            if (LC._type == t_lc::GIM) {
               ++iObs;
             } else {
@@ -209 +234 @@
             }
             usedObs.push_back(obs);
-            usedTypes.push_back(tLC);
+            usedTypes.push_back(LC);
             for (unsigned iPar = 0; iPar < nPar; iPar++) {
               const t_pppParam *par = params[iPar];
-              AA[iObs][iPar] = par->partial(_epoTime, obs, tLC);
+              AA[iObs][iPar] = par->partial(_epoTime, obs, LC);
             }
-            ll[iObs] = obs->obsValue(tLC) - obs->cmpValue(tLC) - DotProduct(_x0, AA.Row(iObs + 1));
-            PP[iObs] = 1.0 / (obs->sigma(tLC) * obs->sigma(tLC));
+            ll[iObs] = obs->obsValue(LC) - obs->cmpValue(LC) - DotProduct(_x0, AA.Row(iObs + 1));
+            PP[iObs] = 1.0 / (obs->sigma(LC) * obs->sigma(LC));
           }
         }
@@ -236 +261 @@
     double maxOutlier = 0.0;
     int maxOutlierIndex = -1;
-    t_lc::type maxOutlierLC = t_lc::dummy;
+    t_lc maxOutlierLC;
     for (unsigned ii = 0; ii < usedObs.size(); ii++) {
-      const t_lc::type tLC = usedTypes[ii];
+      const t_lc LC = usedTypes[ii];
       double res = fabs(vv[ii]);
-      if (res > usedObs[ii]->maxRes(tLC)) {
+      if (res > usedObs[ii]->maxRes(LC)) {
         if (res > fabs(maxOutlier)) {
           maxOutlier = vv[ii];
           maxOutlierIndex = ii;
-          maxOutlierLC = tLC;
+          maxOutlierLC = LC;
         }
       }
@@ -254 +279 @@
       t_pppSatObs *obs = usedObs[maxOutlierIndex];
       t_pppParam *par = 0;
-      LOG << epoTimeStr << " Outlier " << t_lc::toString(maxOutlierLC) << ' '
+      LOG << epoTimeStr << " Outlier " << maxOutlierLC.toString() << ' '
           << obs->prn().toString() << ' ' << setw(8) << setprecision(4)
           << maxOutlier << endl;
       for (unsigned iPar = 0; iPar < nPar; iPar++) {
-        t_pppParam *hlp = params[iPar];
+        t_pppParam* hlp = params[iPar];
         if (hlp->type() == t_pppParam::amb &&
             hlp->prn()  == obs->prn() &&
-            hlp->tLC()  == usedTypes[maxOutlierIndex]) {
+            hlp->LC()   == usedTypes[maxOutlierIndex]) {
           par = hlp;
         }
@@ -277 +302 @@
         for (unsigned jj = 0; jj < LCs.size(); jj++) {
           for (unsigned ii = 0; ii < usedObs.size(); ii++) {
-            const t_lc::type tLC = usedTypes[ii];
-            t_pppSatObs *obs = usedObs[ii];
-            if (tLC == LCs[jj]) {
-              obs->setRes(tLC, vv[ii]);
+            const t_lc LC = usedTypes[ii];
+            t_pppSatObs* obs = usedObs[ii];
+            if (LC == LCs[jj]) {
+              obs->setRes(LC, vv[ii]);
               LOG << epoTimeStr << " RES " << left << setw(3)
-                  << t_lc::toString(tLC) << right << ' '
+                  << LC.toString() << right << ' '
                   << obs->prn().toString() << ' '
                   << setw(8) << setprecision(4) << vv[ii] << endl;
@@ -296 +321 @@
 // Cycle-Slip Detection
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_pppFilter::detectCycleSlips(const vector<t_lc::type> &LCs,
+t_irc t_pppFilter::detectCycleSlips(const vector<t_lc>& LCs,
                                     const vector<t_pppSatObs*> &obsVector) {
 
@@ -309 +334 @@
   SLIP *= fac;
   string epoTimeStr = string(_epoTime);
-  const vector<t_pppParam*> &params = _parlist->params();
 
   for (unsigned ii = 0; ii < LCs.size(); ii++) {
-    const t_lc::type &tLC = LCs[ii];
-    if (t_lc::includesPhase(tLC)) {
+    const t_lc& LC = LCs[ii];
+    if (LC.includesPhase()) {
       for (unsigned iObs = 0; iObs < obsVector.size(); iObs++) {
         const t_pppSatObs *obs = obsVector[iObs];
@@ -343 +367 @@
         // --------
         if (slip) {
-          resetAmb(obs->prn(), obsVector, tLC);
-        }
-
-        // Check Pre-Fit Residuals
-        /* -----------------------
-        else {
-          ColumnVector AA(params.size());
-          for (unsigned iPar = 0; iPar < params.size(); iPar++) {
-            const t_pppParam* par = params[iPar];
-            AA[iPar] = par->partial(_epoTime, obs, tLC);
-          }
-          double ll = obs->obsValue(tLC) - obs->cmpValue(tLC) - DotProduct(_x0, AA);
-          double vv = DotProduct(AA, _xFlt) - ll;
-
-          if (fabs(vv) > SLIP) {
-            LOG << epoTimeStr << " cycle slip detected " << t_lc::toString(tLC) << ' '
-                << obs->prn().toString() << ' ' << setw(8) << setprecision(4) << vv << endl;
-            resetAmb(obs->prn(), obsVector, tLC);
-          }
-        }*/
+          resetAmb(obs->prn(), obsVector, t_lc());
+        }
       }
     }
@@ -371 +377 @@
 // Reset Ambiguity Parameter (cycle slip)
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_pppFilter::resetAmb(const t_prn prn, const vector<t_pppSatObs*> &obsVector, t_lc::type lc,
+t_irc t_pppFilter::resetAmb(const t_prn prn, const vector<t_pppSatObs*> &obsVector, t_lc lc,
                             SymmetricMatrix *QSav, ColumnVector *xSav) {
 
@@ -386 +392 @@
       (par->firstObsTime().undef()) ?
         firstObsTime = lastObsTime : firstObsTime = par->firstObsTime();
-      t_lc::type tLC = par->tLC();
-      if (tLC != lc) {continue;}
+      t_lc LC = par->LC();
+      if (lc.valid() && LC != lc) {continue;}
       LOG << string(_epoTime) << " RESET " << par->toString() << endl;
-      delete par; par = new t_pppParam(t_pppParam::amb, prn, tLC, &obsVector);
+      delete par; par = new t_pppParam(t_pppParam::amb, prn, LC, &obsVector);
       par->setIndex(ind);
       par->setFirstObsTime(firstObsTime);
@@ -436 +442 @@
         for (unsigned iPar = 0; iPar < numPar; iPar++) {
           t_pppParam* par = _parlist->params()[iPar];
-          AA[_numSat - 1][iPar] = par->partial(_epoTime, obs, t_lc::c1);
+          AA[_numSat - 1][iPar] = par->partial(_epoTime, obs, obs->rangeLC());
           if      (par->type() == t_pppParam::crdX) {
             parX = par;