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

Timestamp:

Apr 21, 2023, 11:48:24 AM (12 months ago)

Author:

stuerze

Message:

 

File:

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

trunk/BNC/src/PPP/pppFilter.h

@@ -8 +8 @@
 #include "bnctime.h"
 #include "t_prn.h"
-#include "pppClient.h"
 
 namespace BNC_PPP {
@@ -18 +17 @@
 class t_pppFilter {
  public:
-  t_pppFilter(t_pppObsPool* obsPool);
+  t_pppFilter();
   ~t_pppFilter();
 
-  t_irc processEpoch(int num);
+  t_irc processEpoch(t_pppObsPool* obsPool);
 
   const ColumnVector&    x() const {return _xFlt;}
   const SymmetricMatrix& Q() const {return _QFlt;}
-
-  t_irc datumTransformation(const QMap<char, t_pppRefSat*>& refSatMap);
-  void initDatumTransformation(const std::vector<t_pppSatObs*>& allObs, bool pseudoObsIono);
-  unsigned setTrafoObs();
-  void restoreState(int num)  {
-#ifdef BNC_DEBUG_PPP
-    LOG << "Restore parameter from last successful epoch: _parlist = _parlist_sav ("<<  num << ")\n";
-#endif
-    _QFlt    = _QFlt_sav;
-    _parlist = _parlist_sav;
-  }
-  void rememberState(int num) {
-#ifdef BNC_DEBUG_PPP
-    LOG << "Remember parameters from successful epoch   : _parlist_sav = _parlist ("<<  num << ")\n";
-#endif
-    _QFlt_sav    = _QFlt;
-    _parlist_sav = _parlist;
-  }
 
   int    numSat() const {return _numSat;}
@@ -50 +31 @@
   double GDOP() const {return _dop.G;}
   double trp() const {
-    const std::vector<t_pppParam*>& par = _parlist.params();
+    const std::vector<t_pppParam*>& par = _parlist->params();
     for (unsigned ii = 0; ii < par.size(); ++ii) {
       if (par[ii]->type() == t_pppParam::trp) {
@@ -59 +40 @@
   };
   double trpStdev() const {
-    const std::vector<t_pppParam*>& par = _parlist.params();
+    const std::vector<t_pppParam*>& par = _parlist->params();
     for (unsigned ii = 0; ii < par.size(); ++ii) {
       if (par[ii]->type() == t_pppParam::trp) {
@@ -92 +73 @@
   };
 
-  class t_datumTrafo {
-  public:
-    t_datumTrafo () {initIndices();}
-    ~t_datumTrafo (){}
-
-    void initIndices() {_firstRow = 1; _lastRow = 0;}
-    void updateIndices(char sys, int maxObsSys) {
-      if (firstSystem(sys)) {
-        initIndices();
-      }
-      else {
-        _firstRow = _lastRow + 1;
-      }
-      _lastRow += maxObsSys;
-
-    };
-
-    void setFirstSystem(char firstSys) { _firstSys = firstSys;}
-    bool firstSystem(char sys) {
-      if (_firstSys == sys) {
-        return true;
-      }
-      return false;
-    }
-    void setNumObs(int maxObs) {_maxObs = maxObs;}
-    void setNumPar(int numPar) {_numPar = numPar;}
-    int numPar() {return _numPar;}
-    int numObs() {return _maxObs;}
-    void updateNumObs() {
-      _maxObs = _lastRow;
-      _AA1 = _AA1.SubMatrix(1, _lastRow, 1, _numPar);
-      _AA2 = _AA2.SubMatrix(1, _lastRow, 1, _numPar);
-    }
-
-    const Matrix& AA1() {return _AA1;}
-    const Matrix& AA2() {return _AA2;}
-    const Matrix& D21() {return _D21;}
-
-    void initAA() {
-      _AA1.ReSize(_maxObs, _numPar); _AA1 = 0.0;
-      _AA2.ReSize(_maxObs, _numPar); _AA2 = 0.0;
-      _D21.ReSize(_numPar, _numPar); _D21 = 0.0;
-    }
-    t_irc prepareAA(const Matrix& AA, int ind) {
-
-      Matrix* Prep = &_AA2;
-      if (ind == 1) {
-        Prep = &_AA1;
-      }
-      if (AA.Ncols() != _numPar) {
-        LOG << "t_pppFilter::prepareAA: AA.Ncols() != _numPar: " << AA.Ncols() << " != " << _numPar << "\n RETURN FAILURE" <<  std::endl;
-        return failure;
-      }
-      Prep->SubMatrix(_firstRow, _lastRow, 1, _numPar) = AA;
-      return success;
-    }
-    void switchAA() {
-      _AA1 = _AA2;
-    }
-    t_irc computeTrafoMatrix() {
-      if (((_AA2.t() * _AA2)).Determinant() == 0.0) {
-        LOG << "t_pppFilter::computeTrafoMatrix: (_AA2.t() * _AA2).inv() is singular" << std::endl;
-        return failure;
-      }
-      _D21 = ((_AA2.t() * _AA2).i()) * _AA2.t() * _AA1;
-      return success;
-    }
-
-    void printMatrix(const Matrix& X, int nRow, int nCol) {
-      for (int rr = 0; rr < nRow; rr++) {
-        for (int cc = 0; cc < nCol; cc++) {
-          LOG << std::setw(6) << std::setprecision(3) << X[rr][cc] << " ;";
-        }
-        LOG << std::endl;
-      }
-      LOG << std::endl;
-    }
-  private:
-    int               _firstRow;
-    int               _lastRow;
-    Matrix            _AA1;
-    Matrix            _AA2;
-    Matrix            _D21;
-    char              _firstSys;
-    int               _maxObs;
-    int               _numPar;
-    QMap<char, t_prn> _refSatMapPseudoObs;
-  };
-
   t_irc processSystem(const std::vector<t_lc::type>& LCs,
                       const std::vector<t_pppSatObs*>& obsVector,
-                      const t_prn& refPrn,
-                      bool pseudoObsIonoAvailable,
-                      bool preProcessing);
+                      bool pseudoObsIonoAvailable);
 
   t_irc detectCycleSlips(const std::vector<t_lc::type>& LCs,
-                         const std::vector<t_pppSatObs*>& obsVector,
-                         const t_prn& refPrn,
-                         bool preProcessing);
+                         const std::vector<t_pppSatObs*>& obsVector);
 
   t_irc resetAmb(t_prn prn, const std::vector<t_pppSatObs*>& obsVector, t_lc::type lc,
                  SymmetricMatrix* QSav = 0, ColumnVector* xSav = 0);
 
-  void cmpDOP(const std::vector<t_pppSatObs*>& obsVector,
-              const QMap<char, t_pppRefSat*>& refSatMap);
+  void cmpDOP(const std::vector<t_pppSatObs*>& obsVector);
 
   void setStateVectorAndVarCovMatrix(const ColumnVector& xFltOld, const SymmetricMatrix& QFltOld,
@@ -203 +90 @@
   void predictCovCrdPart(const SymmetricMatrix& QFltOld, bool setNeuNoiseToZero);
 
-  t_irc addNoiseToPar(t_pppParam::e_type parType, char sys);
-
-  bool resetRefSatellitesLastEpoch(std::vector<t_pppSatObs*>& obsVector,
-                                   const QMap<char, t_pppRefSat*>& refSatMap,
-                                   const QMap<char, t_pppRefSat*>& refSatMapLastEpoch);
-
   bncTime         _epoTime;
-  t_pppParlist    _parlist;
-  t_pppParlist    _parlist_sav;
-  t_pppObsPool*   _obsPool;
-  t_datumTrafo*   _datumTrafo;
+  t_pppParlist*   _parlist;
   SymmetricMatrix _QFlt;
-  SymmetricMatrix _QFlt_sav;
   ColumnVector    _xFlt;
   ColumnVector    _x0;
@@ -223 +100 @@
   bncTime         _firstEpoTime;
   bncTime         _lastEpoTimeOK;
-  t_prn           _refPrn;
 };