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

Timestamp:

Aug 6, 2014, 11:34:36 AM (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 "ppp.h"
+#include "pppInclude.h"
 #include "ephemeris.h"
-#include "options.h"
+#include "pppOptions.h"
 #include "pppModel.h"
 
@@ -13 +13 @@
 namespace BNC {
 
-class t_ephPool;
-class t_obsPool;
+class t_pppEphPool;
+class t_pppObsPool;
 class t_satObs;
-class t_station;
-class t_filter;
+class t_pppStation;
+class t_pppFilter;
 
 class t_pppClient {
  public:
-  t_pppClient(const t_options* opt);                                                      
+  t_pppClient(const t_pppOptions* opt);                                                      
   ~t_pppClient();                                                     
 
@@ -30 +30 @@
   void processEpoch(const std::vector<t_pppSatObs*>& pppSatObs, t_output* output);
 
-  const t_ephPool* ephPool() const {return _ephPool;}
-  const t_obsPool* obsPool() const {return _obsPool;}
+  const t_pppEphPool* ephPool() const {return _ephPool;}
+  const t_pppObsPool* obsPool() const {return _obsPool;}
   const bncAntex*  antex() const {return _antex;}
-  const t_station* staRover() const {return _staRover;}
+  const t_pppStation* staRover() const {return _staRover;}
   double           offGG() const {return _offGG;}
 
   std::ostringstream& log() {return *_log;}
-  const t_options*    opt() const {return _opt;}
+  const t_pppOptions*    opt() const {return _opt;}
 
   static void bancroft(const Matrix& BBpass, ColumnVector& pos);
@@ -49 +49 @@
   t_irc prepareObs(const std::vector<t_pppSatObs*>& pppSatObs,
                    std::vector<t_satObs*>& obsVector, bncTime& epoTime);
-  t_irc cmpModel(t_station* station, const ColumnVector& xyzc,
+  t_irc cmpModel(t_pppStation* station, const ColumnVector& xyzc,
                  std::vector<t_satObs*>& obsVector);
   t_irc cmpBancroft(const bncTime& epoTime, std::vector<t_satObs*>& obsVector, 
@@ -56 +56 @@
 
   t_output*              _output;
-  t_ephPool*             _ephPool;
-  t_obsPool*             _obsPool;
+  t_pppEphPool*             _ephPool;
+  t_pppObsPool*             _obsPool;
   bncTime                _epoTimeRover;
-  t_station*             _staRover;
+  t_pppStation*             _staRover;
   bncAntex*              _antex;
-  t_filter*              _filter;
+  t_pppFilter*              _filter;
   double                 _offGG;
   std::vector<t_satObs*> _obsRover;
   std::ostringstream*    _log; 
-  t_options*             _opt; 
+  t_pppOptions*             _opt; 
   t_tides*               _tides;
 };