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

Timestamp:

Aug 6, 2014, 1:02:08 PM (10 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/src/PPP/pppClient.h

@@ -14 +14 @@
 
 class t_pppEphPool;
-class t_pppObsPool;
-class t_satObs;
+class t_frqObsPool;
+class t_pppSatObs;
 class t_pppStation;
 class t_pppFilter;
@@ -28 +28 @@
   void putClkCorrections(const std::vector<t_clkCorr*>& corr); 
   void putBiases(const std::vector<t_satBiases*>& biases);   
-  void processEpoch(const std::vector<t_pppSatObs*>& pppSatObs, t_output* output);
+  void processEpoch(const std::vector<t_satObs*>& pppSatObs, t_output* output);
 
   const t_pppEphPool* ephPool() const {return _ephPool;}
-  const t_pppObsPool* obsPool() const {return _obsPool;}
+  const t_frqObsPool* obsPool() const {return _obsPool;}
   const bncAntex*  antex() const {return _antex;}
   const t_pppStation* staRover() const {return _staRover;}
@@ -47 +47 @@
   void finish(t_irc irc);
   void clearObs();
-  t_irc prepareObs(const std::vector<t_pppSatObs*>& pppSatObs,
-                   std::vector<t_satObs*>& obsVector, bncTime& epoTime);
+  t_irc prepareObs(const std::vector<t_satObs*>& pppSatObs,
+                   std::vector<t_pppSatObs*>& obsVector, bncTime& epoTime);
   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, 
+                 std::vector<t_pppSatObs*>& obsVector);
+  t_irc cmpBancroft(const bncTime& epoTime, std::vector<t_pppSatObs*>& obsVector, 
                     ColumnVector& xyzc, bool print);
-  double cmpOffGG(std::vector<t_satObs*>& obsVector);
+  double cmpOffGG(std::vector<t_pppSatObs*>& obsVector);
 
   t_output*              _output;
   t_pppEphPool*             _ephPool;
-  t_pppObsPool*             _obsPool;
+  t_frqObsPool*             _obsPool;
   bncTime                _epoTimeRover;
   t_pppStation*             _staRover;
@@ -63 +63 @@
   t_pppFilter*              _filter;
   double                 _offGG;
-  std::vector<t_satObs*> _obsRover;
+  std::vector<t_pppSatObs*> _obsRover;
   std::ostringstream*    _log; 
   t_pppOptions*             _opt;