Changeset 3470 in ntrip

Timestamp:

Oct 14, 2011, 4:21:06 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

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

trunk/BNC/combination/bnccomb.cpp

@@ -149 +149 @@
           ((bncApp*)qApp), SLOT(slotMessage(const QByteArray,bool)));
 
+  // Combination Method
+  // ------------------
+  if (settings.value("cmbMethod").toString() == "Filter") {
+    _method = filter;
+  }
+  else {
+    _method = singleEpoch;
+  }
 
   // Initialize Parameters (model: Clk_Corr = AC_Offset + Sat_Offset + Clk)
   // ----------------------------------------------------------------------
-  int nextPar = 0;
-  QListIterator<cmbAC*> it(_ACs);
-  while (it.hasNext()) {
-    cmbAC* AC = it.next();
-    _params.push_back(new cmbParam(cmbParam::offAC, ++nextPar, AC->name, ""));
+  if (_method == filter) {
+    int nextPar = 0;
+    QListIterator<cmbAC*> it(_ACs);
+    while (it.hasNext()) {
+      cmbAC* AC = it.next();
+      _params.push_back(new cmbParam(cmbParam::offAC, ++nextPar, AC->name, ""));
+      for (int iGps = 1; iGps <= MAXPRN_GPS; iGps++) {
+        QString prn = QString("G%1").arg(iGps, 2, 10, QChar('0'));
+        _params.push_back(new cmbParam(cmbParam::offACSat, ++nextPar, 
+                                       AC->name, prn));
+      }
+    }
     for (int iGps = 1; iGps <= MAXPRN_GPS; iGps++) {
       QString prn = QString("G%1").arg(iGps, 2, 10, QChar('0'));
-      _params.push_back(new cmbParam(cmbParam::offACSat, ++nextPar, 
-                                     AC->name, prn));
-    }
-  }
-  for (int iGps = 1; iGps <= MAXPRN_GPS; iGps++) {
-    QString prn = QString("G%1").arg(iGps, 2, 10, QChar('0'));
-    _params.push_back(new cmbParam(cmbParam::clkSat, ++nextPar, "", prn));
-  }
-
-  // Initialize Variance-Covariance Matrix
-  // -------------------------------------
-  _QQ.ReSize(_params.size());
-  _QQ = 0.0;
-  for (int iPar = 1; iPar <= _params.size(); iPar++) {
-    cmbParam* pp = _params[iPar-1];
-    _QQ(iPar,iPar) = pp->sig0 * pp->sig0;
+      _params.push_back(new cmbParam(cmbParam::clkSat, ++nextPar, "", prn));
+    }
+    
+    // Initialize Variance-Covariance Matrix
+    // -------------------------------------
+    _QQ.ReSize(_params.size());
+    _QQ = 0.0;
+    for (int iPar = 1; iPar <= _params.size(); iPar++) {
+      cmbParam* pp = _params[iPar-1];
+      _QQ(iPar,iPar) = pp->sig0 * pp->sig0;
+    }
   }
 
@@ -357 +367 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncComb::processEpoch() {
-
+  if (_method == filter) {
+    return processEpoch_filter();
+  }
+  else {
+    return processEpoch_singleEpoch();
+  }
+}
+
+// Process Epoch - Filter Method
+////////////////////////////////////////////////////////////////////////////
+void bncComb::processEpoch_filter() {
   int nPar = _params.size();
 
@@ -743 +763 @@
   return success;
 }
+
+// Process Epoch - Single-Epoch Method
+////////////////////////////////////////////////////////////////////////////
+void bncComb::processEpoch_singleEpoch() {
+
+
+}

trunk/BNC/combination/bnccomb.h

@@ -43 +43 @@
  private:
 
+  enum e_method{singleEpoch, filter};
+
   class cmbAC {
    public:
@@ -74 +76 @@
 
   void processEpoch();
+  void processEpoch_filter();
+  void processEpoch_singleEpoch();
   t_irc createAmat(Matrix& AA, ColumnVector& ll, DiagonalMatrix& PP,
                    const ColumnVector& x0, QMap<QString, t_corr*>& resCorr);
@@ -93 +97 @@
   QString                 _masterOrbitAC;
   unsigned                _masterMissingEpochs;
+  e_method                _method;
 };