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

Timestamp:

Oct 6, 2021, 10:50:34 PM (3 years ago)

Author:

stuerze

Message:

some changes regarding PPP

File:

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

trunk/BNC/src/PPP/pppClient.cpp

@@ -69 +69 @@
   if (_opt->_refSatRequired) {
     for (unsigned iSys = 0; iSys < _opt->systems().size(); iSys++) {
-      char system = _opt->systems()[iSys];
-      _obsPool->initRefSatMapElement(system);
+      char sys = _opt->systems()[iSys];
+      _refSatMap[sys] = new t_pppRefSat();
     }
   }
@@ -94 +94 @@
   delete _tides;
   clearObs();
+  QMapIterator<char, t_pppRefSat*> it(_refSatMap);
+  while (it.hasNext()) {
+    it.next();
+    delete it.value();
+  }
+  _refSatMap.clear();
 }
 
@@ -216 +222 @@
     while (it != obsVector.end()) {
       t_pppSatObs* satObs = *it;
-      char system = satObs->prn().system();
-      t_pppRefSat* refSat = _obsPool->getRefSatMapElement(system);
+      char sys = satObs->prn().system();
+      t_pppRefSat* refSat = _refSatMap[sys];
       double stecRef = refSat->stecValue();
       if (stecRef && !satObs->isReference()) {
@@ -605 +611 @@
 #endif
       if (_obsPool->refSatChanged()) {
-        if(_filter->datumTransformation() != success) {
-          LOG << "pppFilter::datumTransformation() != success" << endl;
+        if(_filter->datumTransformation(_refSatMap) != success) {
+          LOG << "t_pppFilter::datumTransformation() != success" << endl;
           return finish(failure);
         }
         else {
-          LOG << "pppFilter::datumTransformation() == success" << endl;
-          if (!_obsPool->refSatChangeRequired()) {
-            _obsPool->saveLastEpoRefSats();
-          }
+          LOG << "t_pppFilter::datumTransformation() == success" << endl;
         }
       }
@@ -643 +646 @@
           return finish(failure);
         }
-        if (_obsPool->refSatChanged() &&
-            (_opt->_obsModelType == OPT->DCMcodeBias ||
-             _opt->_obsModelType == OPT->DCMphaseBias ||
-             _opt->_pseudoObsIono)
-           ) {
-          LOG << "refSatChanged()" << endl;
+        if (_obsPool->refSatChanged()) {
+          LOG << "t_pppFilter: refSatChanged()" << endl;
             epochReProcessing = true;
             continue;
@@ -669 +668 @@
       // Store last epoch of data
       // ------------------------
-      _obsPool->putEpoch(_epoTimeRover, _obsRover, _pseudoObsIono);
+      _obsPool->putEpoch(_epoTimeRover, _obsRover, _pseudoObsIono, _refSatMap);
 
       // Process Epoch in Filter
@@ -798 +797 @@
     char sys = _opt->systems()[iSys];
     bool refSatDefined = false;
-    t_pppRefSat* refSat = _obsPool->getRefSatMapElement(sys);
+    t_pppRefSat* refSat = _refSatMap[sys];
     for (unsigned ii = 0; ii < obsVector.size(); ii++) {
       t_pppSatObs* satObs = obsVector.at(ii);
@@ -806 +805 @@
       // reference satellite is unchanged
       // ================================
-      if      (!_obsPool->refSatChangeRequired(sys) && refSat->prn() == satObs->prn()) {
+      if (     !_obsPool->refSatChangeRequired(sys) && refSat->prn() == satObs->prn()) {
         refSatDefined = true;
         obsVector[ii]->setAsReference();
@@ -878 +877 @@
   setRefSatellites(obsVector); // current epoch
   LOG.setf(ios::fixed);
-  QMapIterator<char, t_pppRefSat*> it(_obsPool->getRefSatMap());
+  t_pppObsPool::t_epoch* epoch = _obsPool->lastEpoch();
+  const QMap<char, t_pppRefSat*>& refSatMapLastEpoch = epoch->refSatMap();
+  
+  QMapIterator<char, t_pppRefSat*> it(_refSatMap);
   while (it.hasNext()) {
     it.next();
     char  sys = it.key();
     t_prn prn = it.value()->prn();
+    t_prn refSatLastEpochPrn = t_prn();
+    if (epoch) {
+      refSatLastEpochPrn =  refSatMapLastEpoch[sys]->prn();
+    }
     if      (prn.number() ==  0) { // no obs for that system available
       continue;
@@ -891 +897 @@
     }
     QString str;
-    if (prn == _obsPool->getRefSatMapElementLastEpoch(sys) ||
-               _obsPool->getRefSatMapElementLastEpoch(sys) == t_prn() )  {
+    if (prn == refSatLastEpochPrn || refSatLastEpochPrn == t_prn() )  {
       _obsPool->setRefSatChanged(sys, false);
       str = " SET   ";
@@ -906 +911 @@
 
 void t_pppClient::setHistoricalRefSats() {
-  QMapIterator<char, t_pppRefSat*> it(_obsPool->getRefSatMap());
+  QMapIterator<char, t_pppRefSat*> it(_refSatMap);
   while (it.hasNext()) {
     it.next();
@@ -914 +919 @@
       _historicalRefSats[sys].append(prn);
     }
-  }}
+  }
+}
 
 //