Changeset 3472 in ntrip

Timestamp:

Oct 14, 2011, 4:51:25 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

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

trunk/BNC/combination/bnccomb.cpp

@@ -367 +367 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncComb::processEpoch() {
-  if (_method == filter) {
-    return processEpoch_filter();
-  }
-  else {
-    return processEpoch_singleEpoch();
-  }
-}
-
-// Process Epoch - Filter Method
-////////////////////////////////////////////////////////////////////////////
-void bncComb::processEpoch_filter() {
-  int nPar = _params.size();
 
   _log.clear();
@@ -384 +372 @@
   QTextStream out(&_log, QIODevice::WriteOnly);
 
-  out << endl <<           "Combination (Filter):" << endl 
-      << "---------------------------------------" << endl;
+  out << endl <<           "Combination:" << endl 
+      << "------------------------------" << endl;
 
   // Observation Statistics
@@ -438 +426 @@
   }
 
+  QMap<QString, t_corr*> resCorr;
+
+  // Perform the actual Combination using selected Method
+  // ----------------------------------------------------
+  t_irc irc;
+  if (_method == filter) {
+    irc = processEpoch_filter(out, resCorr);
+  }
+  else {
+    irc = processEpoch_singleEpoch(out, resCorr);
+  }
+
+  // Print Results
+  // -------------
+  if (irc == success) {
+    printResults(out, resCorr);
+    dumpResults(resCorr);
+  }
+
+  // Delete Data, emit Message
+  // -------------------------
+  _buffer.remove(_resTime);
+  emit newMessage(_log, false);
+}
+
+// Process Epoch - Filter Method
+////////////////////////////////////////////////////////////////////////////
+t_irc bncComb::processEpoch_filter(QTextStream& out,
+                                   QMap<QString, t_corr*>& resCorr) {
+
   // Prediction Step
   // ---------------
+  int nPar = _params.size();
   ColumnVector x0(nPar);
   for (int iPar = 1; iPar <= _params.size(); iPar++) {
@@ -458 +477 @@
 
   ColumnVector dx;
-  QMap<QString, t_corr*> resCorr;
     
   // Update and outlier detection loop
@@ -469 +487 @@
 
     if (createAmat(AA, ll, PP, x0, resCorr) != success) {
-      _buffer.remove(_resTime);
-      emit newMessage(_log, false);
-      return;
+      return failure;
     }
 
@@ -527 +543 @@
   }
 
-  // Print Results
-  // -------------
-  printResults(out, resCorr);
-  dumpResults(resCorr);
-
-  emit newMessage(_log, false);
-
-  // Delete Data
-  // -----------
-  _buffer.remove(_resTime);
+  return success;
 }
 
@@ -766 +773 @@
 // Process Epoch - Single-Epoch Method
 ////////////////////////////////////////////////////////////////////////////
-void bncComb::processEpoch_singleEpoch() {
-
-  _log.clear();
-
-  QTextStream out(&_log, QIODevice::WriteOnly);
-
-  out << endl <<           "Combination (Single-Epoch):" << endl 
-      << "---------------------------------------------" << endl;
-
-  // Observation Statistics
-  // ----------------------
-  QListIterator<cmbAC*> icAC(_ACs);
-  while (icAC.hasNext()) {
-    cmbAC* AC = icAC.next();
-    AC->numObs = 0;
-    QVectorIterator<cmbCorr*> itCorr(corrs());
-    while (itCorr.hasNext()) {
-      cmbCorr* corr = itCorr.next();
-      if (corr->acName == AC->name) {
-        AC->numObs += 1;
-      }
-    }
-    out << AC->name.toAscii().data() << ": " << AC->numObs << endl;
-  }
-
-  QMap<QString, t_corr*> resCorr;
-
-
-  // Print Results
-  // -------------
-  printResults(out, resCorr);
-  dumpResults(resCorr);
-
-  emit newMessage(_log, false);
-
-  // Delete Data
-  // -----------
-  _buffer.remove(_resTime);
-}
+t_irc bncComb::processEpoch_singleEpoch(QTextStream& out,
+                                        QMap<QString, t_corr*>& resCorr) {
+
+  return failure;
+}

trunk/BNC/combination/bnccomb.h

@@ -76 +76 @@
 
   void processEpoch();
-  void processEpoch_filter();
-  void processEpoch_singleEpoch();
+  t_irc processEpoch_filter(QTextStream& out,
+                            QMap<QString, t_corr*>& resCorr);
+  t_irc processEpoch_singleEpoch(QTextStream& out,
+                                 QMap<QString, t_corr*>& resCorr);
   t_irc createAmat(Matrix& AA, ColumnVector& ll, DiagonalMatrix& PP,
                    const ColumnVector& x0, QMap<QString, t_corr*>& resCorr);