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

Timestamp:

Oct 6, 2021, 10:50:34 PM (3 years ago)

Author:

stuerze

Message:

some changes regarding PPP

File:

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

trunk/BNC/src/PPP/pppFilter.h

@@ -26 +26 @@
   const SymmetricMatrix& Q() const {return _QFlt;}
 
-  t_irc datumTransformation();
+  t_irc datumTransformation(const QMap<char, t_pppRefSat*>& refSatMap);
   void initDatumTransformation(const std::vector<t_pppSatObs*>& allObs, bool pseudoObsIono);
   unsigned setTrafoObs();
@@ -91 +91 @@
         _firstRow = _lastRow + 1;
       }
-      _lastRow += maxObsSys;//LOG << sys << " updateIndices: lastRow: " << _lastRow << "\n" ;
+      _lastRow += maxObsSys; //LOG << sys << " updateIndices: lastRow: " << _lastRow << "\n" ;
     };
 
@@ -120 +120 @@
       _D21.ReSize(_numPar, _numPar); _D21 = 0.0;
     }
-    void prepareAA(const Matrix& AA, int ind) {
+    t_irc prepareAA(const Matrix& AA, int ind) {
       Matrix* Prep = &_AA2;
       if (ind == 1) {
         Prep = &_AA1;
       }
+      //LOG << "_firstRow: " << _firstRow << " _lastRow: " << _lastRow << " _numPar " << _numPar << std::endl;
+      if (AA.Ncols() > _numPar) {
+        LOG << "t_pppFilter::prepareAA: AA.Ncols() > _numPar: " << AA.Ncols() << " > " << _numPar << std::endl;
+        return failure;
+      }
       Prep->SubMatrix(_firstRow, _lastRow, 1, _numPar) << AA;
+      return success;
     }
     void switchAA() {
@@ -132 +138 @@
     t_irc computeTrafoMatrix() {
       if (((_AA2.t() * _AA2)).Determinant() == 0.0) {
-        LOG << "(_AA2.t() * _AA2).inv() is singular" << std::endl;
+        LOG << "t_pppFilter::computeTrafoMatrix: (_AA2.t() * _AA2).inv() is singular" << std::endl;
         return failure;
       }
@@ -174 +180 @@
                  SymmetricMatrix* QSav = 0, ColumnVector* xSav = 0);
 
-  void cmpDOP(const std::vector<t_pppSatObs*>& obsVector);
+  void cmpDOP(const std::vector<t_pppSatObs*>& obsVector,
+              const QMap<char, t_pppRefSat*>& refSatMap);
 
   void predictCovCrdPart(const SymmetricMatrix& QFltOld);
@@ -180 +187 @@
   t_irc addNoiseToIono(char sys);
 
-  bool resetRefSatellitesLastEpoch(std::vector<t_pppSatObs*>& obsVector);
+  bool resetRefSatellitesLastEpoch(std::vector<t_pppSatObs*>& obsVector,
+                                   const QMap<char, t_pppRefSat*>& refSatMap,
+                                   const QMap<char, t_pppRefSat*>& refSatMapLastEpoch);
 
   bncTime         _epoTime;