Changeset 3439 in ntrip for trunk/BNC

Timestamp:

Sep 22, 2011, 10:36:25 AM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

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

trunk/BNC/combination/bnccomb.cpp

@@ -33 +33 @@
 
 const double sig0_offAC    = 1000.0;
-const double sigP_offAC    = 1000.0;
 const double sig0_offACSat =  100.0;
 const double sigP_offACSat =    0.0;
@@ -55 +54 @@
 
   if      (type == offAC) {
-    sig_0 = sig0_offAC;
-    sig_P = sigP_offAC;
+    epoSpec = true;
+    sig0    = sig0_offAC;
+    sigP    = sig0;
   }
   else if (type == offACSat) {
-    sig_0 = sig0_offACSat;
-    sig_P = sigP_offACSat;
+    epoSpec = false;
+    sig0    = sig0_offACSat;
+    sigP    = sigP_offACSat;
   }
   else if (type == clkSat) {
-    sig_0 = sig0_clkSat;
-    sig_P = sigP_clkSat;
+    epoSpec = false;
+    sig0    = sig0_clkSat;
+    sigP    = sigP_clkSat;
   }
 }
@@ -165 +167 @@
   for (int iPar = 1; iPar <= _params.size(); iPar++) {
     cmbParam* pp = _params[iPar-1];
-    _QQ(iPar,iPar) = pp->sig_0 * pp->sig_0;
+    _QQ(iPar,iPar) = pp->sig0 * pp->sig0;
   }
 
@@ -388 +390 @@
   for (int iPar = 1; iPar <= _params.size(); iPar++) {
     cmbParam* pp = _params[iPar-1];
-    _QQ(iPar,iPar) += pp->sig_P * pp->sig_P;
+    if (pp->epoSpec) {
+      pp->xx = 0.0;
+      _QQ.Row(iPar)    = 0.0;
+      _QQ.Column(iPar) = 0.0;
+      _QQ(iPar,iPar) = pp->sig0 * pp->sig0;
+    }
+    else {
+      _QQ(iPar,iPar) += pp->sigP * pp->sigP;
+    }
     x0(iPar) = pp->xx;
   }
@@ -477 +487 @@
           QQ_sav.Row(iPar)    = 0.0;
           QQ_sav.Column(iPar) = 0.0;
-          QQ_sav(iPar,iPar)   = pp->sig_0 * pp->sig_0;
+          QQ_sav(iPar,iPar)   = pp->sig0 * pp->sig0;
         }
       }

trunk/BNC/combination/bnccomb.h

@@ -23 +23 @@
   QString prn;
   double  xx;
-  double  sig_0;
-  double  sig_P;
+  double  sig0;
+  double  sigP;
+  bool    epoSpec;
 };