Changeset 5810 in ntrip for trunk/BNC/src/PPP/pppFilter.cpp

Timestamp:

Aug 6, 2014, 11:34:36 AM (10 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/src/PPP/pppFilter.cpp

@@ -6 +6 @@
 #include <newmatap.h>
 
-#include "filter.h"
+#include "pppFilter.h"
 #include "bncutils.h"
-#include "parlist.h"
-#include "obspool.h"
-#include "station.h"
+#include "pppParlist.h"
+#include "pppObsPool.h"
+#include "pppStation.h"
 #include "pppClient.h"
 
@@ -18 +18 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-t_filter::t_filter() {
+t_pppFilter::t_pppFilter() {
   _parlist = 0;
 }
@@ -24 +24 @@
 // Destructor
 ////////////////////////////////////////////////////////////////////////////
-t_filter::~t_filter() {
+t_pppFilter::~t_pppFilter() {
   delete _parlist;
 }
@@ -30 +30 @@
 // Process Single Epoch
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_filter::processEpoch(t_obsPool* obsPool) {
+t_irc t_pppFilter::processEpoch(t_pppObsPool* obsPool) {
 
   _numSat     = 0;
 
   if (!_parlist) {
-    _parlist = new t_parlist();
+    _parlist = new t_pppParlist();
   }
 
   // Vector of all Observations
   // --------------------------
-  t_obsPool::t_epoch* epoch = obsPool->lastEpoch();
+  t_pppObsPool::t_epoch* epoch = obsPool->lastEpoch();
   if (!epoch) {
     return failure;
@@ -76 +76 @@
   // --------------
   _parlist->set(_epoTime, ambLCs, obsVector);
-  const vector<t_param*>& params = _parlist->params();
+  const vector<t_pppParam*>& params = _parlist->params();
 
   // Status Vector, Variance-Covariance Matrix
@@ -88 +88 @@
   
   for (unsigned ii = 0; ii < params.size(); ii++) {
-    const t_param* par1 = params[ii];
+    const t_pppParam* par1 = params[ii];
 
     _x0[ii] = par1->x0();
@@ -100 +100 @@
       _xFlt[ii]     = xFltOld[iOld];
       for (unsigned jj = 0; jj < ii; jj++) {
-        const t_param* par2 = params[jj];
+        const t_pppParam* par2 = params[jj];
         int            jOld = par2->indexOld();
         if (jOld >= 0) {
@@ -127 +127 @@
 // Process Selected LCs
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_filter::processLC(const vector<t_lc::type>& LCs, 
+t_irc t_pppFilter::processLC(const vector<t_lc::type>& LCs, 
                                vector<t_satObs*>& obsVector) {
 
@@ -141 +141 @@
   SymmetricMatrix         QSav       = _QFlt;
   string                  epoTimeStr = string(_epoTime);
-  const vector<t_param*>& params     = _parlist->params();
+  const vector<t_pppParam*>& params     = _parlist->params();
   unsigned                maxObs     = obsVector.size() * LCs.size();
     
@@ -172 +172 @@
           usedTypes.push_back(tLC);
           for (unsigned iPar = 0; iPar < params.size(); iPar++) {
-            const t_param* par = params[iPar];
+            const t_pppParam* par = params[iPar];
             AA[iObs][iPar] = par->partial(_epoTime, obs, tLC);
           }
@@ -238 +238 @@
     if (maxOutlierIndex > -1) {
       t_satObs* obs = usedObs[maxOutlierIndex];
-      t_param* par = 0;
+      t_pppParam* par = 0;
       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_param* hlp = params[iPar];
-        if (hlp->type() == t_param::amb && hlp->prn()  == obs->prn() && 
+        t_pppParam* hlp = params[iPar];
+        if (hlp->type() == t_pppParam::amb && hlp->prn()  == obs->prn() && 
             hlp->tLC()  == usedTypes[maxOutlierIndex]) {
           par = hlp;
@@ -289 +289 @@
 // Cycle-Slip Detection
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_filter::detectCycleSlips(const vector<t_lc::type>& LCs, 
+t_irc t_pppFilter::detectCycleSlips(const vector<t_lc::type>& LCs, 
                                       const vector<t_satObs*>& obsVector) {
 
   const double            SLIP       = 20.0;  // slip threshold
   string                  epoTimeStr = string(_epoTime);
-  const vector<t_param*>& params     = _parlist->params();
+  const vector<t_pppParam*>& params     = _parlist->params();
 
   for (unsigned ii = 0; ii < LCs.size(); ii++) {
@@ -336 +336 @@
           ColumnVector AA(params.size());
           for (unsigned iPar = 0; iPar < params.size(); iPar++) {
-            const t_param* par = params[iPar];
+            const t_pppParam* par = params[iPar];
             AA[iPar] = par->partial(_epoTime, obs, tLC);
           }
@@ -358 +358 @@
 // Reset Ambiguity Parameter (cycle slip)
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_filter::resetAmb(t_prn prn, const vector<t_satObs*>& obsVector,
+t_irc t_pppFilter::resetAmb(t_prn prn, const vector<t_satObs*>& obsVector,
                          SymmetricMatrix* QSav, ColumnVector* xSav) {
   t_irc irc = failure;
-  vector<t_param*>& params = _parlist->params();
+  vector<t_pppParam*>& params = _parlist->params();
   for (unsigned iPar = 0; iPar < params.size(); iPar++) {
-    t_param* par = params[iPar];
-    if (par->type() == t_param::amb && par->prn() == prn) {
+    t_pppParam* par = params[iPar];
+    if (par->type() == t_pppParam::amb && par->prn() == prn) {
       int ind = par->indexNew();
       t_lc::type tLC = par->tLC();
       LOG << string(_epoTime) << " RESET " << par->toString() << endl;
-      delete par; par = new t_param(t_param::amb, prn, tLC, &obsVector);
+      delete par; par = new t_pppParam(t_pppParam::amb, prn, tLC, &obsVector);
       par->setIndex(ind);
       params[iPar] = par;
@@ -395 +395 @@
 // Compute various DOP Values
 ////////////////////////////////////////////////////////////////////////////
-void t_filter::cmpDOP(const std::vector<t_lc::type>& LCs, const Matrix& AA) {
+void t_pppFilter::cmpDOP(const std::vector<t_lc::type>& LCs, const Matrix& AA) {
 
   _dop.reset();