Changeset 3556 in ntrip

Timestamp:

Dec 23, 2011, 11:19:11 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bnc.pro (modified) (1 diff)
• combination/bnccomb.cpp (modified) (12 diffs)
• combination/bnccomb.h (modified) (2 diffs)

trunk/BNC/bnc.pro

@@ -2 +2 @@
 # Switch to debug configuration
 # -----------------------------
-CONFIG -= debug
-CONFIG += release
+CONFIG -= release
+CONFIG += debug
 
 

trunk/BNC/combination/bnccomb.cpp

@@ -257 +257 @@
     delete _params[iPar-1];
   }
-  QListIterator<unsigned long> itTime(_buffer.keys());
+  QListIterator<bncTime> itTime(_buffer.keys());
   while (itTime.hasNext()) {
-    _buffer.remove(itTime.next());
+    bncTime epoTime = itTime.next();
+    _buffer.remove(epoTime);
   }
 }
@@ -339 +340 @@
   // Process previous Epoch(s)
   // -------------------------
-  QListIterator<unsigned long> itTime(_buffer.keys());
+  QListIterator<bncTime> itTime(_buffer.keys());
   while (itTime.hasNext()) {
-    unsigned long epoTime = itTime.next();
-    if (epoTime < (newCorr->tt - moduloTime).longSec()) {
-      _resTime = _buffer[epoTime].tt();
+    bncTime epoTime = itTime.next();
+    if (epoTime < newCorr->tt - moduloTime) {
+      _resTime = epoTime;
       processEpoch();
     }
@@ -350 +351 @@
   // Merge or add the correction
   // ---------------------------
-  QVector<cmbCorr*>& corrs = _buffer[newCorr->tt.longSec()].corrs;
+  QVector<cmbCorr*>& corrs = _buffer[newCorr->tt].corrs;
   cmbCorr* existingCorr = 0;
   QVectorIterator<cmbCorr*> itCorr(corrs);
@@ -366 +367 @@
   else {
     corrs.append(newCorr);
-  }
-
-  if (_resTime.valid()) {
-    QListIterator<unsigned long> it(_buffer.keys());
-    while (it.hasNext()) {
-      unsigned long epoTime = it.next();
-      if (epoTime <= _resTime.longSec()) {
-        _buffer.remove(epoTime);
-      }
-    }
   }
 }
@@ -460 +451 @@
     if (_masterMissingEpochs < 10) {
       out << "Missing Master, Epoch skipped" << endl;
-      _buffer.remove(_resTime.longSec());
+      _buffer.remove(_resTime);
       emit newMessage(_log, false);
       return;
@@ -521 +512 @@
   // Delete Data, emit Message
   // -------------------------
-  _buffer.remove(_resTime.longSec());
+  _buffer.remove(_resTime);
   emit newMessage(_log, false);
 }
@@ -885 +876 @@
       }
       if (!foundMaster) {
+        delete corr;
         it.remove();
       }
@@ -983 +975 @@
     if (maxRes > _MAXRES) {
       out << "  Outlier" << endl;
+      delete corrs()[maxResIndex-1];
       corrs().remove(maxResIndex-1);
     }
@@ -1020 +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();
     }
@@ -1032 +1027 @@
       else {
         out << "checkOrbit: missing eph (deleted) " << corr->prn << endl;
+        delete corr;
         im.remove();
       }
@@ -1096 +1092 @@
       QString  prn  = corr->prn;
       if      (numCorr[prn] < 2) {
+        delete corr;
         im.remove();
       }
@@ -1108 +1105 @@
               << corr->iod                     << " " 
               << norm                          << endl;
+          delete corr;
           im.remove();
           removed = true;

trunk/BNC/combination/bnccomb.h

@@ -73 +73 @@
       }
     }
-    bncTime tt() const {
-      if (corrs.size() > 0) {
-        return corrs[0]->tt;
-      }
-      else {
-        return bncTime();
-      }
-    }
     QVector<cmbCorr*> corrs;
   };
@@ -98 +90 @@
   t_irc checkOrbits(QTextStream& out);
 
-  QVector<cmbCorr*>& corrs() {return _buffer[_resTime.longSec()].corrs;}
+  QVector<cmbCorr*>& corrs() {return _buffer[_resTime].corrs;}
 
   QList<cmbAC*>           _ACs;
   bncTime                 _resTime;
   QVector<cmbParam*>      _params;
-  QMap<unsigned long, cmbEpoch> _buffer;
+  QMap<bncTime, cmbEpoch> _buffer;
   bncRtnetDecoder*        _rtnetDecoder;
   SymmetricMatrix         _QQ;