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

Timestamp:

May 18, 2021, 5:15:10 PM (3 years ago)

Author:

stuerze

Message:

update regarding PPP

File:

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

trunk/BNC/src/PPP/pppFilter.h

@@ -23 +23 @@
   t_irc processEpoch();
 
+  const ColumnVector&    x() const {return _xFlt;}
+  const SymmetricMatrix& Q() const {return _QFlt;}
+
   t_irc datumTransformation();
   void initDatumTransformation(const std::vector<t_pppSatObs*>& allObs, bool pseudoObsIono);
   unsigned setTrafoObs();
-
-  const ColumnVector&    x() const {return _xFlt;}
-  const SymmetricMatrix& Q() const {return _QFlt;}
 
   int    numSat() const {return _numSat;}
@@ -80 +80 @@
   class t_datumTrafo {
   public:
-    t_datumTrafo () {
-      initIndices();
-    }
-    ~t_datumTrafo () {
-
-    }
-
-    void initIndices() {
-      _firstRow = 1; _lastRow = 0;
-    }
-
-    void setFirstSystem(char firstSys) {
-      _firstSys = firstSys;
-    }
-
+    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;//LOG << "updateIndices: lastRow: " << _lastRow << endl;
+    };
+
+    void setFirstSystem(char firstSys) { _firstSys = firstSys;}
     bool firstSystem(char sys) {
       if (_firstSys == sys) {
@@ -101 +101 @@
       return false;
     }
-
-    void updateIndices(char sys, int maxObsSys) {
-      if (firstSystem(sys)) {
-        initIndices();
-      }
-      else {
-        _firstRow = _lastRow + 1;
-      }
-      _lastRow += maxObsSys;//LOG << "updateIndices: lastRow: " << _lastRow << endl;
-    };
-
     void setNumObs(int maxObs) {_maxObs = maxObs;}
-    void setNumPar(int numPar) { _numPar = numPar;}
+    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);
+    }
+
     void setLastEpoParlist(t_pppParlist* parlist) {_parlist = parlist;}
     t_pppParlist* lastEpoParlist() {return _parlist;}
-    int numPar() {return _numPar;}
-    int numObs() {return _maxObs;}
-    void updateNumObs() {//LOG << "updateObsNum _maxObs " << _maxObs;
-      _maxObs = _lastRow;//LOG << "=>  _maxObs " << _maxObs << " _numPar: " << _numPar << endl;
-      _AA1 = _AA1.SubMatrix(1, _lastRow, 1, _numPar);
-      _AA2 = _AA2.SubMatrix(1, _lastRow, 1, _numPar);
-    }
 
     const Matrix& AA1() {return _AA1;}
@@ -128 +118 @@
     const Matrix& D21() {return _D21;}
 
-    void initAA() {//LOG << "initAA: _maxObs: " << _maxObs << " _numPar: " << _numPar << endl;
+    void initAA() {
       _AA1.ReSize(_maxObs, _numPar); _AA1 = 0.0;
       _AA2.ReSize(_maxObs, _numPar); _AA2 = 0.0;
       _D21.ReSize(_numPar, _numPar); _D21 = 0.0;
     }
-
     void prepareAA(const Matrix& AA, int ind) {
       Matrix* Prep = &_AA2;
@@ -141 +130 @@
       Prep->SubMatrix(_firstRow, _lastRow, 1, _numPar) << AA;
     }
-
     void switchAA() {
       _AA1 = _AA2;
     }
-
     t_irc computeTrafoMatrix() {
       if (((_AA2.t() * _AA2)).Determinant() == 0.0) {