Changeset 5748 in ntrip for trunk/BNC/src/PPP

Timestamp:

Aug 3, 2014, 10:13:50 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• filter.cpp (modified) (6 diffs)
• options.h (modified) (1 diff)

trunk/BNC/src/PPP/filter.cpp

@@ -4 +4 @@
 #include <newmat.h>
 #include <newmatio.h>
+#include <newmatap.h>
 
 #include "filter.h"
@@ -10 +11 @@
 #include "station.h"
 #include "pppClient.h"
+#include "bncmodel.h"
 
 using namespace BNC;
@@ -194 +196 @@
     // Check number of observations, truncate matrices
     // -----------------------------------------------
-    if (iObs+1 < OPT->minobs()) {
+    if (iObs+1 < OPT->_minObs) {
       return failure;
     }
@@ -203 +205 @@
     // Kalman update step
     // ------------------
-    kalman(_QFlt, _xFlt, AA, ll, Sl);
+    bncModel::kalman(AA, ll, Sl, _QFlt, _xFlt);
 
     // Check Residuals
@@ -214 +216 @@
       const t_lc::type tLC = usedTypes[ii];
       double res = fabs(vv[ii]);
-      if (res > 
-          (t_lc::includesCode(tLC) ? OPT->maxResCode() : OPT->maxResPhase())) {
+      if (res > OPT->maxRes(tLC)) {
         if (res > fabs(maxOutlier)) {
           maxOutlier      = vv[ii];
@@ -262 +263 @@
           if (tLC == LCs[jj]) {
             obs->setRes(tLC, vv[ii]);
-            if (OPT->logLevel() > 1) {
-              LOG << epoTimeStr << " RES " 
-                  << left << setw(3) << t_lc::toString(tLC) << right << ' ' 
-                  << obs->prn().toString() << ' ' 
-                  << setw(8) << setprecision(4) << vv[ii] << endl;
-            }
+            LOG << epoTimeStr << " RES " 
+                << left << setw(3) << t_lc::toString(tLC) << right << ' ' 
+                << obs->prn().toString() << ' ' 
+                << setw(8) << setprecision(4) << vv[ii] << endl;
           }
         }

trunk/BNC/src/PPP/options.h

@@ -16 +16 @@
   bool useGlonass();
   bool xyzAprRoverSet();
+  std::vector<t_lc::type> LCs();
+  double maxRes(t_lc::type tLC);
 
   bool         _realTime;