Changeset 3138 in ntrip

Timestamp:

Mar 25, 2011, 1:40:44 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

• bnccomb.cpp (modified) (3 diffs)
• bnccomb.h (modified) (1 diff)

trunk/BNC/combination/bnccomb.cpp

@@ -202 +202 @@
     }
   }
+
+  // Not yet regularized
+  // -------------------
+  _firstReg = false;
 }
 
@@ -600 +604 @@
     const double Pl = 1.0 / (0.05 * 0.05);
 
-    const int nCon = 2 + MAXPRN_GPS;
+    const int nCon = (_firstReg == false) ? 2 + MAXPRN_GPS : 2;
     Matrix         AA(nObs+nCon, nPar);  AA = 0.0;
     ColumnVector   ll(nObs+nCon);        ll = 0.0;
@@ -653 +657 @@
     }
 
-    for (int iGps = 1; iGps <= MAXPRN_GPS; iGps++) {
-      ++iCond;
-      QString prn = QString("G%1").arg(iGps, 2, 10, QChar('0'));
-      PP(nObs+1+iGps) = Ph;
-      for (int iPar = 1; iPar <= _params.size(); iPar++) {
-        cmbParam* pp = _params[iPar-1];
-        if (pp->type == cmbParam::Sat_offset && pp->prn == prn) {
-          AA(nObs+iCond, iPar) = 1.0;
+    if (!_firstReg) {
+      _firstReg = true;
+      for (int iGps = 1; iGps <= MAXPRN_GPS; iGps++) {
+        ++iCond;
+        QString prn = QString("G%1").arg(iGps, 2, 10, QChar('0'));
+        PP(nObs+1+iGps) = Ph;
+        for (int iPar = 1; iPar <= _params.size(); iPar++) {
+          cmbParam* pp = _params[iPar-1];
+          if (pp->type == cmbParam::Sat_offset && pp->prn == prn) {
+            AA(nObs+iCond, iPar) = 1.0;
+          }
         }
       }

trunk/BNC/combination/bnccomb.h

@@ -83 +83 @@
   QVector<cmbParam*>    _params;
   SymmetricMatrix       _QQ;
+  bool                  _firstReg;
   QByteArray            _log;
   QString               _masterAC;