Changeset 3136 in ntrip for trunk/BNC

Timestamp:

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

Author:

mervart

Message:

 

File:

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

trunk/BNC/combination/bnccomb.cpp ¶

@@ -646 +646 @@
     PP(nObs+iCond) = Ph;
     for (int iPar = 1; iPar <= _params.size(); iPar++) {
-      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;
-        }
+      cmbParam* pp = _params[iPar-1];
+      if (pp->type == cmbParam::clk &&
+          AA.Column(iPar).maximum_absolute_value() > 0.0) {
+        AA(nObs+iCond, iPar) = 1.0;
       }
     }
@@ -659 +658 @@
       PP(nObs+1+iGps) = Ph;
       for (int iPar = 1; iPar <= _params.size(); iPar++) {
-        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;
-          }
+        cmbParam* pp = _params[iPar-1];
+        if (pp->type == cmbParam::Sat_offset && pp->prn == prn &&
+            AA.Column(iPar).maximum_absolute_value() > 0.0) {
+          AA(nObs+iCond, iPar) = 1.0;
         }
       }