Changeset 3274 in ntrip for trunk/BNC/combination/bnccomb.cpp

Timestamp:

Apr 13, 2011, 3:24:40 PM (13 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/combination/bnccomb.cpp

@@ -214 +214 @@
   }
 
+  // Check Modulo Time
+  // -----------------
+  const int moduloTime = 10;
+  if (int(newCorr->tt.gpssec()) % moduloTime != 0.0) {
+    delete newCorr;
+    return;
+  }
+
   // Reject delayed corrections
   // --------------------------
@@ -244 +252 @@
   // Process all older Epochs (if there are any)
   // -------------------------------------------
-  const double waitTime = 5.0; // wait 5 sec
+  const double waitTime = moduloTime/2.0;
   _processedBeforeTime = newCorr->tt - waitTime;
 
@@ -266 +274 @@
   if (epochsToProcess.size()) {
     processEpochs(epochsToProcess);
-  }
-
-  // Check Modulo Time
-  // -----------------
-  const int moduloTime = 10;
-  if (int(newCorr->tt.gpssec()) % moduloTime != 0.0) {
-    delete newCorr;
-    return;
   }
 
@@ -349 +349 @@
 
   out <<                   "Combination:" << endl 
-      << "------------------------------" << endl;
+      << "------------------------------" << endl
+      << "Processed Epochs: "             << endl;
 
   // Predict Parameters Values, Add White Noise
@@ -380 +381 @@
   QListIterator<cmbEpoch*> itEpo(epochs);
   while (itEpo.hasNext()) {
-    cmbEpoch* epo = itEpo.next();
+    cmbEpoch* epo     = itEpo.next();
+    bncTime   epoTime = epo->time;
+    out << epoTime.datestr().c_str() << " " << epoTime.timestr().c_str() << endl;
+
     QMutableMapIterator<QString, t_corr*> itCorr(epo->corr);
     while (itCorr.hasNext()) {