Changeset 3321 in ntrip for trunk/BNC

Timestamp:

Jun 29, 2011, 8:00:11 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

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

trunk/BNC/bncmodel.cpp

@@ -690 +690 @@
   // Outlier Detection Loop
   // ----------------------
-  ColumnVector dx;
-  if (update_p(epoData, dx) != success) {
+  if (update_p(epoData) != success) {
     return failure;
   }
@@ -707 +706 @@
   while (itPar.hasNext()) {
     bncParam* par = itPar.next();
-    par->xx += dx(par->index);
 
     if      (par->type == bncParam::RECCLK) {
@@ -1307 +1305 @@
 // Update Step (private - loop over outliers)
 ////////////////////////////////////////////////////////////////////////////
-t_irc bncModel::update_p(t_epoData* epoData, ColumnVector& dx) {
+t_irc bncModel::update_p(t_epoData* epoData) {
 
   Tracer tracer("bncModel::update_p");
@@ -1315 +1313 @@
 
   for (int iPhase = 0; iPhase <= (_usePhase ? 1 : 0); iPhase++) {
+
+    ColumnVector dx;
 
     do {
@@ -1416 +1416 @@
     } while (outlierDetection(iPhase, QQsav, vv, epoData->satDataGPS, 
                               epoData->satDataGlo, epoData->satDataGal) != 0);
+
+    // Update Parameters
+    // -----------------
+    QVectorIterator<bncParam*> itPar(_params);
+    while (itPar.hasNext()) {
+      bncParam* par = itPar.next();
+      par->xx += dx(par->index);
+    }
   }
 

trunk/BNC/bncmodel.h

@@ -107 +107 @@
   double delay_saast(double Ele);
   void   predict(int iPhase, t_epoData* epoData);
-  t_irc  update_p(t_epoData* epoData, ColumnVector& dx);
+  t_irc  update_p(t_epoData* epoData);
   int    outlierDetection(int iPhase, const SymmetricMatrix& QQsav, 
                           const ColumnVector& vv,

trunk/BNC/ppp.gpt

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