Changeset 3399 in ntrip

Timestamp:

Sep 1, 2011, 4:41:27 PM (13 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/bncmodel.cpp (modified) (5 diffs)

trunk/BNC/bncmodel.cpp

@@ -1191 +1191 @@
   Tracer tracer("bncModel::update_p");
 
-  // Bancroft Solution
-  // -----------------
-  if (cmpBancroft(epoData) != success) {
-    return failure;
-  }
-
+  // Save Variance-Covariance Matrix, and Status Vector
+  // --------------------------------------------------
   rememberState(epoData);
 
@@ -1232 +1228 @@
       }
       if (epoData->sizeSys('G') < MINOBS) {
+        continue;
+      }
+
+      // Bancroft Solution
+      // -----------------
+      if (cmpBancroft(epoData) != success) {
         continue;
       }
@@ -1277 +1279 @@
         ColumnVector vv = ll - AA * dx;
         
-        // Print Residuals
-        // ---------------
-        if (true) {
+        // Check the residuals
+        // -------------------
+        if ( outlierDetection(iPhase, vv, epoData->satData) ) {
+          restoreState(epoData);
+          break;
+        }
+
+        // Set estimated values
+        // --------------------
+        else if (!_usePhase || iPhase == 1) {
+          QVectorIterator<bncParam*> itPar(_params);
+          while (itPar.hasNext()) {
+            bncParam* par = itPar.next();
+            par->xx += dx(par->index);
+          }
+
+          // Print Neglected PRNs
+          // --------------------
+          if (nNeglected > 0) {
+            _log += "Neglected PRNs: ";
+            for (unsigned ip = 0; ip < allPrns.size(); ip++) {
+              QString prn = allPrns[ip];
+              if ( !findInVector(usedPrns, prn) ) {
+                _log += prn + " ";
+              }
+            }
+            _log += '\n';
+          }
+
+          // Print Residuals
+          // ---------------
           ostringstream str;
           str.setf(ios::fixed);
@@ -1292 +1322 @@
           }
           _log += str.str().c_str();
-        }
         
-        // Check the residuals
-        // -------------------
-        if ( outlierDetection(iPhase, vv, epoData->satData) ) {
-          restoreState(epoData);
-          break;
-        }
-
-        // Set estimated values
-        // --------------------
-        else if (!_usePhase || iPhase == 1) {
-          QVectorIterator<bncParam*> itPar(_params);
-          while (itPar.hasNext()) {
-            bncParam* par = itPar.next();
-            par->xx += dx(par->index);
-          }
           return success;
         }
@@ -1315 +1329 @@
 
     } while ( next_combination(allPrns.begin(), allPrns.end(),
-                                 usedPrns.begin(), usedPrns.end()) );
+                               usedPrns.begin(), usedPrns.end()) );
 
   } // for (unsigned nNeglected