Changeset 3308 in ntrip

Timestamp:

Jun 21, 2011, 6:10:42 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncmodel.cpp (modified) (10 diffs)
• bncmodel.h (modified) (2 diffs)
• ppp.gpt (modified) (1 diff)

trunk/BNC/bncmodel.cpp

@@ -919 +919 @@
 // Outlier Detection
 ////////////////////////////////////////////////////////////////////////////
-int bncModel::outlierDetection(const SymmetricMatrix& QQsav, 
+int bncModel::outlierDetection(int phase, const SymmetricMatrix& QQsav, 
                                const ColumnVector& vv,
                                QMap<QString, t_satData*>& satDataGPS,
@@ -935 +935 @@
   int irc = 0;
 
-  // Check GPS Code
-  // --------------
-  if (irc == 0) {
-    findMaxRes(vv,satDataGPS, prnCode, maxResCode, prnPhase, maxResPhase);
-    if (maxResCode > MAXRES_CODE_GPS) {
-      satDataGPS.remove(prnCode);
-      prnRemoved = prnCode;
-      maxRes     = maxResCode;
-      irc        = 1;
-    }
-  }
-
-  // Check Galileo Code
-  // ------------------
-  if (irc == 0) {
-    findMaxRes(vv,satDataGal, prnCode, maxResCode, prnPhase, maxResPhase);
-    if (maxResCode > MAXRES_CODE_GAL) {
-      satDataGal.remove(prnCode);
-      prnRemoved = prnCode;
-      maxRes     = maxResCode;
-      irc        = 1;
-    }
-  }
-
-  // Check Glonass Phase
-  // -------------------
-  if (irc == 0) {
-    findMaxRes(vv,satDataGlo, prnCode, maxResCode, prnPhase, maxResPhase);
-    if (maxResPhase > MAXRES_PHASE_GLO) {
-      satDataGlo.remove(prnPhase);
-      prnRemoved = prnPhase;
-      maxRes     = maxResPhase;
-      irc        = 1;
-    }
-  }
-
-  // Check Galileo Phase
-  // -------------------
-  if (irc == 0) {
-    findMaxRes(vv,satDataGal, prnCode, maxResCode, prnPhase, maxResPhase);
-    if      (maxResPhase > MAXRES_PHASE_GAL) {
-      satDataGal.remove(prnPhase);
-      prnRemoved = prnPhase;
-      maxRes     = maxResPhase;
-      irc        = 1;
-    }
-  }
-
-  // Check GPS Phase
-  // ---------------
-  if (irc == 0) {
-    findMaxRes(vv,satDataGPS, prnCode, maxResCode, prnPhase, maxResPhase);
-    if      (maxResPhase > MAXRES_PHASE_GPS) {
-      satDataGPS.remove(prnPhase);
-      prnRemoved = prnPhase;
-      maxRes     = maxResPhase;
-      irc        = 1;
+  if (phase == 0) {
+
+    // Check GPS Code
+    // --------------
+    if (irc == 0) {
+      findMaxRes(vv,satDataGPS, prnCode, maxResCode, prnPhase, maxResPhase);
+      if (maxResCode > MAXRES_CODE_GPS) {
+        satDataGPS.remove(prnCode);
+        prnRemoved = prnCode;
+        maxRes     = maxResCode;
+        irc        = 1;
+      }
+    }
+    
+    // Check Galileo Code
+    // ------------------
+    if (irc == 0) {
+      findMaxRes(vv,satDataGal, prnCode, maxResCode, prnPhase, maxResPhase);
+      if (maxResCode > MAXRES_CODE_GAL) {
+        satDataGal.remove(prnCode);
+        prnRemoved = prnCode;
+        maxRes     = maxResCode;
+        irc        = 1;
+      }
+    }
+  }
+
+  else {
+    // Check Glonass Phase
+    // -------------------
+    if (irc == 0) {
+      findMaxRes(vv,satDataGlo, prnCode, maxResCode, prnPhase, maxResPhase);
+      if (maxResPhase > MAXRES_PHASE_GLO) {
+        satDataGlo.remove(prnPhase);
+        prnRemoved = prnPhase;
+        maxRes     = maxResPhase;
+        irc        = 1;
+      }
+    }
+    
+    // Check Galileo Phase
+    // -------------------
+    if (irc == 0) {
+      findMaxRes(vv,satDataGal, prnCode, maxResCode, prnPhase, maxResPhase);
+      if      (maxResPhase > MAXRES_PHASE_GAL) {
+        satDataGal.remove(prnPhase);
+        prnRemoved = prnPhase;
+        maxRes     = maxResPhase;
+        irc        = 1;
+      }
+    }
+    
+    // Check GPS Phase
+    // ---------------
+    if (irc == 0) {
+      findMaxRes(vv,satDataGPS, prnCode, maxResCode, prnPhase, maxResPhase);
+      if      (maxResPhase > MAXRES_PHASE_GPS) {
+        satDataGPS.remove(prnPhase);
+        prnRemoved = prnPhase;
+        maxRes     = maxResPhase;
+        irc        = 1;
+      }
     }
   }
@@ -1212 +1217 @@
 // 
 ///////////////////////////////////////////////////////////////////////////
-void bncModel::printRes(const ColumnVector& vv, 
+void bncModel::printRes(int phase, const ColumnVector& vv, 
                         ostringstream& str, t_satData* satData) {
-  if (satData->indexPhase) {
+  if (phase) {
     str << _time.timestr(1)
         << " RES " << satData->prn.toAscii().data() << "   L3 "
         << setw(9) << setprecision(4) << vv(satData->indexPhase) << endl;
   }
-  if (satData->indexCode) {
+  else {
     str << _time.timestr(1)
         << " RES " << satData->prn.toAscii().data() << "   P3 "
@@ -1261 +1266 @@
   ColumnVector    vv;
 
-  for (int iPhase = 0; iPhase <= 1; iPhase++) {
+  for (int iPhase = 0; iPhase <= (_usePhase ? 1 : 0); iPhase++) {
 
     do {
@@ -1273 +1278 @@
           return failure;
         }
+      }
       
-        // Status Prediction
-        // -----------------
-        predict(epoData);
-      }
+      // Status Prediction
+      // -----------------
+      predict(epoData);
       
       // Create First-Design Matrix
@@ -1283 +1288 @@
       unsigned nPar = _params.size();
       unsigned nObs = 0;
-      nObs = epoData->sizeGPS() + epoData->sizeGal(); // Glonass code not used
+      if (iPhase == 0) {
+        nObs = epoData->sizeGPS() + epoData->sizeGal(); // Glonass code not used
+      }
+      else {
+        nObs = epoData->sizeGPS() + epoData->sizeGal() + epoData->sizeGlo();
+      }
     
       Matrix          AA(nObs, nPar);  // first design matrix
@@ -1300 +1310 @@
       }
     
+      // Glonass
+      // -------
+      if (iPhase == 1) {
+        QMapIterator<QString, t_satData*> itGlo(epoData->satDataGlo);
+        while (itGlo.hasNext()) {
+          itGlo.next();
+          t_satData* satData = itGlo.value();
+          addObs(iPhase, iObs, satData, AA, ll, PP);
+        }
+      }
+
       // Galileo
       // -------
@@ -1316 +1337 @@
     
       vv = ll - AA * dx;
-    
+
       // Print Residuals
       // ---------------
@@ -1327 +1348 @@
           itGPS.next();
           t_satData* satData = itGPS.value();
-          printRes(vv, str, satData);
-        }
-        QMapIterator<QString, t_satData*> itGlo(epoData->satDataGlo);
-        while (itGlo.hasNext()) {
-          itGlo.next();
-          t_satData* satData = itGlo.value();
-          printRes(vv, str, satData);
+          printRes(iPhase, vv, str, satData);
+        }
+        if (iPhase == 1) {
+          QMapIterator<QString, t_satData*> itGlo(epoData->satDataGlo);
+          while (itGlo.hasNext()) {
+            itGlo.next();
+            t_satData* satData = itGlo.value();
+            printRes(iPhase, vv, str, satData);
+          }
         }
         QMapIterator<QString, t_satData*> itGal(epoData->satDataGal);
@@ -1339 +1362 @@
           itGal.next();
           t_satData* satData = itGal.value();
-          printRes(vv, str, satData);
+          printRes(iPhase, vv, str, satData);
         }
         _log += str.str().c_str();
       }
     
-    } while (outlierDetection(QQsav, vv, epoData->satDataGPS, 
+    } while (outlierDetection(iPhase, QQsav, vv, epoData->satDataGPS, 
                               epoData->satDataGlo, epoData->satDataGal) != 0);
   }

trunk/BNC/bncmodel.h

@@ -98 +98 @@
   void   addObs(int phase, unsigned& iObs, t_satData* satData,
                 Matrix& AA, ColumnVector& ll, DiagonalMatrix& PP);
-  void   printRes(const ColumnVector& vv, 
+  void   printRes(int phase, const ColumnVector& vv, 
                   std::ostringstream& str, t_satData* satData);
   void   findMaxRes(const ColumnVector& vv,
@@ -108 +108 @@
   void   predict(t_epoData* epoData);
   t_irc  update_p(t_epoData* epoData, ColumnVector& dx);
-  int    outlierDetection(const SymmetricMatrix& QQsav, 
+  int    outlierDetection(int phase, const SymmetricMatrix& QQsav, 
                           const ColumnVector& vv,
                           QMap<QString, t_satData*>& satDataGPS,

trunk/BNC/ppp.gpt

@@ -25 +25 @@
 
 set ylabel "meters"
-set yrange [-0.5:0.5]
+set yrange [-1.0:1.0]
 
 set ytics nomirror