Changeset 9258 in ntrip for trunk/BNC/src/combination/bnccomb.h

Timestamp:

Nov 17, 2020, 3:50:34 PM (3 years ago)

Author:

stuerze

Message:

combination adapted to work system by system

File:

• trunk/BNC/src/combination/bnccomb.h (modified) (4 diffs)

trunk/BNC/src/combination/bnccomb.h

@@ -37 +37 @@
   class cmbParam {
    public:
-    enum parType {offACgps, offACglo, offACSat, clkSat};
+    enum parType {offACgnss, offACSat, clkSat};
     cmbParam(parType type_, int index_, const QString& ac_, const QString& prn_);
     ~cmbParam();
-    double partial(const QString& AC_, const QString& prn_);
-    QString toString() const;
+    double partial(char sys, const QString& AC_, const QString& prn_);
+    QString toString(char sys) const;
     parType type;
     int     index;
@@ -57 +57 @@
     cmbAC() {
       weight = 0.0;
-      numObs = 0;
+      numObs['G'] = 0;
+      numObs['R'] = 0;
+      numObs['E'] = 0;
+      numObs['C'] = 0;
+      numObs['J'] = 0;
+      numObs['S'] = 0;
     }
     ~cmbAC() {}
@@ -63 +68 @@
     QString  name;
     double   weight;
-    unsigned numObs;
+    QMap<char, unsigned> numObs;
   };
 
@@ -98 +103 @@
   };
 
-  void  processEpoch();
-  t_irc processEpoch_filter(QTextStream& out, QMap<QString, cmbCorr*>& resCorr,
+  void  processEpoch(char sys);
+  t_irc processEpoch_filter(char sys, QTextStream& out, QMap<QString, cmbCorr*>& resCorr,
                             ColumnVector& dx);
-  t_irc processEpoch_singleEpoch(QTextStream& out, QMap<QString, cmbCorr*>& resCorr,
+  t_irc processEpoch_singleEpoch(char sys, QTextStream& out, QMap<QString, cmbCorr*>& resCorr,
                                  ColumnVector& dx);
-  t_irc createAmat(Matrix& AA, ColumnVector& ll, DiagonalMatrix& PP,
+  t_irc createAmat(char sys, Matrix& AA, ColumnVector& ll, DiagonalMatrix& PP,
                    const ColumnVector& x0, QMap<QString, cmbCorr*>& resCorr);
   void  dumpResults(const QMap<QString, cmbCorr*>& resCorr);
   void  printResults(QTextStream& out, const QMap<QString, cmbCorr*>& resCorr);
   void  switchToLastEph(t_eph* lastEph, cmbCorr* corr);
-  t_irc checkOrbits(QTextStream& out);
-  QVector<cmbCorr*>& corrs() {return _buffer[_resTime].corrs;}
+  t_irc checkOrbits(char sys, QTextStream& out);
+  QVector<cmbCorr*>& corrs(char sys) {return _buffer[sys][_resTime].corrs;}
 
   QMutex                                 _mutex;
   QList<cmbAC*>                          _ACs;
   bncTime                                _resTime;
-  QVector<cmbParam*>                     _params;
-  QMap<bncTime, cmbEpoch>                _buffer;
+  QMap<char, QVector<cmbParam*>>         _params;
+  QMap<char, QMap<bncTime, cmbEpoch>>    _buffer;
   bncRtnetDecoder*                       _rtnetDecoder;
-  SymmetricMatrix                        _QQ;
+  QMap<char, SymmetricMatrix>            _QQ;
   QByteArray                             _log;
   bncAntex*                              _antex;
   double                                 _MAXRES;
-  QString                                _masterOrbitAC;
-  unsigned                               _masterMissingEpochs;
+  QMap<char, QString>                    _masterOrbitAC;
+  QMap<char, unsigned>                   _masterMissingEpochs;
   e_method                               _method;
-  bool                                   _useGlonass;
   int                                    _cmbSampl;
   QMap<QString, QMap<t_prn, t_orbCorr> > _orbCorrections;
   bncEphUser                             _ephUser;
   SsrCorr*                               _ssrCorr;
+  QMap<char, unsigned>                   _cmbSysPrn;
 };