Changeset 3309 in ntrip

Timestamp:

Jun 21, 2011, 6:16:40 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncmodel.cpp (modified) (8 diffs)
• bncmodel.h (modified) (2 diffs)

trunk/BNC/bncmodel.cpp

@@ -477 +477 @@
 // Prediction Step of the Filter
 ////////////////////////////////////////////////////////////////////////////
-void bncModel::predict(t_epoData* epoData) {
+void bncModel::predict(int iPhase, t_epoData* epoData) {
 
   bncSettings settings;
@@ -919 +919 @@
 // Outlier Detection
 ////////////////////////////////////////////////////////////////////////////
-int bncModel::outlierDetection(int phase, const SymmetricMatrix& QQsav, 
+int bncModel::outlierDetection(int iPhase, const SymmetricMatrix& QQsav, 
                                const ColumnVector& vv,
                                QMap<QString, t_satData*>& satDataGPS,
@@ -935 +935 @@
   int irc = 0;
 
-  if (phase == 0) {
+  if (iPhase == 0) {
 
     // Check GPS Code
@@ -963 +963 @@
 
   else {
+
     // Check Glonass Phase
     // -------------------
@@ -1183 +1184 @@
 // 
 ///////////////////////////////////////////////////////////////////////////
-void bncModel::addObs(int phase, unsigned& iObs, t_satData* satData,
+void bncModel::addObs(int iPhase, unsigned& iObs, t_satData* satData,
                       Matrix& AA, ColumnVector& ll, DiagonalMatrix& PP) {
 
   // Phase Observations
   // ------------------
-  if (phase == 1) {
+  if (iPhase == 1) {
     ++iObs;
     ll(iObs)      = satData->L3 - cmpValue(satData, true);
@@ -1217 +1218 @@
 // 
 ///////////////////////////////////////////////////////////////////////////
-void bncModel::printRes(int phase, const ColumnVector& vv, 
+void bncModel::printRes(int iPhase, const ColumnVector& vv, 
                         ostringstream& str, t_satData* satData) {
-  if (phase) {
+  if (iPhase == 1) {
     str << _time.timestr(1)
         << " RES " << satData->prn.toAscii().data() << "   L3 "
@@ -1270 +1271 @@
     do {
 
+      // Bancroft Solution
+      // -----------------
       if (iPhase == 0) {      
-
-        // Bancroft Solution
-        // -----------------
         if (cmpBancroft(epoData) != success) {
           emit newMessage(_log, false);
@@ -1282 +1282 @@
       // Status Prediction
       // -----------------
-      predict(epoData);
+      predict(iPhase, epoData);
       
       // Create First-Design Matrix

trunk/BNC/bncmodel.h

@@ -96 +96 @@
   void   cmpEle(t_satData* satData);
   void   addAmb(t_satData* satData);
-  void   addObs(int phase, unsigned& iObs, t_satData* satData,
+  void   addObs(int iPhase, unsigned& iObs, t_satData* satData,
                 Matrix& AA, ColumnVector& ll, DiagonalMatrix& PP);
-  void   printRes(int phase, const ColumnVector& vv, 
+  void   printRes(int iPhase, const ColumnVector& vv, 
                   std::ostringstream& str, t_satData* satData);
   void   findMaxRes(const ColumnVector& vv,
@@ -106 +106 @@
   double cmpValue(t_satData* satData, bool phase);
   double delay_saast(double Ele);
-  void   predict(t_epoData* epoData);
+  void   predict(int iPhase, t_epoData* epoData);
   t_irc  update_p(t_epoData* epoData, ColumnVector& dx);
-  int    outlierDetection(int phase, const SymmetricMatrix& QQsav, 
+  int    outlierDetection(int iPhase, const SymmetricMatrix& QQsav, 
                           const ColumnVector& vv,
                           QMap<QString, t_satData*>& satDataGPS,