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

Timestamp:

Aug 6, 2014, 1:02:08 PM (10 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/src/PPP/pppFilter.cpp

@@ -30 +30 @@
 // Process Single Epoch
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_pppFilter::processEpoch(t_pppObsPool* obsPool) {
+t_irc t_pppFilter::processEpoch(t_frqObsPool* obsPool) {
 
   _numSat     = 0;
@@ -40 +40 @@
   // Vector of all Observations
   // --------------------------
-  t_pppObsPool::t_epoch* epoch = obsPool->lastEpoch();
+  t_frqObsPool::t_epoch* epoch = obsPool->lastEpoch();
   if (!epoch) {
     return failure;
   }
-  vector<t_satObs*>& obsVector = epoch->obsVector();
+  vector<t_pppSatObs*>& obsVector = epoch->obsVector();
 
   // Time of the Epoch
@@ -128 +128 @@
 ////////////////////////////////////////////////////////////////////////////
 t_irc t_pppFilter::processLC(const vector<t_lc::type>& LCs, 
-                               vector<t_satObs*>& obsVector) {
+                               vector<t_pppSatObs*>& obsVector) {
 
   LOG.setf(ios::fixed);
@@ -160 +160 @@
     
     int iObs = -1;
-    vector<t_satObs*>  usedObs;
+    vector<t_pppSatObs*>  usedObs;
     vector<t_lc::type> usedTypes;
     for (unsigned ii = 0; ii < obsVector.size(); ii++) {
-      t_satObs* obs = obsVector[ii];
+      t_pppSatObs* obs = obsVector[ii];
       if (!obs->outlier()) {
         Matrix CC(LCs.size(), 4);
@@ -237 +237 @@
     // --------------------------------------------
     if (maxOutlierIndex > -1) {
-      t_satObs* obs = usedObs[maxOutlierIndex];
+      t_pppSatObs* obs = usedObs[maxOutlierIndex];
       t_pppParam* par = 0;
       LOG << epoTimeStr << " Outlier " << t_lc::toString(maxOutlierLC) << ' ' 
@@ -269 +269 @@
         for (unsigned ii = 0; ii < usedObs.size(); ii++) {
           const t_lc::type tLC = usedTypes[ii];
-          t_satObs*        obs = usedObs[ii];
+          t_pppSatObs*        obs = usedObs[ii];
           if (tLC == LCs[jj]) {
             obs->setRes(tLC, vv[ii]);
@@ -290 +290 @@
 ////////////////////////////////////////////////////////////////////////////
 t_irc t_pppFilter::detectCycleSlips(const vector<t_lc::type>& LCs, 
-                                      const vector<t_satObs*>& obsVector) {
+                                      const vector<t_pppSatObs*>& obsVector) {
 
   const double            SLIP       = 20.0;  // slip threshold
@@ -300 +300 @@
     if (t_lc::includesPhase(tLC)) {
       for (unsigned iObs = 0; iObs < obsVector.size(); iObs++) {
-        const t_satObs* obs = obsVector[iObs];
+        const t_pppSatObs* obs = obsVector[iObs];
 
         // Check set Slips and Jump Counters 
@@ -358 +358 @@
 // Reset Ambiguity Parameter (cycle slip)
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_pppFilter::resetAmb(t_prn prn, const vector<t_satObs*>& obsVector,
+t_irc t_pppFilter::resetAmb(t_prn prn, const vector<t_pppSatObs*>& obsVector,
                          SymmetricMatrix* QSav, ColumnVector* xSav) {
   t_irc irc = failure;