Changeset 7267 in ntrip for trunk/BNC

Timestamp:

Sep 2, 2015, 5:08:07 PM (9 years ago)

Author:

stuerze

Message:

satellite number per system is added in PPP output

File:

• trunk/BNC/src/PPP/pppFilter.cpp (modified) (14 diffs)

trunk/BNC/src/PPP/pppFilter.cpp

@@ -11 +11 @@
  * Created:    29-Jul-2014
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -70 +70 @@
   }
 
+  string epoTimeStr = string(_epoTime);
+
   // Set Parameters
   // --------------
@@ -83 +85 @@
   _xFlt.ReSize(_parlist->nPar()); _xFlt = 0.0;
   _x0.ReSize(_parlist->nPar());   _x0   = 0.0;
-  
+
   for (unsigned ii = 0; ii < params.size(); ii++) {
     const t_pppParam* par1 = params[ii];
@@ -112 +114 @@
   for (unsigned iSys = 0; iSys < OPT->systems().size(); iSys++) {
     char system = OPT->systems()[iSys];
+    unsigned int num = 0;
     vector<t_pppSatObs*> obsVector;
     for (unsigned jj = 0; jj < allObs.size(); jj++) {
       if (allObs[jj]->prn().system() == system) {
         obsVector.push_back(allObs[jj]);
-      }
-    }
+        num++;
+      }
+    }
+    LOG << epoTimeStr << " SATNUM " << system << ' ' << right << setw(2) << num << endl;
     if ( processSystem(OPT->LCs(system), obsVector) != success ) {
       return failure;
     }
   }
-   
+
   cmpDOP(allObs);
 
@@ -132 +137 @@
 // Process Selected LCs
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_pppFilter::processSystem(const vector<t_lc::type>& LCs, 
+t_irc t_pppFilter::processSystem(const vector<t_lc::type>& LCs,
                                  const vector<t_pppSatObs*>& obsVector) {
 
@@ -148 +153 @@
   const vector<t_pppParam*>& params     = _parlist->params();
   unsigned                maxObs     = obsVector.size() * LCs.size();
-    
+
   // Outlier Detection Loop
   // ----------------------
@@ -163 +168 @@
     ColumnVector          ll(maxObs);
     DiagonalMatrix        PP(maxObs); PP = 0.0;
-    
+
     int iObs = -1;
     vector<t_pppSatObs*> usedObs;
@@ -221 +226 @@
       t_pppSatObs* obs = usedObs[maxOutlierIndex];
       t_pppParam* par = 0;
-      LOG << epoTimeStr << " Outlier " << t_lc::toString(maxOutlierLC) << ' ' 
-          << obs->prn().toString()                        << ' ' 
+      LOG << epoTimeStr << " Outlier " << t_lc::toString(maxOutlierLC) << ' '
+          << obs->prn().toString()                        << ' '
           << setw(8) << setprecision(4) << maxOutlier << endl;
       for (unsigned iPar = 0; iPar < params.size(); iPar++) {
         t_pppParam* hlp = params[iPar];
-        if (hlp->type() == t_pppParam::amb && hlp->prn()  == obs->prn() && 
+        if (hlp->type() == t_pppParam::amb && hlp->prn()  == obs->prn() &&
             hlp->tLC()  == usedTypes[maxOutlierIndex]) {
           par = hlp;
@@ -254 +259 @@
           if (tLC == LCs[jj]) {
             obs->setRes(tLC, vv[ii]);
-            LOG << epoTimeStr << " RES " 
-                << left << setw(3) << t_lc::toString(tLC) << right << ' ' 
+            LOG << epoTimeStr << " RES "
+                << left << setw(3) << t_lc::toString(tLC) << right << ' '
                 << obs->prn().toString().substr(0,3) << ' '
                 << setw(8) << setprecision(4) << vv[ii] << endl;
@@ -270 +275 @@
 // Cycle-Slip Detection
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_pppFilter::detectCycleSlips(const vector<t_lc::type>& LCs, 
+t_irc t_pppFilter::detectCycleSlips(const vector<t_lc::type>& LCs,
                                     const vector<t_pppSatObs*>& obsVector) {
 
@@ -283 +288 @@
         const t_pppSatObs* obs = obsVector[iObs];
 
-        // Check set Slips and Jump Counters 
+        // Check set Slips and Jump Counters
         // ---------------------------------
         bool slip = false;
@@ -307 +312 @@
 
         // Slip Set
-        // --------  
+        // --------
         if (slip) {
           resetAmb(obs->prn(), obsVector);
         }
-  
+
         // Check Pre-Fit Residuals
         // -----------------------
@@ -320 +325 @@
             AA[iPar] = par->partial(_epoTime, obs, tLC);
           }
-          
+
           double ll = obs->obsValue(tLC) - obs->cmpValue(tLC) - DotProduct(_x0, AA);
           double vv = DotProduct(AA, _xFlt) - ll;
-          
+
           if (fabs(vv) > SLIP) {
-            LOG << epoTimeStr << " cycle slip detected " << t_lc::toString(tLC) << ' ' 
+            LOG << epoTimeStr << " cycle slip detected " << t_lc::toString(tLC) << ' '
                 << obs->prn().toString() << ' ' << setw(8) << setprecision(4) << vv << endl;
             resetAmb(obs->prn(), obsVector);
@@ -398 +403 @@
     }
     AA = AA.Rows(1, _numSat);
-    SymmetricMatrix NN; NN << AA.t() * AA;  
+    SymmetricMatrix NN; NN << AA.t() * AA;
     SymmetricMatrix QQ = NN.i();
-    
+
     _dop.P = sqrt(QQ(1,1) + QQ(2,2) + QQ(3,3));
     _dop.T = sqrt(QQ(4,4));