Changeset 9545 in ntrip for trunk

Timestamp:

Nov 16, 2021, 1:58:13 PM (2 years ago)

Author:

stuerze

Message:

update regarding PPP

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (10 diffs)
• pppClient.h (modified) (1 diff)
• pppFilter.cpp (modified) (1 diff)
• pppParlist.cpp (modified) (3 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -277 +277 @@
     }
     if (iObs + 1 < _opt->_minObs) {
-      LOG << "t_pppClient::cmpBancroft not enough observations" << endl;
+      LOG << "t_pppClient::cmpBancroft not enough observations: " << iObs + 1  << endl;
       return failure;
     }
@@ -507 +507 @@
 //
 //////////////////////////////////////////////////////////////////////////////
-void t_pppClient::finish(t_irc irc) {
+void t_pppClient::finish(t_irc irc, int ind) {// LOG << "t_pppClient::finish(" << irc << ") " << ind << endl;
 
   clearObs();
@@ -535 +535 @@
   _output->_log = _log->str();
   delete _log; _log = new ostringstream();
+
+  return;
 }
 
@@ -604 +606 @@
         if(_filter->datumTransformation(_refSatMap) != success) {
           LOG << "t_pppFilter::datumTransformation() != success" << endl;
-          return finish(failure);
+          return finish(failure,1);
         }
         else {
@@ -614 +616 @@
       // ---------------------------------
       if (prepareObs(satObs, _obsRover, _epoTimeRover) != success) {
-        return finish(failure);
+        return finish(failure,2);
       }
 
@@ -627 +629 @@
         bool print = (iter == 2);
         if (cmpBancroft(_epoTimeRover, _obsRover, xyzc, print) != success) {
-          return finish(failure);
+          return finish(failure,3);
         }
         if (cmpModel(_staRover, xyzc, _obsRover) != success) {
-          return finish(failure);
-        }
+          return finish(failure,4);
+        }
+      }
+
+      if (int(_obsRover.size()) < _opt->_minObs) {
+        LOG << "t_pppClient::processEpoch not enough observations" << endl;
+        return finish(failure,5);
       }
 
       if (_opt->_refSatRequired) {
         if (handleRefSatellites(_obsRover) != success) {
-          return finish(failure);
+          return finish(failure,6);
         }
         if (_obsPool->refSatChanged()) {
@@ -653 +660 @@
       _pseudoObsIono = preparePseudoObs(_obsRover);
 
-      if (int(_obsRover.size()) < _opt->_minObs) {
-        LOG << "t_pppClient::processEpoch not enough observations" << endl;
-        return finish(failure);
-      }
-
       // Store last epoch of data
       // ------------------------
@@ -665 +667 @@
       // -----------------------
       if (_filter->processEpoch() != success) {
-        return finish(failure);
+        LOG << "filter->processEpoch() != success" << endl;
+        return finish(failure,7);
       }
 
@@ -672 +675 @@
       if (_obsPool->refSatChangeRequired() && //SLIP
           _opt->_obsModelType  != t_pppOptions::UncombPPP) {
+        LOG << "pppClient: _obsPool->refSatChangeRequired() " << endl;
         epochReProcessing = true;
         _obsPool->deleteLastEpoch();
@@ -689 +693 @@
   catch (Exception& exc) {
     LOG << exc.what() << endl;
-    return finish(failure);
+    return finish(failure,8);
   }
   catch (t_except msg) {
     LOG << msg.what() << endl;
-    return finish(failure);
+    return finish(failure,9);
   }
   catch (const char* msg) {
     LOG << msg << endl;
-    return finish(failure);
+    return finish(failure,10);
   }
   catch (...) {
     LOG << "unknown exception" << endl;
-    return finish(failure);
-  }
-
-  return finish(success);
+    return finish(failure,11);
+  }
+  return finish(success,12);
 }
 

trunk/BNC/src/PPP/pppClient.h

@@ -52 +52 @@
  private:
   void initOutput(t_output* output);
-  void finish(t_irc irc);
+  void finish(t_irc irc, int ind);
   void clearObs();
   t_irc prepareObs(const std::vector<t_satObs*>& satObs,

trunk/BNC/src/PPP/pppFilter.cpp

@@ -693 +693 @@
 
   if (OPT->_obsModelType == OPT->UncombPPP) {
+    _obsPool->putEpoch(_epoTime, allObs, peseudoObsIono, refSatMap);
     return success;
   }

trunk/BNC/src/PPP/pppParlist.cpp

@@ -448 +448 @@
 
     else if (par->type() == t_pppParam::amb) {
+      if (par->lastObsTime().valid() && (epoTime - par->lastObsTime() > 60.0)) {
+          remove = true;
+      }
       if (OPT->_obsModelType == OPT->DCMcodeBias ||
           OPT->_obsModelType == OPT->DCMphaseBias) {
@@ -453 +456 @@
         t_prn refPrn = (refSatMap[sys])->prn();
         if (par->lastObsTime().valid() && par->prn() == refPrn) {
-            remove = true;
-        }
-      }
-      else {
-        if (par->lastObsTime().valid() && (epoTime - par->lastObsTime() > 60.0)) {
             remove = true;
         }
@@ -875 +873 @@
         << endl;
   }
+  return;
 }