Changeset 3322 in ntrip for trunk/BNC/bncmodel.cpp

Timestamp:

Jul 1, 2011, 12:59:38 PM (13 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/bncmodel.cpp

@@ -55 +55 @@
 using namespace std;
 
-const unsigned MINOBS           =    4;
+const unsigned MINOBS           =    5;
 const double   MINELE_GPS       = 10.0 * M_PI / 180.0;
 const double   MINELE_GLO       = 10.0 * M_PI / 180.0;
@@ -1309 +1309 @@
   Tracer tracer("bncModel::update_p");
 
-  SymmetricMatrix QQsav;
-  ColumnVector    vv;
+  // Remeber Original State Vector and Variance-Covariance Matrix
+  // ------------------------------------------------------------
+  SymmetricMatrix QQ_orig = _QQ;
+
+  QVectorIterator<bncParam*> itPar(_params);
+  QVector<bncParam*> params_orig;
+  while (itPar.hasNext()) {
+    bncParam* par = itPar.next();
+    params_orig.push_back(new bncParam(*par));
+  }
 
   for (int iPhase = 0; iPhase <= (_usePhase ? 1 : 0); iPhase++) {
 
-    ColumnVector dx;
+    SymmetricMatrix QQsav;
+    ColumnVector    vv;
+    ColumnVector    dx;
 
     do {
@@ -1322 +1332 @@
       if (iPhase == 0) {      
         if (cmpBancroft(epoData) != success) {
+          QVectorIterator<bncParam*> itParOrig(params_orig);
+          while (itParOrig.hasNext()) {
+            bncParam* par = itParOrig.next();
+            delete par;
+          }
+          emit newMessage(_log, false);
+          return failure;
+        }
+      }
+      else {
+        if (epoData->sizeGPS() < MINOBS) {
+
+          _QQ = QQ_orig;
+          QVectorIterator<bncParam*> itPar(_params);
+          while (itPar.hasNext()) {
+            bncParam* par = itPar.next();
+            delete par;
+          }
+          _params.clear();
+
+          QVectorIterator<bncParam*> itParOrig(params_orig);
+          while (itParOrig.hasNext()) {
+            bncParam* par = itParOrig.next();
+            _params.push_back(par);
+          }
+
+          _log += "bncModel::update_p: not enough data\n";
           emit newMessage(_log, false);
           return failure;
@@ -1426 +1463 @@
   }
 
+  QVectorIterator<bncParam*> itParOrig(params_orig);
+  while (itParOrig.hasNext()) {
+    bncParam* par = itParOrig.next();
+    delete par;
+  }
   return success;
 }