Changeset 2670 in ntrip

Timestamp:

Nov 12, 2010, 10:25:48 AM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

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

trunk/BNC/bncmodel.cpp

@@ -724 +724 @@
                             epoData->satDataGlo) != 0);
 
+  // Remember the Epoch-specific Results for the computation of means
+  // ----------------------------------------------------------------
+  pppPos* newPos = new pppPos;
+  newPos->time   = epoData->tt;
+  _posAverage.push_back(newPos); 
+
   // Set Solution Vector
   // -------------------
@@ -745 +751 @@
     }
     else if (par->type == bncParam::TROPO) {
+      double aprTrp = delay_saast(M_PI/2.0);
       strB << "\n    trp     = " << par->prn.toAscii().data()
-           << setw(7) << setprecision(3) << delay_saast(M_PI/2.0) << " "
+           << setw(7) << setprecision(3) << aprTrp << " "
            << setw(6) << setprecision(3) << showpos << par->xx << noshowpos
            << " +- " << setw(6) << setprecision(3) 
            << sqrt(_QQ(par->index,par->index));
+      newPos->xnt[6] = aprTrp + par->xx;
     }
   }
@@ -755 +763 @@
   _log += strB.str().c_str();
   emit newMessage(_log, false);
-
 
   // Final Message (both log file and screen)
@@ -780 +787 @@
     xyzRef[2] = settings.value("pppRefCrdZ").toDouble();
 
-    pppPos* newPos = new pppPos;
-    newPos->time   = epoData->tt;
-    newPos->xn[0] = x() - xyzRef[0];
-    newPos->xn[1] = y() - xyzRef[1];
-    newPos->xn[2] = z() - xyzRef[2];
+    newPos->xnt[0] = x() - xyzRef[0];
+    newPos->xnt[1] = y() - xyzRef[1];
+    newPos->xnt[2] = z() - xyzRef[2];
 
     double ellRef[3];
     xyz2ell(xyzRef, ellRef);
-    xyz2neu(ellRef, newPos->xn, &newPos->xn[3]);
+    xyz2neu(ellRef, newPos->xnt, &newPos->xnt[3]);
 
     strC << "  NEU "
-         << setw(8) << setprecision(3) << newPos->xn[3] << " "
-         << setw(8) << setprecision(3) << newPos->xn[4] << " "
-         << setw(8) << setprecision(3) << newPos->xn[5];
-
-    _posAverage.push_back(newPos); // remember for the computation of mean
+         << setw(8) << setprecision(3) << newPos->xnt[3] << " "
+         << setw(8) << setprecision(3) << newPos->xnt[4] << " "
+         << setw(8) << setprecision(3) << newPos->xnt[5];
+
   }
 
@@ -814 +818 @@
     // Compute the Mean
     // ----------------
-    ColumnVector mean(6); mean = 0.0;
+    ColumnVector mean(7); mean = 0.0;
 
     QMutableVectorIterator<pppPos*> it(_posAverage);
@@ -824 +828 @@
       }
       else {
-        for (int ii = 0; ii < 6; ++ii) {
-          mean[ii] += pp->xn[ii];
+        for (int ii = 0; ii < 7; ++ii) {
+          mean[ii] += pp->xnt[ii];
         }
       }
@@ -838 +842 @@
       // Compute the Deviation
       // ---------------------
-      ColumnVector std(6); std = 0.0;
+      ColumnVector std(7); std = 0.0;
       QVectorIterator<pppPos*> it2(_posAverage);
       while (it2.hasNext()) {
         pppPos* pp = it2.next();
-        for (int ii = 0; ii < 6; ++ii) {
-          std[ii] += (pp->xn[ii] - mean[ii]) * (pp->xn[ii] - mean[ii]);
-        }
-      }
-      for (int ii = 0; ii < 6; ++ii) {
+        for (int ii = 0; ii < 7; ++ii) {
+          std[ii] += (pp->xnt[ii] - mean[ii]) * (pp->xnt[ii] - mean[ii]);
+        }
+      }
+      for (int ii = 0; ii < 7; ++ii) {
         std[ii] = sqrt(std[ii] / nn);
       }
@@ -869 +873 @@
            << setw(6)  << setprecision(3) << std[4]   << " "
            << setw(14) << setprecision(3) << mean[5]  << " +- "
-           << setw(6)  << setprecision(3) << std[5]   << endl;
+           << setw(6)  << setprecision(3) << std[5];
 
       emit newMessage(QByteArray(strE.str().c_str()), true);
+
+      ostringstream strF; strF.setf(ios::fixed);
+      strF << _staID.data() << "  AVE-TRP " 
+           << epoData->tt.timestr(1) << " "
+           << setw(13) << setprecision(3) << mean[6]  << " +- "
+           << setw(6)  << setprecision(3) << std[6]   << endl;
+
+      emit newMessage(QByteArray(strF.str().c_str()), true);
     }
   }

trunk/BNC/bncmodel.h

@@ -99 +99 @@
   class pppPos {
    public:
+    pppPos() {
+      for (int ii = 0; ii < 7; ++ii) {
+        xnt[ii] = 0.0;
+      }
+    }
     bncTime time;
-    double  xn[6];
+    double  xnt[7];
   };