Changeset 3571 in ntrip for branches/BNC_LM/combination

Timestamp:

Dec 25, 2011, 7:27:03 PM (13 years ago)

Author:

mervart

Message:

 

File:

• branches/BNC_LM/combination/bnccomb.cpp (modified) (8 diffs)

branches/BNC_LM/combination/bnccomb.cpp ¶

@@ -257 +257 @@
     delete _params[iPar-1];
   }
-  QVectorIterator<cmbCorr*> itCorr(corrs());
-  while (itCorr.hasNext()) {
-    delete itCorr.next();
+  QListIterator<bncTime> itTime(_buffer.keys());
+  while (itTime.hasNext()) {
+    bncTime epoTime = itTime.next();
+    _buffer.remove(epoTime);
   }
 }
@@ -355 +356 @@
   while (itCorr.hasNext()) {
     cmbCorr* hlp = itCorr.next();
-    if (hlp->prn == newCorr->prn && hlp->acName == newCorr->prn) {
+    if (hlp->prn == newCorr->prn && hlp->acName == newCorr->acName) {
       existingCorr = hlp;
       break;
@@ -875 +876 @@
       }
       if (!foundMaster) {
+        delete corr;
         it.remove();
       }
@@ -973 +975 @@
     if (maxRes > _MAXRES) {
       out << "  Outlier" << endl;
+      delete corrs()[maxResIndex-1];
       corrs().remove(maxResIndex-1);
     }
@@ -1010 +1013 @@
     if      (_eph.find(prn) == _eph.end()) {
       out << "checkOrbit: missing eph (not found) " << corr->prn << endl;
+      delete corr;
       im.remove();
     }
     else if (corr->eph == 0) {
       out << "checkOrbit: missing eph (zero) " << corr->prn << endl;
+      delete corr;
       im.remove();
     }
@@ -1022 +1027 @@
       else {
         out << "checkOrbit: missing eph (deleted) " << corr->prn << endl;
+        delete corr;
         im.remove();
       }
@@ -1086 +1092 @@
       QString  prn  = corr->prn;
       if      (numCorr[prn] < 2) {
+        delete corr;
         im.remove();
       }
@@ -1098 +1105 @@
               << corr->iod                     << " " 
               << norm                          << endl;
+          delete corr;
           im.remove();
           removed = true;