Changeset 2790 in ntrip

Timestamp:

Dec 14, 2010, 1:36:44 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

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

trunk/BNC/bncmodel.cpp

@@ -557 +557 @@
     while (iGPS.hasNext()) {
       iGPS.next();
-      QString prn        = iGPS.key();
       t_satData* satData = iGPS.value();
       addAmb(satData);
@@ -661 +660 @@
     QMapIterator<QString, t_satData*> itGPS(epoData->satDataGPS);
     while (itGPS.hasNext()) {
-      ++iObs;
       itGPS.next();
-      QString    prn     = itGPS.key();
       t_satData* satData = itGPS.value();
-    
-      ll(iObs)      = satData->P3 - cmpValue(satData, false);
-      PP(iObs,iObs) = 1.0 / (_sigP3 * _sigP3);
-      for (int iPar = 1; iPar <= _params.size(); iPar++) {
-        AA(iObs, iPar) = _params[iPar-1]->partial(satData, false);
-      }
-    
-      if (_usePhase) {
-        ++iObs;
-        ll(iObs)      = satData->L3 - cmpValue(satData, true);
-        PP(iObs,iObs) = 1.0 / (_sigL3 * _sigL3);
-        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]->xx;
-          } 
-          AA(iObs, iPar) = _params[iPar-1]->partial(satData, true);
-        }
-      }
+      addObs(iObs, satData, AA, ll, PP);
     }
 
     // Glonass phase observations
     // --------------------------
-    if (_usePhase) {    
-      QMapIterator<QString, t_satData*> itGlo(epoData->satDataGlo);
-      while (itGlo.hasNext()) {
-        ++iObs;
-        itGlo.next();
-        QString    prn     = itGlo.key();
-        t_satData* satData = itGlo.value();
-
-        ll(iObs)      = satData->L3 - cmpValue(satData, true);
-        PP(iObs,iObs) = 1.0 / (_sigL3 * _sigL3);
-        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]->xx;
-          } 
-          AA(iObs, iPar) = _params[iPar-1]->partial(satData, true);
-        }
-      }
+    QMapIterator<QString, t_satData*> itGlo(epoData->satDataGlo);
+    while (itGlo.hasNext()) {
+      itGlo.next();
+      t_satData* satData = itGlo.value();
+      addObs(iObs, satData, AA, ll, PP);
     }
 
@@ -712 +678 @@
     QMapIterator<QString, t_satData*> itGal(epoData->satDataGal);
     while (itGal.hasNext()) {
-      ++iObs;
       itGal.next();
-      QString    prn     = itGal.key();
       t_satData* satData = itGal.value();
-    
-      ll(iObs)      = satData->P3 - cmpValue(satData, false);
-      PP(iObs,iObs) = 1.0 / (_sigP3 * _sigP3);
-      for (int iPar = 1; iPar <= _params.size(); iPar++) {
-        AA(iObs, iPar) = _params[iPar-1]->partial(satData, false);
-      }
-    
-      if (_usePhase) {
-        ++iObs;
-        ll(iObs)      = satData->L3 - cmpValue(satData, true);
-        PP(iObs,iObs) = 1.0 / (_sigL3 * _sigL3);
-        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]->xx;
-          } 
-          AA(iObs, iPar) = _params[iPar-1]->partial(satData, true);
-        }
-      }
+      addObs(iObs, satData, AA, ll, PP);
     }
 
@@ -1345 +1291 @@
   }
 }
+
+// 
+///////////////////////////////////////////////////////////////////////////
+void bncModel::addObs(unsigned& iObs, t_satData* satData,
+                      Matrix& AA, ColumnVector& ll, DiagonalMatrix& PP) {
+
+  if (satData->system() != 'R') {
+    ++iObs;
+    ll(iObs)      = satData->P3 - cmpValue(satData, false);
+    PP(iObs,iObs) = 1.0 / (_sigP3 * _sigP3);
+    for (int iPar = 1; iPar <= _params.size(); iPar++) {
+      AA(iObs, iPar) = _params[iPar-1]->partial(satData, false);
+    }
+  }
+  
+  if (_usePhase) {
+    ++iObs;
+    ll(iObs)      = satData->L3 - cmpValue(satData, true);
+    PP(iObs,iObs) = 1.0 / (_sigL3 * _sigL3);
+    for (int iPar = 1; iPar <= _params.size(); iPar++) {
+      if (_params[iPar-1]->type == bncParam::AMB_L3 &&
+          _params[iPar-1]->prn  == satData->prn) {
+        ll(iObs) -= _params[iPar-1]->xx;
+      } 
+      AA(iObs, iPar) = _params[iPar-1]->partial(satData, true);
+    }
+  }
+}

trunk/BNC/bncmodel.h

@@ -90 +90 @@
   void   cmpEle(t_satData* satData);
   void   addAmb(t_satData* satData);
+  void   addObs(unsigned& iObs, t_satData* satData,
+                Matrix& AA, ColumnVector& ll, DiagonalMatrix& PP);
   double cmpValue(t_satData* satData, bool phase);
   double delay_saast(double Ele);