Changeset 6164 in ntrip for trunk/BNC

Timestamp:

Sep 14, 2014, 1:07:25 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncutils.cpp (modified) (2 diffs)
• bncutils.h (modified) (1 diff)
• combination/bnccomb.cpp (modified) (4 diffs)

trunk/BNC/src/bncutils.cpp

@@ -606 +606 @@
 //////////////////////////////////////////////////////////////////////////////
 void kalman(const Matrix& AA, const ColumnVector& ll, const DiagonalMatrix& PP, 
-            SymmetricMatrix& QQ, ColumnVector& xx) {
+            SymmetricMatrix& QQ, ColumnVector& dx) {
 
   Tracer tracer("kalman");
@@ -635 +635 @@
   SymmetricMatrix Hi; Hi << SHi * SHi.t();
 
-  xx += KT.t() * (ll - AA * xx);
+  dx = KT.t() * (ll - AA * xx);
   QQ << (SS.t() * SS);
 }

trunk/BNC/src/bncutils.h

@@ -97 +97 @@
 
 void         kalman(const Matrix& AA, const ColumnVector& ll, const DiagonalMatrix& PP, 
-                    SymmetricMatrix& QQ, ColumnVector& xx);
+                    SymmetricMatrix& QQ, ColumnVector& dx);
 
 double       djul(long j1, long m1, double tt);

trunk/BNC/src/combination/bnccomb.cpp

@@ -612 +612 @@
     }
 
+    cout << "AA:  " << AA.Nrows() << ' ' << AA.Ncols() << endl;
+    cout << "ll:  " << ll.Nrows() << endl;
+    cout << "PP:  " << PP.Nrows() << ' ' << PP.Ncols() << endl;
+    cout << "_QQ: " << _QQ.Nrows() << ' ' << _QQ.Ncols() << endl;
+    cout << "dx: "  << dx.Nrows() << endl;
+
     dx = 0.0;
     kalman(AA, ll, PP, _QQ, dx);
+
+    cout << "after Kalman" << endl;
+
     ColumnVector vv = ll - AA * dx;
+
+    cout << vv.t() << endl;
 
     int     maxResIndex;
@@ -807 +818 @@
   int iObs = 0;
 
+  cout << "nObs, nCon, nPar: " << nObs << ' ' << nCon << ' ' << nPar << endl;
+
+  for (int iPar = 1; iPar <= _params.size(); iPar++) {
+    cmbParam* pp = _params[iPar-1];
+    cout << "PAR " << iPar << ' ' << pp->toString().toAscii().data() << endl;
+  }
+
   QVectorIterator<cmbCorr*> itCorr(corrs());
   while (itCorr.hasNext()) {
@@ -816 +834 @@
     if (corr->_acName == _masterOrbitAC && resCorr.find(prn) == resCorr.end()) {
       resCorr[prn] = new cmbCorr(*corr);
+      cout << "resCor " << corr->_acName.toAscii().data() << ' '
+           << prn.toAscii().data() << endl;
     }
 
@@ -824 +844 @@
 
     ll(iObs) = corr->_clkCorr._dClk * t_CST::c - DotProduct(AA.Row(iObs), x0);
+    cout << "iObs, AC, prn, ll: " << iObs << ' ' << corr->_acName.toAscii().data() << ' '
+         << corr->_prn.toAscii().data() << ' ' << ll(iObs) << endl;
   }