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

Timestamp:

Aug 6, 2014, 11:34:36 AM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/PPP/pppParlist.h (modified) (6 diffs)

trunk/BNC/src/PPP/pppParlist.h

@@ -4 +4 @@
 #include <vector>
 #include <string>
-#include "ppp.h"
+#include "pppInclude.h"
 #include "t_prn.h"
 #include "bnctime.h"
@@ -12 +12 @@
 class t_satObs;
 
-class t_param {
+class t_pppParam {
  public:
   enum e_type {crdX, crdY, crdZ, clkR, amb, offGG, trp, bias};
 
-  t_param(e_type type, const t_prn& prn, t_lc::type tLC,
+  t_pppParam(e_type type, const t_prn& prn, t_lc::type tLC,
           const std::vector<t_satObs*>* obsVector = 0);
 
-  ~t_param();
+  ~t_pppParam();
   e_type type() const {return _type;}
   double x0()  const {return _x0;}
@@ -25 +25 @@
                  const t_lc::type& tLC) const;
   bool   epoSpec() const {return _epoSpec;}
-  bool   isEqual(const t_param* par2) const {
+  bool   isEqual(const t_pppParam* par2) const {
     return (_type == par2->_type && _prn == par2->_prn && _tLC == par2->_tLC);
   }
@@ -52 +52 @@
   void     stepAmbNumEpo()             {if (_ambInfo) _ambInfo->_numEpo += 1;}
 
-  static bool sortFunction(const t_param* p1, const t_param* p2) {
+  static bool sortFunction(const t_pppParam* p1, const t_pppParam* p2) {
     if      (p1->_type != p2->_type) {
       return p1->_type < p2->_type;
@@ -92 +92 @@
 };
 
-class t_parlist {
+class t_pppParlist {
  public:
-  t_parlist();
-  ~t_parlist();
+  t_pppParlist();
+  ~t_pppParlist();
 
   t_irc set(const bncTime& epoTime, const std::vector<t_lc::type>& ambLCs,
@@ -101 +101 @@
 
   unsigned nPar() const {return _params.size();}
-  const std::vector<t_param*>& params() const {return _params;}
-  std::vector<t_param*>& params() {return _params;}
+  const std::vector<t_pppParam*>& params() const {return _params;}
+  std::vector<t_pppParam*>& params() {return _params;}
   void printResult(const bncTime& epoTime, const SymmetricMatrix& QQ, 
                    const ColumnVector& xx, double ambFixRate) const;
  private:
-  std::vector<t_param*> _params;
+  std::vector<t_pppParam*> _params;
 };