Changeset 9386 in ntrip for trunk/BNC/src/PPP/pppFilter.h

Timestamp:

Mar 25, 2021, 3:17:35 PM (3 years ago)

Author:

stuerze

Message:

update regarding PPP

File:

• trunk/BNC/src/PPP/pppFilter.h (modified) (6 diffs)

trunk/BNC/src/PPP/pppFilter.h

@@ -8 +8 @@
 #include "bnctime.h"
 #include "t_prn.h"
+#include "pppClient.h"
 
 namespace BNC_PPP {
@@ -20 +21 @@
   ~t_pppFilter();
 
-  t_irc processEpoch(int num);
+  t_irc processEpoch();
 
-  void datumTransformation(const ColumnVector& xFltOld, const SymmetricMatrix& QFltOld);
+  t_irc datumTransformation();
+  void initDatumTransformation(const std::vector<t_pppSatObs*>& allObs);
 
   const ColumnVector&    x() const {return _xFlt;}
@@ -81 +83 @@
     void setFirstSystem(bool firstSys) {_firstSys = firstSys;}
     bool firstSystem() {return _firstSys;}
-    void updateIndices(int maxObs) {
+    void updateIndices(int maxObsSys) {
       if (firstSystem()) {
         initIndices();
@@ -88 +90 @@
         _firstRow = _lastRow + 1;
       }
-      _lastRow += maxObs;
+      _lastRow += maxObsSys;
+
     };
-    void initAA(int maxObs, int numPar) {
-      _AA1.ReSize(maxObs, numPar); _AA1 = 0.0;
-      _AA2.ReSize(maxObs, numPar); _AA2 = 0.0;
+    void setObsNum(int maxObs) {_maxObs = maxObs;}
+    void setParNum(int numPar) {_numPar = numPar;}
+    int obsNum() {return _maxObs;}
+    int parNum() {return _numPar;}
+    const Matrix& AA1() {return _AA1;}
+    const Matrix& AA2() {return _AA2;}
+
+    void initAA() {
+      _AA1.ReSize(_maxObs, _numPar); _AA1 = 0.0;
+      _AA2.ReSize(_maxObs, _numPar); _AA2 = 0.0;
     }
-    void prepareAA(const Matrix& AA, int numEpoProcessing, int nPar) {
+
+    void prepareAA(const Matrix& AA, int ind) {
       Matrix* Prep = &_AA2;
-      if (numEpoProcessing == 1) {
+      if (ind == 1) {
         Prep = &_AA1;
       }
-      Prep->SubMatrix(_firstRow, _lastRow, 1, nPar) << AA;
+      Prep->SubMatrix(_firstRow, _lastRow, 1, _numPar) << AA;
+    }
+    void switchAA() {
+      _AA1 = _AA2;
+    }
+    Matrix&  getAA(int ind) {
+      if (ind == 1) {
+          return _AA1;
+      }
+      return _AA2;
+    }
+    Matrix computeTrafoMatrix() {
+      Matrix D21 = ((_AA2.t() * _AA2).i()) * _AA2.t() * _AA1;
+      return D21;
+    }
+    void printMatrix(const Matrix& X, int nRow, int nCol) {
+      for (int rr = 0; rr < nRow; rr++) {
+        for (int cc = 0; cc < nCol; cc++) {
+          LOG << setw(6) << setprecision(3) << X[rr][cc] << " ;";
+        }
+        LOG << endl;
+      }
+      LOG << endl;
     }
 
-    Matrix computeTrafoMatrix() {
-      Matrix D21 = (_AA2.t() * _AA2).i() * _AA2.t() * _AA1;
-      return D21;
-    }
-
-    static void printMatrix(const Matrix& X, int nRow, int nCol) {
-      for (int rr = 0; rr < nRow; rr++) {
-        for (int cc = 0; cc < nCol; cc++) {
-          cout << setw(7) << setprecision(4) << X[rr][cc] << " ";
-        }
-        cout << endl;      }
-      cout << endl;
-    }
-    int     _firstRow;
-    int     _lastRow;
-    Matrix  _AA1;
-    Matrix  _AA2;
-    bool    _firstSys;
+    int               _firstRow;
+    int               _lastRow;
+    Matrix            _AA1;
+    Matrix            _AA2;
+    bool              _firstSys;
+    int               _maxObs;
+    int               _numPar;
+    QMap<char, t_prn> _refSatMapPseudoObs;
   };
 
@@ -140 +163 @@
   void predictCovCrdPart(const SymmetricMatrix& QFltOld);
 
-  t_irc addInfiniteNoise(t_pppParam::e_type para);
+  t_irc addNoiseToIono(char sys);
+
+  bool resetRefSatellitesLastEpoch(std::vector<t_pppSatObs*>& obsVector);
 
   bncTime         _epoTime;
@@ -151 +176 @@
   t_slip          _slips[t_prn::MAXPRN+1];
   int             _numSat;
-  int             _numEpoProcessing;
-  int             _numAllUsedLCs;
   t_dop           _dop;
   bncTime         _firstEpoTime;