Changeset 3135 in ntrip for trunk

Timestamp:

Mar 25, 2011, 1:22:58 PM (14 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/combination/bnccomb.cpp (modified) (3 diffs)

trunk/BNC/combination/bnccomb.cpp

@@ -598 +598 @@
 
   if (nObs > 0) {
+    const double Pl = 1.0 / (0.05 * 0.05);
+
     const int nCon = 2 + MAXPRN_GPS;
     Matrix         AA(nObs+nCon, nPar);  AA = 0.0;
     ColumnVector   ll(nObs+nCon);        ll = 0.0;
-    DiagonalMatrix PP(nObs+nCon);        PP = 1.0;
+    DiagonalMatrix PP(nObs+nCon);        PP = Pl;
 
     int iObs = 0;
@@ -644 +646 @@
     PP(nObs+iCond) = Ph;
     for (int iPar = 1; iPar <= _params.size(); iPar++) {
-      cmbParam* pp = _params[iPar-1];
-      if      (pp->type == cmbParam::clk) {
-        AA(nObs+iCond, iPar) = 1.0;
+      if (AA.Column(iPar).maximum_absolute_value() > 0.0) {
+        cmbParam* pp = _params[iPar-1];
+        if      (pp->type == cmbParam::clk) {
+          AA(nObs+iCond, iPar) = 1.0;
+        }
       }
     }
@@ -655 +659 @@
       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 (AA.Column(iPar).maximum_absolute_value() > 0.0) {
+          cmbParam* pp = _params[iPar-1];
+          if (pp->type == cmbParam::Sat_offset && pp->prn == prn) {
+            AA(nObs+iCond, iPar) = 1.0;
+          }
         }
       }