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

Timestamp:

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

Author:

stuerze

Message:

some changes regarding PPP

File:

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

trunk/BNC/src/PPP/pppFilter.cpp

@@ -72 +72 @@
   string epoTimeStr = string(_epoTime);
 
+  const QMap<char, t_pppRefSat*>& refSatMap = epoch->refSatMap();
+
   if (OPT->_obsModelType == OPT->DCMcodeBias ||
       OPT->_obsModelType == OPT->DCMphaseBias) {
      // Save parameters of epoch before
     _parlist_sav = _parlist;
- }
+  }
 
   //--
   // Set Parameters
-  if (_parlist.set(_epoTime, allObs, _obsPool->getRefSatMap()) != success) {
+  if (_parlist.set(_epoTime, allObs, refSatMap) != success) {
     return failure;
   }
-
   const vector<t_pppParam*>& params = _parlist.params();
 #ifdef BNC_DEBUG_PPP
-  for (int iPar = 0; iPar < params.size(); iPar++) {
-    LOG << "available par " << params[iPar]->toString() << endl;
+  for (unsigned iPar = 0; iPar < params.size(); iPar++) {
+    LOG << "t_pppFilter::processEpoch par_cur " << params[iPar]->toString() << endl;
   }
 #endif
@@ -133 +134 @@
     for (int iSys = 0; iSys < usedSystems.size(); iSys++) {
       char sys = usedSystems[iSys];
-      _refPrn = (_obsPool->getRefSatMapElement(sys))->prn();
+      _refPrn = refSatMap[sys]->prn();
      vector<t_pppSatObs*> obsVector;
       for (unsigned jj = 0; jj < allObs.size(); jj++) {
@@ -170 +171 @@
     char sys = usedSystems[iSys];
     if (OPT->_refSatRequired) {
-      _refPrn = (_obsPool->getRefSatMapElement(sys))->prn();
+      _refPrn = refSatMap[sys]->prn();
     }
     else {
@@ -195 +196 @@
   // close epoch processing
   // ----------------------
-  cmpDOP(allObs);
+  cmpDOP(allObs, refSatMap);
   _parlist.printResult(_epoTime, _QFlt, _xFlt);
   _lastEpoTimeOK = _epoTime;  // remember time of last successful epoch processing
-  if (OPT->_refSatRequired) {
-    _obsPool->saveLastEpoRefSats();
-  }
   return success;
 }
@@ -596 +594 @@
 // Compute various DOP Values
 ////////////////////////////////////////////////////////////////////////////
-void t_pppFilter::cmpDOP(const vector<t_pppSatObs*>& obsVector) {
+void t_pppFilter::cmpDOP(const vector<t_pppSatObs*>& obsVector, 
+                         const QMap<char, t_pppRefSat*>& refSatMap) {
 
   _dop.reset();
@@ -606 +605 @@
     for (unsigned ii = 0; ii < obsVector.size(); ii++) {
       t_pppSatObs* obs = obsVector[ii];
-      char system = obs->prn().system();
+      char sys = obs->prn().system();
       t_prn refPrn = t_prn();
       if (OPT->_refSatRequired) {
-        refPrn = _obsPool->getRefSatMapElement(system)->prn();
+        refPrn = refSatMap[sys]->prn();
       }
       if (obs->isValid() && !obs->outlier()) {
@@ -678 +677 @@
 // Compute datum transformation
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_pppFilter::datumTransformation() {
+t_irc t_pppFilter::datumTransformation(const QMap<char, t_pppRefSat*>& refSatMap) {
+
   // get last epoch
   t_pppObsPool::t_epoch* epoch = _obsPool->lastEpoch();
   if (!epoch) {
-    LOG << "!lastEpoch" << endl;
+    LOG << "t_pppFilter::datumTransformation: !lastEpoch" << endl;
     return failure;
   }
-  else {
-    LOG.setf(ios::fixed);
-    LOG << string(epoch->epoTime()) << " DATUM TRANSFORMATION " << endl;
-  }
+  _epoTime = epoch->epoTime();
+  LOG.setf(ios::fixed);
+  LOG << string(_epoTime) << " DATUM TRANSFORMATION " << endl;
 
   vector<t_pppSatObs*>& allObs = epoch->obsVector();
+
+  const QMap<char, t_pppRefSat*>& refSatMapLastEpoch = epoch->refSatMap();
+
+  bool peseudoObsIono = epoch->pseudoObsIono();
 
   // reset old and set new refSats in last epoch (ambiguities/GIM)
   // =============================================================
-  if (resetRefSatellitesLastEpoch(allObs) != true) {
+  if (resetRefSatellitesLastEpoch(allObs, refSatMap, refSatMapLastEpoch) != true) {
     LOG  << "refsatChange required" << endl;
     return success;
@@ -705 +708 @@
   // set AA2
   // =======
-  if (_parlist.set(epoch->epoTime(), allObs, _obsPool->getRefSatMap()) != success) {
+  if (_parlist.set(_epoTime, allObs, refSatMap) != success) {
     return failure;
   }
-  const vector<t_pppParam*>& _params = _parlist.params();
+  vector<t_pppParam*>& _params = _parlist.params();
   unsigned nPar = _parlist.nPar();
 #ifdef BNC_DEBUG_PPP
-  LOG << " parameters of last epoch" << endl;
+  LOG << " t_pppFilter::datumTransformation par last epoch: " << _params.size() << "/" << nPar <<  endl;
   for (unsigned iPar = 0; iPar < nPar; iPar++) {
-    LOG << _params[iPar]->toString() << "\t\t" << endl;
+    LOG << _params[iPar]->toString() << "\t\t"  endl;
   }
 #endif
@@ -719 +722 @@
   for (int iSys = 0; iSys < usedSystems.size(); iSys++) {
     char sys = usedSystems[iSys];
-    t_prn refPrn = (_obsPool->getRefSatMapElement(sys))->prn();
+    t_prn refPrn = refSatMap[sys]->prn();
     vector<t_pppSatObs*> obsVector;
     for (unsigned jj = 0; jj < allObs.size(); jj++) {
@@ -731 +734 @@
     vector<t_lc::type> LCs = OPT->LCs(sys);
     unsigned usedLCs = LCs.size();
-    if (OPT->_pseudoObsIono && !epoch->pseudoObsIono()) {
+    if (OPT->_pseudoObsIono && !peseudoObsIono) {
         usedLCs -= 1;  // GIM not used
     }
@@ -744 +747 @@
       maxObs += 1;
     }
-    if (OPT->_pseudoObsIono && epoch->pseudoObsIono()) {
+    if (OPT->_pseudoObsIono && peseudoObsIono) {
       maxObs -= 1; // pseudo obs iono with respect to refSat
     }
     Matrix  AA(maxObs, nPar);
-
     // Real Observations
     // -----------------
@@ -787 +789 @@
       continue;
     }
-    _datumTrafo->updateIndices(sys, iObs+1);
-    _datumTrafo->prepareAA(AA.SubMatrix(1, iObs+1 , 1, nPar), 2);
+    _datumTrafo->updateIndices(sys, iObs+1);    //LOG << "AA Ncols/Nrows: " << AA.Ncols() << "/" << AA.Nrows() << "  nPar: "  << nPar << endl;    //LOG << "AA.SubMatrix(1 .. " << iObs+1 << " , 1 .. " <<  nPar << ")" << endl;
+    if(_datumTrafo->prepareAA(AA.SubMatrix(1, iObs+1 , 1, nPar), 2) != success) {
+      return failure;
+    }
   }
   _datumTrafo->updateNumObs();
@@ -819 +823 @@
   for (int iSys = 0; iSys < usedSystems.size(); iSys++) {
     char sys = usedSystems[iSys];
-    t_prn refPrnOld = _obsPool->getRefSatMapElementLastEpoch(sys);
-    t_prn refPrnNew = (_obsPool->getRefSatMapElement(sys))->prn();
+    t_prn refPrnOld = refSatMapLastEpoch[sys]->prn();
+    t_prn refPrnNew = refSatMap[sys]->prn();
     if (refPrnNew != refPrnOld) {
-      t_irc irc = resetAmb(_obsPool->getRefSatMapElementLastEpoch(sys), allObs);
+      t_irc irc = resetAmb(refPrnOld, allObs);
       if (OPT->_obsModelType == OPT->DCMcodeBias) {
         if (irc == success) {
@@ -834 +838 @@
   // =================
   _datumTrafo->switchAA();
+
+  _obsPool->putEpoch(_epoTime, allObs, peseudoObsIono, refSatMap);
 
   return success;
@@ -877 +883 @@
 //
 //////////////////////////////////////////////////////////////////////////////
-bool t_pppFilter::resetRefSatellitesLastEpoch(std::vector<t_pppSatObs*>& obsVector) {
+bool t_pppFilter::resetRefSatellitesLastEpoch(std::vector<t_pppSatObs*>& obsVector,
+    const QMap<char, t_pppRefSat*>& refSatMap,
+    const QMap<char, t_pppRefSat*>& refSatMapLastEpoch) {
   bool resetRefSat;
   // reference satellite definition per system
@@ -884 +892 @@
     resetRefSat = false;
     char sys = usedSystems[iSys];
-    t_pppRefSat* refSat = _obsPool->getRefSatMapElement(sys);
-    t_prn newPrn = refSat->prn();
-    t_prn oldPrn = _obsPool->getRefSatMapElementLastEpoch(sys);
+    t_prn newPrn = refSatMap[sys]->prn();
+    t_prn oldPrn = refSatMapLastEpoch[sys]->prn();
 #ifdef BNC_DEBUG_PPP
-    LOG << "oldPrn: " << oldPrn.toString() << " => newPrn: " << newPrn.toString() << endl;
+    if (oldPrn != newPrn) {
+      LOG << "oldRef: " << oldPrn.toString() << " => newRef " <<  newPrn.toString() << endl;
+    }
 #endif
     vector<t_pppSatObs*>::iterator it = obsVector.begin();
@@ -896 +905 @@
         resetRefSat = true;
         satObs->setAsReference();
-      }
-      else if (satObs->prn() == oldPrn) {
+      } else if (satObs->prn() == oldPrn) {
         satObs->resetReference();
       }