Changeset 3408 in ntrip for trunk/BNC/bncmodel.h

Timestamp:

Sep 2, 2011, 8:43:49 PM (13 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/bncmodel.h (modified) (6 diffs)

trunk/BNC/bncmodel.h

@@ -29 +29 @@
 #include <QtNetwork>
 #include <newmat.h>
+#include <vector>
 
 #include "bncconst.h"
@@ -59 +60 @@
   bncModel(QByteArray staID);
   ~bncModel();
-  t_irc cmpBancroft(t_epoData* epoData);
   t_irc update(t_epoData* epoData);
   bncTime time()  const {return _time;}
@@ -94 +94 @@
 
  private:
+  t_irc cmpBancroft(t_epoData* epoData);
   void   reset();
   void   cmpEle(t_satData* satData);
@@ -99 +100 @@
   void   addObs(int iPhase, unsigned& iObs, t_satData* satData,
                 Matrix& AA, ColumnVector& ll, DiagonalMatrix& PP);
-  void   printRes(int iPhase, const ColumnVector& vv, 
-                  std::ostringstream& str, t_satData* satData);
-  void   findMaxRes(int iPhase, const ColumnVector& vv,
+  QByteArray printRes(int iPhase, const ColumnVector& vv, 
+                      const QMap<QString, t_satData*>& satDataMap);
+  void   findMaxRes(const ColumnVector& vv,
                     const QMap<QString, t_satData*>& satData,
-                    QString& prnCode,  double& maxResCode, 
-                    QString& prnPhase, double& maxResPhase);
+                    QString& prn,  double& maxRes); 
   double cmpValue(t_satData* satData, bool phase);
   double delay_saast(double Ele);
   void   predict(int iPhase, t_epoData* epoData);
   t_irc  update_p(t_epoData* epoData);
-  QString outlierDetection(int iPhase, const SymmetricMatrix& QQsav, 
-                           const ColumnVector& vv,
-                           QMap<QString, t_satData*>& satDataGPS,
-                           QMap<QString, t_satData*>& satDataGlo,
-                           QMap<QString, t_satData*>& satDataGal);
+  bool   outlierDetection(int iPhase, const ColumnVector& vv,
+                          QMap<QString, t_satData*>& satData);
   void writeNMEAstr(const QString& nmStr);
 
@@ -121 +118 @@
   bncTime  _startTime;
 
-  void rememberState();
-  void restoreState();
+  void rememberState(t_epoData* epoData);
+  void restoreState(t_epoData* epoData);
 
   class pppPos {
@@ -142 +139 @@
   QVector<bncParam*>    _params_sav;
   SymmetricMatrix       _QQ_sav;
+  t_epoData*            _epoData_sav;
   ColumnVector          _xcBanc;
   ColumnVector          _ellBanc;