Changeset 10590 in ntrip for trunk/BNC

Timestamp:

Dec 12, 2024, 2:20:02 PM (7 days ago)

Author:

stuerze

Message:

changes regarding PPP

Location:

trunk/BNC/src

Files:

• PPP/pppFilter.cpp (modified) (3 diffs)
• PPP/pppParlist.cpp (modified) (1 diff)
• pppRun.cpp (modified) (4 diffs)

trunk/BNC/src/PPP/pppFilter.cpp

@@ -152 +152 @@
     // First-Design Matrix, Terms Observed-Computed, Weight Matrix
     // -----------------------------------------------------------
-    Matrix AA(maxObs, nPar);
+    Matrix AA(maxObs, nPar);   AA = 0.0;
     ColumnVector ll(maxObs);   ll = 0.0;
     DiagonalMatrix PP(maxObs); PP = 0.0;
@@ -266 +266 @@
       }
       if (par) {
-        resetAmb(obs->prn(), obsVector, maxOutlierLC, &QSav, &xSav);
+        if (par->ambResetCandidate()) {
+          resetAmb(obs->prn(), obsVector, maxOutlierLC, &QSav, &xSav);
+        }
+        else {
+          par->setAmbResetCandidate();
+          obs->setOutlier();
+        }
       }
       else {
@@ -386 +392 @@
         firstObsTime = lastObsTime : firstObsTime = par->firstObsTime();
       t_lc::type tLC = par->tLC();
-//   if (tLC != lc) {continue;}
+      if (tLC != lc) {continue;}
       LOG << string(_epoTime) << " RESET " << par->toString() << endl;
       delete par; par = new t_pppParam(t_pppParam::amb, prn, tLC, &obsVector);

trunk/BNC/src/PPP/pppParlist.cpp

@@ -431 +431 @@
   // Receiver Clocks
   // ---------------
-   if (_usedSystems['G']) {
+   //if (_usedSystems['G']) {
+   if (OPT->useSystem('G')) {
      required.push_back(new t_pppParam(t_pppParam::rClkG, t_prn(), t_lc::dummy));
    }
 
-   if (_usedSystems['R']) {
+   if (OPT->useSystem('R')) {
      required.push_back(new t_pppParam(t_pppParam::rClkR, t_prn(), t_lc::dummy));
    }
 
-   if (_usedSystems['E']) {
+   if (OPT->useSystem('E')) {
      required.push_back(new t_pppParam(t_pppParam::rClkE, t_prn(), t_lc::dummy));
    }
 
-   if (_usedSystems['C']) {
+   if (OPT->useSystem('C')) {
      required.push_back(new t_pppParam(t_pppParam::rClkC, t_prn(), t_lc::dummy));
    }

trunk/BNC/src/pppRun.cpp

@@ -277 +277 @@
     return;
   }
-
+/*
   int    currentWeek = 0;
   double currentSec  = 0.0;
   currentGPSWeeks(currentWeek, currentSec);
   bncTime currentTime(currentWeek, currentSec);
-
+*/
   // Loop over all observations (possible different epochs)
   // -----------------------------------------------------
@@ -290 +290 @@
     t_satObs*       newObs = new t_satObs(oldObs);
 
-    // Check regarding current time
+    /* Check regarding current time
     // ----------------------------
     if (OPT->_realTime && BNC_CORE->mode() != t_bncCore::batchPostProcessing ) {
@@ -299 +299 @@
       }
     }
-
+    */
     // Find the corresponding data epoch or create a new one
     // -----------------------------------------------------
@@ -330 +330 @@
   // Make sure the buffer does not grow beyond any limit
   // ---------------------------------------------------
-  const unsigned MAX_EPODATA_SIZE = 61;
+  const unsigned MAX_EPODATA_SIZE = 120;
   if (_epoData.size() > MAX_EPODATA_SIZE) {
     delete _epoData.front();