Changeset 3475 in ntrip for trunk

Timestamp:

Oct 14, 2011, 8:17:32 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

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

trunk/BNC/combination/bnccomb.cpp

@@ -438 +438 @@
   // ----------------------------------------------------
   t_irc irc;
+  ColumnVector dx;
   if (_method == filter) {
-    irc = processEpoch_filter(out, resCorr);
+    irc = processEpoch_filter(out, resCorr, dx);
   }
   else {
-    irc = processEpoch_singleEpoch(out, resCorr);
-  }
-
-  // Print Results
-  // -------------
+    irc = processEpoch_singleEpoch(out, resCorr, dx);
+  }
+
+  // Update Parameter Values, Print Results
+  // --------------------------------------
   if (irc == success) {
+    for (int iPar = 1; iPar <= _params.size(); iPar++) {
+      cmbParam* pp = _params[iPar-1];
+      pp->xx += dx(iPar);
+      if (pp->type == cmbParam::clkSat) {
+        if (resCorr.find(pp->prn) != resCorr.end()) {
+          resCorr[pp->prn]->dClk = pp->xx / t_CST::c;
+        }
+      }
+      out << _resTime.datestr().c_str() << " " 
+          << _resTime.timestr().c_str() << " ";
+      out.setRealNumberNotation(QTextStream::FixedNotation);
+      out.setFieldWidth(8);
+      out.setRealNumberPrecision(4);
+      out << pp->toString() << " "
+          << pp->xx << " +- " << sqrt(_QQ(pp->index,pp->index)) << endl;
+      out.setFieldWidth(0);
+    }
     printResults(out, resCorr);
     dumpResults(resCorr);
@@ -461 +479 @@
 ////////////////////////////////////////////////////////////////////////////
 t_irc bncComb::processEpoch_filter(QTextStream& out,
-                                   QMap<QString, t_corr*>& resCorr) {
+                                   QMap<QString, t_corr*>& resCorr,
+                                   ColumnVector& dx) {
 
   // Prediction Step
@@ -483 +502 @@
   SymmetricMatrix QQ_sav = _QQ;
 
-  ColumnVector dx;
-    
   // Update and outlier detection loop
   // ---------------------------------
@@ -528 +545 @@
       break;
     }
-  }
-
-  // Update Parameter Values
-  // -----------------------
-  for (int iPar = 1; iPar <= _params.size(); iPar++) {
-    cmbParam* pp = _params[iPar-1];
-    pp->xx += dx(iPar);
-    if (pp->type == cmbParam::clkSat) {
-      if (resCorr.find(pp->prn) != resCorr.end()) {
-        resCorr[pp->prn]->dClk = pp->xx / t_CST::c;
-      }
-    }
-    out << _resTime.datestr().c_str() << " " 
-        << _resTime.timestr().c_str() << " ";
-    out.setRealNumberNotation(QTextStream::FixedNotation);
-    out.setFieldWidth(8);
-    out.setRealNumberPrecision(4);
-    out << pp->toString() << " "
-        << pp->xx << " +- " << sqrt(_QQ(pp->index,pp->index)) << endl;
-    out.setFieldWidth(0);
   }
 
@@ -785 +782 @@
 ////////////////////////////////////////////////////////////////////////////
 t_irc bncComb::processEpoch_singleEpoch(QTextStream& out,
-                                        QMap<QString, t_corr*>& resCorr) {
+                                        QMap<QString, t_corr*>& resCorr,
+                                        ColumnVector& dx) {
 
   // Initialize resCorr
@@ -875 +873 @@
   SymmetricMatrix NN; NN << AA.t() * PP * AA;
   ColumnVector    bb = AA.t() * PP * ll;
-  SymmetricMatrix QQ = NN.i();
-
-  ColumnVector    xx = QQ * bb;
-
-  cout << xx.t() << endl;
+
+  _QQ = NN.i();
+  dx = _QQ * bb;
 
   return success;

trunk/BNC/combination/bnccomb.h

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