Changeset 2924 in ntrip

Timestamp:

Jan 29, 2011, 12:01:16 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

• bnccomb.cpp (modified) (5 diffs)
• bnccomb.h (modified) (1 diff)

trunk/BNC/combination/bnccomb.cpp

@@ -75 +75 @@
   }
 
+  // Reject delayed corrections
+  // --------------------------
+  if (_processedBeforeTime.valid() && newCorr->tt < _processedBeforeTime) {
+    delete newCorr;
+    return;
+  }
+
+  // Process all older Epochs (if there are any)
+  // -------------------------------------------
+  const double waitTime = 5.0; // wait 5 sec
+  _processedBeforeTime = newCorr->tt - waitTime;
+  processEpochs();
+
   // Check Modulo Time
   // -----------------
@@ -99 +112 @@
     AC->epochs.append(newEpoch);
   }
-
+  
+  // Merge or add the correction
+  // ---------------------------
   if (newEpoch->corr.find(newCorr->prn) != newEpoch->corr.end()) {
     newEpoch->corr[newCorr->prn]->readLine(line); // merge (multiple messages)
@@ -106 +121 @@
     newEpoch->corr[newCorr->prn] = newCorr;
   }
-
-  processEpochsBefore(newCorr->tt);
 }
 
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncComb::processEpochsBefore(const bncTime& time) {
-
-  const double waitTime = 10.0; // wait 10 seconds
+void bncComb::processEpochs() {
 
   bool corrProcessed = false;
@@ -123 +134 @@
     cmbAC* AC = itAC.value();
 
-
     QMutableListIterator<cmbEpoch*> itEpo(AC->epochs);
     while (itEpo.hasNext()) {
       cmbEpoch* epoch = itEpo.next();
-      double dt = time - epoch->time;
-
-      if      (dt == waitTime) {
+      if (epoch->time < _processedBeforeTime) {
         QMapIterator<QString, t_corr*> itCorr(epoch->corr);
         while (itCorr.hasNext()) {
@@ -136 +144 @@
           processSingleCorr(AC, corr);
           corrProcessed = true;
-        }
-      }
-
-      if (dt >= waitTime) {
-        if (dt > waitTime) {
-          cout << "delete " << AC->name.toAscii().data() << " " 
-               << epoch->time.timestr() << " " << endl;
         }
         delete epoch;

trunk/BNC/combination/bnccomb.h

@@ -48 +48 @@
   };
 
-  void processEpochsBefore(const bncTime& time);
+  void processEpochs();
   void processSingleCorr(const cmbAC* AC, const t_corr* corr);
   void printResults() const;
 
   QMap<QString, cmbAC*> _ACs;   // Analytical Centers (key is mountpoint)
+  bncTime               _processedBeforeTime;
 };