Changeset 5740 in ntrip for trunk/BNC/src/PPP/pppClient.h

Timestamp:

Aug 2, 2014, 4:22:22 PM (10 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/src/PPP/pppClient.h

@@ -4 +4 @@
 #include <sstream>
 #include <vector>
-#include "RTCM3/ephemeris.h"
+#include "ppp.h"
+#include "ephemeris.h"
+#include "options.h"
+
+class bncAntex;
 
 namespace BNC {
@@ -12 +16 @@
 class t_satObs;
 class t_station;
-class t_antex;
 class t_filter;
 
@@ -19 +22 @@
   t_pppClient();                                                      
   ~t_pppClient();                                                     
-  void setOptions(const t_pppOpt* opt);                          
+  void setOptions(const t_options* opt);                          
   void putGPSEphemeris(const t_ephGPS* eph);                  
   void putGloEphemeris(const t_ephGlo* eph);                  
-  void putOrbCorrections(int numCorr, const t_pppOrbCorr* corr); 
-  void putClkCorrections(int numCorr, const t_pppClkCorr* corr); 
-  void putBiases(int numBiases, const t_pppSatBiases* biases);   
+  void putOrbCorrections(int numCorr, const t_orbCorr* corr); 
+  void putClkCorrections(int numCorr, const t_clkCorr* corr); 
+  void putBiases(int numBiases, const t_satBiases* biases);   
   void processEpoch(int numSatRover, const t_pppSatObs* satObsRover,
                     t_pppOutput* output);                        
   const t_ephPool* ephPool() const {return _ephPool;}
   const t_obsPool* obsPool() const {return _obsPool;}
-  const t_antex*   antex() const {return _antex;}
+  const bncAntex*  antex() const {return _antex;}
   const t_station* staRover() const {return _staRover;}
   double offGG() const {return _offGG;}
+  static void bancroft(const Matrix& BBpass, ColumnVector& pos);
 
   std::ostringstream* _log; 
@@ -38 +42 @@
  private:
   void initOutput(t_pppOutput* output);
-  void finish(t_irc::irc irc);
+  void finish(t_irc irc);
   void clearObs();
-  t_irc::irc prepareObs(int numSat, const t_pppSatObs* satObs,
-                        std::vector<t_satObs*>& obsVector, t_time& epoTime);
-  t_irc::irc cmpModel(t_station* station, const ColumnVector& xyzc,
+  t_irc prepareObs(int numSat, const t_pppSatObs* satObs,
+                        std::vector<t_satObs*>& obsVector, bncTime& epoTime);
+  t_irc cmpModel(t_station* station, const ColumnVector& xyzc,
                       std::vector<t_satObs*>& obsVector);
-  t_irc::irc cmpBancroft(const t_time& epoTime, 
+  t_irc cmpBancroft(const bncTime& epoTime, 
                          std::vector<t_satObs*>& obsVector, 
                          ColumnVector& xyzc, bool print);
-  t_irc::irc createDifferences();
   double cmpOffGG(std::vector<t_satObs*>& obsVector);
 
@@ -53 +56 @@
   t_ephPool*             _ephPool;
   t_obsPool*             _obsPool;
-  t_time                 _epoTimeRover;
-  t_time                 _epoTimeBase;
+  bncTime                _epoTimeRover;
   t_station*             _staRover;
-  t_station*             _staBase;
-  t_antex*               _antex;
+  bncAntex*              _antex;
   t_filter*              _filter;
   double                 _offGG;
   std::vector<t_satObs*> _obsRover;
-  std::vector<t_satObs*> _obsBase;
 
 };