Changeset 3461 in ntrip

Timestamp:

Sep 23, 2011, 5:02:20 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

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

trunk/BNC/combination/bnccomb.cpp

@@ -190 +190 @@
   }
 
-  // Not yet regularized
-  // -------------------
-  _firstReg = false;
-
   // Maximal Residuum
   // ----------------
@@ -374 +370 @@
   // ----------------------
   bool masterPresent = false;
+  int  numACwithObs  = 0;
   QListIterator<cmbAC*> icAC(_ACs);
   while (icAC.hasNext()) {
@@ -389 +386 @@
     }
     out << AC->name.toAscii().data() << ": " << AC->numObs << endl;
+    if (AC->numObs > 0) {
+      ++numACwithObs;
+    }
+  }
+
+  if (numACwithObs < 3) {
+    return;
   }
 
@@ -494 +498 @@
     }
   }
-
-  _firstReg = true;
 
   // Update Parameter Values
@@ -698 +700 @@
   }
 
-  const int nCon = (_firstReg == false) ? 1 + MAXPRN_GPS : 1;
+  const int nCon = 1 + MAXPRN_GPS;
 
   AA.ReSize(nObs+nCon, nPar);  AA = 0.0;
@@ -728 +730 @@
   // --------------
   const double Ph = 1.e6;
-  int iCond = 1;
-  PP(nObs+iCond) = Ph;
+  PP(nObs+1) = Ph;
   for (int iPar = 1; iPar <= _params.size(); iPar++) {
     cmbParam* pp = _params[iPar-1];
-    if (pp->type == cmbParam::clkSat &&
-        AA.Column(iPar).maximum_absolute_value() > 0.0) {
-      AA(nObs+iCond, iPar) = 1.0;
-    }
-  }
-
-  if (!_firstReg) {
-    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::offACSat && pp->prn == prn) {
-          AA(nObs+iCond, iPar) = 1.0;
-        }
+    if (AA.Column(iPar).maximum_absolute_value() > 0.0) {
+      if      (pp->type == cmbParam::clkSat) {
+        AA(nObs+1, iPar) = 1.0;
+      }
+    }
+  }
+  int iCond = 1;
+  for (int iGps = 1; iGps <= MAXPRN_GPS; iGps++) {
+    QString prn = QString("G%1").arg(iGps, 2, 10, QChar('0'));
+    ++iCond;
+    PP(nObs+iCond) = Ph;
+    for (int iPar = 1; iPar <= _params.size(); iPar++) {
+      cmbParam* pp = _params[iPar-1];
+      if (pp->type == cmbParam::offACSat && pp->prn == prn) {
+        AA(nObs+iCond, iPar) = 1.0;
       }
     }

trunk/BNC/combination/bnccomb.h

@@ -94 +94 @@
   QString                 _masterOrbitAC;
   unsigned                _masterMissingEpochs;
-  bool                    _firstReg;
 };