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

Timestamp:

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

Author:

mervart

Message:

BNC Multifrequency and PPPAR Client (initial version)

File:

• trunk/BNC/src/PPP/pppClient.cpp (modified) (12 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -117 +117 @@
 //////////////////////////////////////////////////////////////////////////////
 void t_pppClient::putOrbCorrections(const vector<t_orbCorr*>& corr) {
+  if (OPT->_logMode == t_pppOptions::normal && corr.size() > 0) {
+    LOG << "orbCorrections " << string(corr[0]->_time) << ' ' << corr.size() << endl;
+  }
   for (unsigned ii = 0; ii < corr.size(); ii++) {
     _ephPool->putOrbCorrection(new t_orbCorr(*corr[ii]));
@@ -125 +128 @@
 //////////////////////////////////////////////////////////////////////////////
 void t_pppClient::putClkCorrections(const vector<t_clkCorr*>& corr) {
+  if (OPT->_logMode == t_pppOptions::normal && corr.size() > 0) {
+    LOG << "clkCorrections " << string(corr[0]->_time) << ' ' << corr.size() << endl;
+  }
   for (unsigned ii = 0; ii < corr.size(); ii++) {
     _ephPool->putClkCorrection(new t_clkCorr(*corr[ii]));
@@ -133 +139 @@
 //////////////////////////////////////////////////////////////////////////////
 void t_pppClient::putCodeBiases(const vector<t_satCodeBias*>& biases) {
+  if (OPT->_logMode == t_pppOptions::normal && biases.size() > 0) {
+    LOG << "codeBiases     " << string(biases[0]->_time) << ' ' << biases.size() << endl;
+  }
+  set<char> systems;
   for (unsigned ii = 0; ii < biases.size(); ii++) {
-    _obsPool->putCodeBias(new t_satCodeBias(*biases[ii]));
+    t_satCodeBias* newBias = new t_satCodeBias(*biases[ii]);
+    char sys = newBias->_prn.system();
+    if (systems.find(sys) == systems.end()) {
+      _obsPool->clearCodeBiases(sys);
+      systems.insert(sys);
+    }
+    _obsPool->putCodeBias(newBias);
   }
 }
@@ -141 +157 @@
 //////////////////////////////////////////////////////////////////////////////
 void t_pppClient::putPhaseBiases(const vector<t_satPhaseBias*>& biases) {
+  if (OPT->_logMode == t_pppOptions::normal && biases.size() > 0) {
+    LOG << "phaseBiases    " << string(biases[0]->_time) << ' ' << biases.size() << endl;
+  }
+  set<char> systems;
   for (unsigned ii = 0; ii < biases.size(); ii++) {
-    _obsPool->putPhaseBias(new t_satPhaseBias(*biases[ii]));
+    t_satPhaseBias* newBias = new t_satPhaseBias(*biases[ii]);
+    char sys = newBias->_prn.system();
+    if (systems.find(sys) == systems.end()) {
+      _obsPool->clearPhaseBiases(sys);
+      systems.insert(sys);
+    }
+    _obsPool->putPhaseBias(newBias);
   }
 }
@@ -211 +237 @@
     }
   }
-/*
-  vector<t_pppSatObs*>::iterator it = obsVector.begin();
-  while (it != obsVector.end()) {
-    t_pppSatObs* satObs = *it;
-    satObs->printObsMinusComputed();
-    it++;
-  }
-*/
+
+  if (OPT->_logMode == t_pppOptions::all) {
+    vector<t_pppSatObs*>::iterator it = obsVector.begin();
+    while (it != obsVector.end()) {
+      t_pppSatObs* satObs = *it;
+      satObs->printObsMinusComputed();
+      it++;
+    }
+  }
   return pseudoObsIono;
 }
-
-//
-//////////////////////////////////////////////////////////////////////////////
-void t_pppClient::useObsWithCodeBiasesOnly(std::vector<t_pppSatObs*>& obsVector) {
-
-  vector<t_pppSatObs*>::iterator it = obsVector.begin();
-  while (it != obsVector.end()) {
-    t_pppSatObs* pppSatObs = *it;
-    bool codeBiasesAvailable = false;
-    if (pppSatObs->getCodeBias(pppSatObs->fType1()) &&
-        pppSatObs->getCodeBias(pppSatObs->fType2())) {
-        codeBiasesAvailable = true;
-    }
-    if (codeBiasesAvailable) {
-      ++it;
-    }
-    else {
-      it = obsVector.erase(it);
-      delete pppSatObs;
-    }
-  }
-  return;
-}
-
 
 // Compute the Bancroft position, check for blunders
@@ -251 +254 @@
                                   vector<t_pppSatObs*>& obsVector,
                                   ColumnVector& xyzc, bool print) {
-  t_lc::type tLC = t_lc::dummy;
+
   int  numBancroft = obsVector.size();
 
@@ -259 +262 @@
     for (unsigned ii = 0; ii < obsVector.size(); ii++) {
       const t_pppSatObs* satObs = obsVector.at(ii);
-      if (tLC == t_lc::dummy) {
-        if (satObs->isValid(t_lc::cIF)) {
-          tLC = t_lc::cIF;
-        }
-        else if (satObs->isValid(t_lc::c1)) {
-          tLC = t_lc::c1;
-        }
-        else if (satObs->isValid(t_lc::c2)) {
-          tLC = t_lc::c2;
-        }
-      }
-      if ( satObs->isValid(tLC) &&
+      t_lc LC = satObs->rangeLC();
+      if ( satObs->isValid(LC) &&
           (!satObs->modelSet() || satObs->eleSat() >= _opt->_minEle) ) {
         ++iObs;
@@ -276 +269 @@
         BB[iObs][1] = satObs->xc()[1];
         BB[iObs][2] = satObs->xc()[2];
-        BB[iObs][3] = satObs->obsValue(tLC) - satObs->cmpValueForBanc(tLC);
+        BB[iObs][3] = satObs->obsValue(LC) - satObs->cmpValueForBanc(LC);
       }
     }
@@ -297 +290 @@
     for (unsigned ii = 0; ii < obsVector.size(); ii++) {
       const t_pppSatObs* satObs = obsVector.at(ii);
-      if (satObs->isValid() &&
+      t_lc LC = satObs->rangeLC();
+      if (satObs->isValid(LC) &&
           (!satObs->modelSet() || satObs->eleSat() >= _opt->_minEle) ) {
         ColumnVector rr = satObs->xc().Rows(1,3) - xyzc.Rows(1,3);
-        double res = rr.NormFrobenius() - satObs->obsValue(tLC)
+        double res = rr.NormFrobenius() - satObs->obsValue(LC)
                    - (satObs->xc()[3] - xyzc[3]) * t_CST::c;
         if (fabs(res) > maxRes) {
@@ -354 +348 @@
 //
 //////////////////////////////////////////////////////////////////////////////
-void t_pppClient::finish(t_irc irc, int ind) {
+void t_pppClient::finish(t_irc irc, int /*ind*/) {
 #ifdef BNC_DEBUG_PPP
   LOG << "t_pppClient::finish(" << ind << "): " << irc << endl;
@@ -463 +457 @@
       }
     }
-    // use observations only if satellite code biases are available
-    /* ------------------------------------------------------------
-    if (!_opt->_corrMount.empty() {
-        useObsWithCodeBiasesOnly(_obsRover);
-    }*/
+
+    // Use observations only if satellite code biases are available
+    // ------------------------------------------------------------
+    if (_opt->ambRes()) {
+      useObsWithBiasesOnly(_obsRover);
+    }
 
     if (int(_obsRover.size()) < _opt->_minObs) {
@@ -613 +608 @@
 
 }
+
+//
+//////////////////////////////////////////////////////////////////////////////
+void t_pppClient::useObsWithBiasesOnly(vector<t_pppSatObs*>& obsVector) const {
+  vector<t_pppSatObs*>::iterator it = obsVector.begin();
+  while (it != obsVector.end()) {
+    t_pppSatObs* pppSatObs = *it;
+    if (pppSatObs->hasBiases()) {
+      ++it;
+    }
+    else {
+      it = obsVector.erase(it);
+      delete pppSatObs;
+    }
+  }
+}