Changeset 6005 in ntrip for trunk/BNC

Timestamp:

Aug 18, 2014, 10:55:49 AM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

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

trunk/BNC/src/PPP/pppFilter.cpp

@@ -104 +104 @@
   _x0.ReSize(_parlist->nPar());   _x0   = 0.0;
   
-  predictCovCrdPart(QFltOld, xFltOld);
-
-  for (unsigned ii = 3; ii < params.size(); ii++) {
+  for (unsigned ii = 0; ii < params.size(); ii++) {
     const t_pppParam* par1 = params[ii];
 
@@ -113 +111 @@
     int iOld = par1->indexOld();
     if (iOld < 0) {
-      _QFlt[ii][ii] = par1->sigma0() * par1->sigma0(); // new parameter
+      if (ii < 3) {
+        _QFlt[ii][ii] = par1->sigma0() * par1->sigma0(); // new parameter
+      }
     }
     else {
-      _QFlt[ii][ii] = QFltOld[iOld][iOld] + par1->noise() * par1->noise();
+      if (ii < 3) {
+        _QFlt[ii][ii] = QFltOld[iOld][iOld] + par1->noise() * par1->noise();
+      }
       _xFlt[ii]     = xFltOld[iOld];
       for (unsigned jj = 0; jj < ii; jj++) {
@@ -127 +129 @@
     }
   }
+
+  predictCovCrdPart();
 
   // Process Satellite Systems separately
@@ -431 +435 @@
 // Compute various DOP Values
 ////////////////////////////////////////////////////////////////////////////
-void t_pppFilter::predictCovCrdPart(const SymmetricMatrix& QFltOld, const ColumnVector& xFltOld) {
+void t_pppFilter::predictCovCrdPart() {
 
   const vector<t_pppParam*>& params = _parlist->params();
@@ -437 +441 @@
   for (unsigned ii = 0; ii < 3; ii++) {
     const t_pppParam* par1 = params[ii];
-
-    _x0[ii] = par1->x0();
-
-    int iOld = par1->indexOld();
-    if (iOld < 0) {
+    if (_QFlt[ii][ii] == 0.0) {
       _QFlt[ii][ii] = par1->sigma0() * par1->sigma0(); // new parameter
     }
     else {
-      _QFlt[ii][ii] = QFltOld[iOld][iOld] + par1->noise() * par1->noise();
-      _xFlt[ii]     = xFltOld[iOld];
-      for (unsigned jj = 0; jj < ii; jj++) {
-        const t_pppParam* par2 = params[jj];
-        int               jOld = par2->indexOld();
-        if (jOld >= 0) {
-          _QFlt[ii][jj] = QFltOld(iOld+1,jOld+1);
-        }
-      }
-    }
-  }
-}
+      _QFlt[ii][ii] += par1->noise() * par1->noise();
+    }
+  }
+}

trunk/BNC/src/PPP/pppFilter.h

@@ -61 +61 @@
   void cmpDOP(const std::vector<t_pppSatObs*>& obsVector);
 
-  void predictCovCrdPart(const SymmetricMatrix& QFltOld, const ColumnVector& xFltOld);
+  void predictCovCrdPart();
 
   bncTime         _epoTime;