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

Timestamp:

May 3, 2021, 2:18:39 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

@@ -24 +24 @@
 
   t_irc datumTransformation();
-  void initDatumTransformation(const std::vector<t_pppSatObs*>& allObs);
+  void initDatumTransformation(const std::vector<t_pppSatObs*>& allObs, bool pseudoObsIono);
+  unsigned setTrafoObs();
 
   const ColumnVector&    x() const {return _xFlt;}
@@ -79 +80 @@
   class t_datumTrafo {
   public:
-    t_datumTrafo () {initIndices();}
-    void initIndices() {_firstRow = 1; _lastRow = 0;}
-    void setFirstSystem(bool firstSys) {_firstSys = firstSys;}
-    bool firstSystem() {return _firstSys;}
-    void updateIndices(int maxObsSys) {
-      if (firstSystem()) {
+    t_datumTrafo () {
+      initIndices();
+    }
+    ~t_datumTrafo () {
+
+    }
+
+    void initIndices() {
+      _firstRow = 1; _lastRow = 0;
+    }
+
+    void setFirstSystem(char firstSys) {
+      _firstSys = firstSys;
+    }
+
+    bool firstSystem(char sys) {
+      if (_firstSys == sys) {
+        return true;
+      }
+      return false;
+    }
+
+    void updateIndices(char sys, int maxObsSys) {
+      if (firstSystem(sys)) {
         initIndices();
       }
@@ -90 +109 @@
         _firstRow = _lastRow + 1;
       }
-      _lastRow += maxObsSys;
-
+      _lastRow += maxObsSys;//LOG << "updateIndices: lastRow: " << _lastRow << endl;
     };
-    void setObsNum(int maxObs) {_maxObs = maxObs;}
-    void setParNum(int numPar) {_numPar = numPar;}
-    int obsNum() {return _maxObs;}
-    int parNum() {return _numPar;}
+
+    void setNumObs(int maxObs) {_maxObs = maxObs;}
+    void setNumPar(int numPar) { _numPar = 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;}
     const Matrix& AA2() {return _AA2;}
-
-    void initAA() {
+    const Matrix& D21() {return _D21;}
+
+    void initAA() {//LOG << "initAA: _maxObs: " << _maxObs << " _numPar: " << _numPar << endl;
       _AA1.ReSize(_maxObs, _numPar); _AA1 = 0.0;
       _AA2.ReSize(_maxObs, _numPar); _AA2 = 0.0;
+      _D21.ReSize(_numPar, _numPar); _D21 = 0.0;
     }
 
@@ -112 +141 @@
       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;
-    }
+
+    t_irc computeTrafoMatrix() {
+      if (((_AA2.t() * _AA2)).Determinant() == 0.0) {
+        LOG << "(_AA2.t() * _AA2).inv() is singular" << 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++) {
@@ -134 +164 @@
       LOG << endl;
     }
-
+  private:
     int               _firstRow;
     int               _lastRow;
     Matrix            _AA1;
     Matrix            _AA2;
-    bool              _firstSys;
+    Matrix            _D21;
+    char              _firstSys;
     int               _maxObs;
     int               _numPar;
     QMap<char, t_prn> _refSatMapPseudoObs;
+    t_pppParlist*     _parlist;
   };