Changeset 2083 in ntrip

Timestamp:

Dec 5, 2009, 4:06:24 PM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncmodel.cpp (modified) (4 diffs)
• bncmodel.h (modified) (1 diff)
• bncwindow.cpp (modified) (3 diffs)
• bncwindow.h (modified) (1 diff)

trunk/BNC/bncmodel.cpp

@@ -125 +125 @@
   _xx = 0.0;
 
+  bncSettings settings;
+
   _static = false;
-
-  bncSettings settings;
   if ( Qt::CheckState(settings.value("pppStatic").toInt()) == Qt::Checked) {
     _static = true;
+  }
+
+  _usePhase = false;
+  if ( Qt::CheckState(settings.value("pppUsePhase").toInt()) == Qt::Checked) {
+    _usePhase = true;
   }
 }
@@ -256 +261 @@
 void bncModel::predict(t_epoData* epoData) {
 
-  // Make a copy of QQ and xx, set parameter indices
-  // -----------------------------------------------
-  SymmetricMatrix QQ_old = _QQ;
-  ColumnVector    xx_old = _xx;
-
-  for (int iPar = 1; iPar <= _params.size(); iPar++) {
-    _params[iPar-1]->index_old = _params[iPar-1]->index;
-    _params[iPar-1]->index     = 0;
-  }
-
-  // Remove Ambiguity Parameters without observations
-  // ------------------------------------------------
-  int iPar = 0;
-  QMutableVectorIterator<bncParam*> it(_params);
-  while (it.hasNext()) {
-    bncParam* par = it.next();
-    bool removed = false;
-    if (par->type == bncParam::AMB_L3) {
-      if (epoData->satData.find(par->prn) == epoData->satData.end()) {
-        removed = true;
-        delete par;
-        it.remove();
-      }
-    }
-    if (! removed) {
-      ++iPar;
-      par->index = iPar;
-    }
-  }
-
-  // Add new ambiguity parameters
-  // ----------------------------
-  QMapIterator<QString, t_satData*> itObs(epoData->satData);
-  while (itObs.hasNext()) {
-    itObs.next();
-    QString    prn     = itObs.key();
-    bool found = false;
+  if (_usePhase) {
+
+    // Make a copy of QQ and xx, set parameter indices
+    // -----------------------------------------------
+    SymmetricMatrix QQ_old = _QQ;
+    ColumnVector    xx_old = _xx;
+    
     for (int iPar = 1; iPar <= _params.size(); iPar++) {
-      if (_params[iPar-1]->type == bncParam::AMB_L3 && 
-          _params[iPar-1]->prn == prn) {
-        found = true;
-        break;
-      }
-    }
-    if (!found) {
-      bncParam* par = new bncParam(bncParam::AMB_L3, _params.size()+1, prn);
-      _params.push_back(par);
-    }
-  }
-
-  int nPar = _params.size();
-  _xx.ReSize(nPar); _xx = 0.0;
-  _QQ.ReSize(nPar); _QQ = 0.0;
-  for (int i1 = 1; i1 <= nPar; i1++) {
-    bncParam* p1 = _params[i1-1];
-    if (p1->index_old != 0) {
-      _xx(p1->index)            = xx_old(p1->index_old);
-      _QQ(p1->index, p1->index) = QQ_old(p1->index_old, p1->index_old);
-      for (int i2 = 1; i2 <= nPar; i2++) {
-        bncParam* p2 = _params[i2-1];
-        if (p2->index_old != 0) {
-          _QQ(p1->index, p2->index) = QQ_old(p1->index_old, p2->index_old);
+      _params[iPar-1]->index_old = _params[iPar-1]->index;
+      _params[iPar-1]->index     = 0;
+    }
+    
+    // Remove Ambiguity Parameters without observations
+    // ------------------------------------------------
+    int iPar = 0;
+    QMutableVectorIterator<bncParam*> it(_params);
+    while (it.hasNext()) {
+      bncParam* par = it.next();
+      bool removed = false;
+      if (par->type == bncParam::AMB_L3) {
+        if (epoData->satData.find(par->prn) == epoData->satData.end()) {
+          removed = true;
+          delete par;
+          it.remove();
         }
       }
-    }
-  }
-
-  for (int ii = 1; ii <= nPar; ii++) {
-    bncParam* par = _params[ii-1];
-    if (par->index_old == 0) {
-      _QQ(par->index, par->index) = sig_amb_0 * sig_amb_0;
-    }
-    par->index_old = par->index;
+      if (! removed) {
+        ++iPar;
+        par->index = iPar;
+      }
+    }
+    
+    // Add new ambiguity parameters
+    // ----------------------------
+    QMapIterator<QString, t_satData*> itObs(epoData->satData);
+    while (itObs.hasNext()) {
+      itObs.next();
+      QString    prn     = itObs.key();
+      bool found = false;
+      for (int iPar = 1; iPar <= _params.size(); iPar++) {
+        if (_params[iPar-1]->type == bncParam::AMB_L3 && 
+            _params[iPar-1]->prn == prn) {
+          found = true;
+          break;
+        }
+      }
+      if (!found) {
+        bncParam* par = new bncParam(bncParam::AMB_L3, _params.size()+1, prn);
+        _params.push_back(par);
+      }
+    }
+    
+    int nPar = _params.size();
+    _xx.ReSize(nPar); _xx = 0.0;
+    _QQ.ReSize(nPar); _QQ = 0.0;
+    for (int i1 = 1; i1 <= nPar; i1++) {
+      bncParam* p1 = _params[i1-1];
+      if (p1->index_old != 0) {
+        _xx(p1->index)            = xx_old(p1->index_old);
+        _QQ(p1->index, p1->index) = QQ_old(p1->index_old, p1->index_old);
+        for (int i2 = 1; i2 <= nPar; i2++) {
+          bncParam* p2 = _params[i2-1];
+          if (p2->index_old != 0) {
+            _QQ(p1->index, p2->index) = QQ_old(p1->index_old, p2->index_old);
+          }
+        }
+      }
+    }
+    
+    for (int ii = 1; ii <= nPar; ii++) {
+      bncParam* par = _params[ii-1];
+      if (par->index_old == 0) {
+        _QQ(par->index, par->index) = sig_amb_0 * sig_amb_0;
+      }
+      par->index_old = par->index;
+    }
   }
 
@@ -390 +398 @@
 
   unsigned nPar = _params.size();
-  unsigned nObs = 2 * epoData->size();
+  unsigned nObs = _usePhase ? 2 * epoData->size() : epoData->size();
 
   // Create First-Design Matrix
@@ -414 +422 @@
     }
 
-    ++iObs;
-    ll(iObs)      = satData->L3 - rhoCmp;
-    PP(iObs,iObs) = 1.0 / (sig_L3 * sig_L3);
-    for (int iPar = 1; iPar <= _params.size(); iPar++) {
-      if (_params[iPar-1]->type == bncParam::AMB_L3 &&
-          _params[iPar-1]->prn  == prn) {
-        ll(iObs) -= _params[iPar-1]->x0;
-      } 
-      AA(iObs, iPar) = _params[iPar-1]->partial(satData, prn);
+    if (_usePhase) {
+      ++iObs;
+      ll(iObs)      = satData->L3 - rhoCmp;
+      PP(iObs,iObs) = 1.0 / (sig_L3 * sig_L3);
+      for (int iPar = 1; iPar <= _params.size(); iPar++) {
+        if (_params[iPar-1]->type == bncParam::AMB_L3 &&
+            _params[iPar-1]->prn  == prn) {
+          ll(iObs) -= _params[iPar-1]->x0;
+        } 
+        AA(iObs, iPar) = _params[iPar-1]->partial(satData, prn);
+      }
     }
   }

trunk/BNC/bncmodel.h

@@ -75 +75 @@
   ColumnVector       _ellBanc;
   bool               _static;
+  bool               _usePhase;
 };
 

trunk/BNC/bncwindow.cpp

@@ -305 +305 @@
   _pppStaticCheckBox->setCheckState(Qt::CheckState(
                                     settings.value("pppStatic").toInt()));
+  _pppUsePhaseCheckBox = new QCheckBox();
+  _pppUsePhaseCheckBox->setCheckState(Qt::CheckState(
+                                      settings.value("pppUsePhase").toInt()));
 
   // Streams
@@ -729 +732 @@
   QGridLayout* pppLayout = new QGridLayout;
   pppLayout->setColumnMinimumWidth(0,14*ww);
-  pppLayout->addWidget(new QLabel("Mountpoint"), 0, 0);
-  pppLayout->addWidget(_pppMountLineEdit,        0, 1, 1,7);
-  pppLayout->addWidget(new QLabel("Static"),     1, 0);
-  pppLayout->addWidget(_pppStaticCheckBox,       1, 1);
+  pppLayout->addWidget(new QLabel("Mountpoint"),    0, 0);
+  pppLayout->addWidget(_pppMountLineEdit,           0, 1, 1, 3);
+  pppLayout->addWidget(new QLabel("Static"),        1, 0);
+  pppLayout->addWidget(_pppStaticCheckBox,          1, 1);
+  pppLayout->addWidget(new QLabel("Use Phase Obs"), 2, 0);
+  pppLayout->addWidget(_pppUsePhaseCheckBox,        2, 1);
   pppgroup->setLayout(pppLayout);
 
@@ -1039 +1044 @@
   settings.setValue("pppMount",    _pppMountLineEdit->text());
   settings.setValue("pppStatic",   _pppStaticCheckBox->checkState());
+  settings.setValue("pppUsePhase", _pppUsePhaseCheckBox->checkState());
   settings.setValue("mountPoints", mountPoints);
   settings.setValue("obsRate",     _obsRateComboBox->currentText());

trunk/BNC/bncwindow.h

@@ -114 +114 @@
     QLineEdit* _pppMountLineEdit;
     QCheckBox* _pppStaticCheckBox;
+    QCheckBox* _pppUsePhaseCheckBox;
     QCheckBox* _rnxV3CheckBox;
     QCheckBox* _ephV3CheckBox;