Changeset 10451 in ntrip for trunk/BNC/src/combination/bnccomb.cpp

Timestamp:

Apr 24, 2024, 3:46:28 PM (12 days ago)

Author:

stuerze

Message:

two more options added to the combination procedure

File:

• trunk/BNC/src/combination/bnccomb.cpp (modified) (14 diffs)

trunk/BNC/src/combination/bnccomb.cpp

@@ -176 +176 @@
       newAC->name         = hlp[1];
       newAC->weightFactor = hlp[2].toDouble();
-      newAC->isAPC = bool(newAC->mountPoint.mid(0,4) == "SSRA");
+      newAC->excludeSats  = hlp[3].split(QRegExp("[ ,]"), QString::SkipEmptyParts);
+      newAC->isAPC        = bool(newAC->mountPoint.mid(0,4) == "SSRA");
       QMapIterator<char, unsigned> itSys(_cmbSysPrn);
       // init
@@ -182 +183 @@
         itSys.next();
         char sys = itSys.key();
-        if (!_masterOrbitAC.contains(sys)) {
+        if (!_masterOrbitAC.contains(sys) &&
+            !newAC->excludeSats.contains(QString(sys), Qt::CaseSensitive)) {
           _masterOrbitAC[sys] = newAC->name;
           _masterIsAPC[sys]   = newAC->isAPC;
@@ -299 +301 @@
   // Maximal Residuum
   // ----------------
-  _MAXRES = settings.value("cmbMaxres").toDouble();
-  if (_MAXRES <= 0.0) {
-    _MAXRES = 999.0;
-  }
+  _MAX_RES = settings.value("cmbMaxres").toDouble();
+  if (_MAX_RES <= 0.0) {
+    _MAX_RES = 999.0;
+  }
+
+  // Maximal Displacement
+  // --------------------
+  _MAX_DISPLACEMENT = settings.value("cmbMaxdisplacement").toDouble();
+  if (_MAX_DISPLACEMENT <= 0.0) {
+    _MAX_DISPLACEMENT = 2.0;
+  }
+
   _newCorr = 0;
 }
@@ -395 +405 @@
     // ----------------------
     QString acName;
+    QStringList excludeSats;
     QListIterator<cmbAC*> icAC(_ACs);
     while (icAC.hasNext()) {
@@ -400 +411 @@
       if (AC->mountPoint == staID) {
         acName = AC->name;
+        excludeSats = AC->excludeSats;
         break;
       }
     }
-    if (acName.isEmpty()) {
+    if (acName.isEmpty() || excludeSat(orbCorr._prn, excludeSats)) {
       continue;
     }
@@ -431 +443 @@
     // ----------------------
     QString acName;
+    QStringList excludeSats;
     QListIterator<cmbAC*> icAC(_ACs);
     while (icAC.hasNext()) {
@@ -436 +449 @@
       if (AC->mountPoint == staID) {
         acName = AC->name;
+        excludeSats = AC->excludeSats;
         break;
       }
     }
-    if (acName.isEmpty()) {
+    if (acName.isEmpty() || excludeSat(satCodeBias._prn, excludeSats)) {
       continue;
     }
@@ -480 +494 @@
     // ----------------------
     QString acName;
+    QStringList excludeSats;
     bool isAPC;
     QString staID(newClk._staID.c_str());
@@ -487 +502 @@
       if (AC->mountPoint == staID) {
         acName = AC->name;
+        QStringList excludeSats;
         isAPC  = AC->isAPC;
         break;
       }
     }
-    if (acName.isEmpty() || isAPC != _masterIsAPC[sys]) {
+    if (acName.isEmpty() ||
+        isAPC != _masterIsAPC[sys] ||
+        excludeSat(newClk._prn, excludeSats)) {
       continue;
     }
@@ -962 +980 @@
         << " Maximum Residuum " << maxRes << ' '
         << corrs(sys)[maxResIndex-1]->_acName << ' ' << corrs(sys)[maxResIndex-1]->_prn.mid(0,3);
-    if (maxRes > _MAXRES) {
+    if (maxRes > _MAX_RES) {
       for (int iPar = 1; iPar <= _params[sys].size(); iPar++) {
         cmbParam* pp = _params[sys][iPar-1];
@@ -1368 +1386 @@
         << corrs(sys)[maxResIndex-1]->_acName << ' ' << corrs(sys)[maxResIndex-1]->_prn.mid(0,3);
 
-    if (maxRes > _MAXRES) {
+    if (maxRes > _MAX_RES) {
       out << "  Outlier" << "\n";
       delete corrs(sys)[maxResIndex-1];
@@ -1398 +1416 @@
 t_irc bncComb::checkOrbits(bncTime epoTime, char sys, QTextStream& out) {
 
-  const double MAX_DISPLACEMENT = 2.0;
-
   // Switch to last ephemeris (if possible)
   // --------------------------------------
@@ -1500 +1516 @@
       else if (corr == maxDiff[prn]) {
         double norm = corr->_diffRao.NormFrobenius();
-        if (norm > MAX_DISPLACEMENT) {
+        if (norm > _MAX_DISPLACEMENT) {
           out << epoTime.datestr().c_str()    << " "
               << epoTime.timestr().c_str()    << " "
@@ -1577 +1593 @@
   }
 }
+
+//
+////////////////////////////////////////////////////////////////////////////
+bool bncComb::excludeSat(const t_prn& prn, const QStringList excludeSats) const {
+  QStringListIterator it(excludeSats);
+  while (it.hasNext()) {
+    string prnStr = it.next().toLatin1().data();
+    if (prnStr == prn.toString() || prnStr == prn.toString().substr(0,1)) {
+      return true;
+    }
+  }
+  return false;
+}