Changeset 3407 in ntrip

Timestamp:

Sep 2, 2011, 8:23:29 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncmodel.cpp (modified) (13 diffs)
• bncmodel.h (modified) (1 diff)

trunk/BNC/bncmodel.cpp

@@ -936 +936 @@
 // Outlier Detection
 ////////////////////////////////////////////////////////////////////////////
-int bncModel::outlierDetection(int iPhase, const SymmetricMatrix& QQsav, 
-                               const ColumnVector& vv,
-                               QMap<QString, t_satData*>& satDataGPS,
-                               QMap<QString, t_satData*>& satDataGlo,
-                               QMap<QString, t_satData*>& satDataGal) {
+QString bncModel::outlierDetection(int iPhase, const SymmetricMatrix& QQsav, 
+                                   const ColumnVector& vv,
+                                   QMap<QString, t_satData*>& satDataGPS,
+                                   QMap<QString, t_satData*>& satDataGlo,
+                                   QMap<QString, t_satData*>& satDataGal) {
 
   Tracer tracer("bncModel::outlierDetection");
@@ -952 +952 @@
   double  maxRes;
 
-  int irc = 0;
-
   if (iPhase == 0) {
 
     // Check GPS Code
     // --------------
-    if (irc == 0) {
+    if (prnRemoved.isEmpty()) {
       findMaxRes(iPhase, vv,satDataGPS, prnCode, maxResCode, prnPhase, maxResPhase);
       if (maxResCode > MAXRES_CODE_GPS) {
@@ -964 +962 @@
         prnRemoved = prnCode;
         maxRes     = maxResCode;
-        irc        = 1;
       }
     }
@@ -970 +967 @@
     // Check Galileo Code
     // ------------------
-    if (irc == 0) {
+    if (prnRemoved.isEmpty()) {
       findMaxRes(iPhase, vv,satDataGal, prnCode, maxResCode, prnPhase, maxResPhase);
       if (maxResCode > MAXRES_CODE_GAL) {
@@ -976 +973 @@
         prnRemoved = prnCode;
         maxRes     = maxResCode;
-        irc        = 1;
       }
     }
@@ -985 +981 @@
     // Check Glonass Phase
     // -------------------
-    if (irc == 0) {
+    if (prnRemoved.isEmpty()) {
       findMaxRes(iPhase, vv,satDataGlo, prnCode, maxResCode, prnPhase, maxResPhase);
       if (maxResPhase > MAXRES_PHASE_GLO) {
@@ -991 +987 @@
         prnRemoved = prnPhase;
         maxRes     = maxResPhase;
-        irc        = 1;
       }
     }
@@ -997 +992 @@
     // Check Galileo Phase
     // -------------------
-    if (irc == 0) {
+    if (prnRemoved.isEmpty()) {
       findMaxRes(iPhase, vv,satDataGal, prnCode, maxResCode, prnPhase, maxResPhase);
       if      (maxResPhase > MAXRES_PHASE_GAL) {
@@ -1003 +998 @@
         prnRemoved = prnPhase;
         maxRes     = maxResPhase;
-        irc        = 1;
       }
     }
@@ -1009 +1003 @@
     // Check GPS Phase
     // ---------------
-    if (irc == 0) {
+    if (prnRemoved.isEmpty()) {
       findMaxRes(iPhase, vv,satDataGPS, prnCode, maxResCode, prnPhase, maxResPhase);
       if      (maxResPhase > MAXRES_PHASE_GPS) {
@@ -1015 +1009 @@
         prnRemoved = prnPhase;
         maxRes     = maxResPhase;
-        irc        = 1;
       }
     }
   }
  
-  if (irc != 0) {
+  if (!prnRemoved.isEmpty()) {
     _log += "Outlier " + prnRemoved.toAscii() + " " 
           + QByteArray::number(maxRes, 'f', 3) + "\n"; 
@@ -1033 +1026 @@
   }
 
-  return irc;
+  return prnRemoved;
 }
 
@@ -1451 +1444 @@
       }
     
-      if (outlierDetection(iPhase, QQsav, vv, epoData->satDataGPS, 
-                           epoData->satDataGlo, epoData->satDataGal) == 0) {
+      QString prnRemoved = outlierDetection(iPhase, QQsav, vv, 
+                                            epoData->satDataGPS, 
+                                            epoData->satDataGlo, 
+                                            epoData->satDataGal);
+      if (prnRemoved.isEmpty()) {
         break;
       }
-      else {
+      else if (prnRemoved[0] == 'G') {
         ++numOutliers;
       }

trunk/BNC/bncmodel.h

@@ -109 +109 @@
   void   predict(int iPhase, t_epoData* epoData);
   t_irc  update_p(t_epoData* epoData);
-  int    outlierDetection(int iPhase, const SymmetricMatrix& QQsav, 
-                          const ColumnVector& vv,
-                          QMap<QString, t_satData*>& satDataGPS,
-                          QMap<QString, t_satData*>& satDataGlo,
-                          QMap<QString, t_satData*>& satDataGal);
+  QString outlierDetection(int iPhase, const SymmetricMatrix& QQsav, 
+                           const ColumnVector& vv,
+                           QMap<QString, t_satData*>& satDataGPS,
+                           QMap<QString, t_satData*>& satDataGlo,
+                           QMap<QString, t_satData*>& satDataGal);
   void writeNMEAstr(const QString& nmStr);