Changeset 5826 in ntrip for trunk/BNC/src

Timestamp:

Aug 6, 2014, 1:39:41 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (3 diffs)
• pppClient.h (modified) (3 diffs)
• pppFilter.cpp (modified) (2 diffs)
• pppFilter.h (modified) (2 diffs)
• pppObsPool.cpp (modified) (6 diffs)
• pppObsPool.h (modified) (3 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -51 +51 @@
 #include "pppEphPool.h"
 #include "pppObsPool.h"
-#include "pppSatBias.h"
 #include "bncconst.h"
 #include "bncutils.h"
@@ -78 +77 @@
   _log      = new ostringstream();
   _ephPool  = new t_pppEphPool();
-  _obsPool  = new t_frqObsPool();
+  _obsPool  = new t_pppObsPool();
   _staRover = new t_pppStation();
   _filter   = new t_pppFilter();
@@ -142 +141 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppClient::putBiases(const vector<t_satBiases*>& biases) {
+void t_pppClient::putBiases(const vector<t_satBias*>& biases) {
   for (unsigned ii = 0; ii < biases.size(); ii++) {
-    _obsPool->putBiases(new t_pppSatBias(*biases[ii]));
+    _obsPool->putBias(new t_satBias(*biases[ii]));
   }
 }

trunk/BNC/src/PPP/pppClient.h

@@ -14 +14 @@
 
 class t_pppEphPool;
-class t_frqObsPool;
+class t_pppObsPool;
 class t_pppSatObs;
 class t_pppStation;
@@ -27 +27 @@
   void putOrbCorrections(const std::vector<t_orbCorr*>& corr); 
   void putClkCorrections(const std::vector<t_clkCorr*>& corr); 
-  void putBiases(const std::vector<t_satBiases*>& biases);   
+  void putBiases(const std::vector<t_satBias*>& satBias);   
   void processEpoch(const std::vector<t_satObs*>& satObs, t_output* output);
 
   const t_pppEphPool* ephPool() const {return _ephPool;}
-  const t_frqObsPool* obsPool() const {return _obsPool;}
+  const t_pppObsPool* obsPool() const {return _obsPool;}
   const bncAntex*  antex() const {return _antex;}
   const t_pppStation* staRover() const {return _staRover;}
@@ -57 +57 @@
   t_output*                 _output;
   t_pppEphPool*             _ephPool;
-  t_frqObsPool*             _obsPool;
+  t_pppObsPool*             _obsPool;
   bncTime                   _epoTimeRover;
   t_pppStation*             _staRover;

trunk/BNC/src/PPP/pppFilter.cpp

@@ -30 +30 @@
 // Process Single Epoch
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_pppFilter::processEpoch(t_frqObsPool* obsPool) {
+t_irc t_pppFilter::processEpoch(t_pppObsPool* obsPool) {
 
   _numSat     = 0;
@@ -40 +40 @@
   // Vector of all Observations
   // --------------------------
-  t_frqObsPool::t_epoch* epoch = obsPool->lastEpoch();
+  t_pppObsPool::t_epoch* epoch = obsPool->lastEpoch();
   if (!epoch) {
     return failure;

trunk/BNC/src/PPP/pppFilter.h

@@ -12 +12 @@
 
 class t_pppParlist;
-class t_frqObsPool;
+class t_pppObsPool;
 class t_pppSatObs;
 
@@ -20 +20 @@
   ~t_pppFilter();
 
-  t_irc processEpoch(t_frqObsPool* obsPool);
+  t_irc processEpoch(t_pppObsPool* obsPool);
 
   const ColumnVector&    x() const {return _xFlt;}

trunk/BNC/src/PPP/pppObsPool.cpp

@@ -46 +46 @@
 // Constructor
 /////////////////////////////////////////////////////////////////////////////
-t_frqObsPool::t_epoch::t_epoch(const bncTime& epoTime, vector<t_pppSatObs*>& obsVector) {
+t_pppObsPool::t_epoch::t_epoch(const bncTime& epoTime, vector<t_pppSatObs*>& obsVector) {
   _epoTime   = epoTime;
   for (unsigned ii = 0; ii < obsVector.size(); ii++) {
@@ -56 +56 @@
 // Destructor
 /////////////////////////////////////////////////////////////////////////////
-t_frqObsPool::t_epoch::~t_epoch() {
+t_pppObsPool::t_epoch::~t_epoch() {
   for (unsigned ii = 0; ii < _obsVector.size(); ii++) {
     delete _obsVector[ii];
@@ -64 +64 @@
 // Constructor
 /////////////////////////////////////////////////////////////////////////////
-t_frqObsPool::t_frqObsPool() {
+t_pppObsPool::t_pppObsPool() {
   for (unsigned ii = 0; ii <= t_prn::MAXPRN; ii++) {
     _satBiases[ii] = 0;
@@ -72 +72 @@
 // Destructor
 /////////////////////////////////////////////////////////////////////////////
-t_frqObsPool::~t_frqObsPool() {
+t_pppObsPool::~t_pppObsPool() {
   for (unsigned ii = 0; ii <= t_prn::MAXPRN; ii++) {
     delete _satBiases[ii];
@@ -84 +84 @@
 //
 /////////////////////////////////////////////////////////////////////////////
-void t_frqObsPool::putBiases(t_pppSatBias* satBias) {
+void t_pppObsPool::putBias(t_satBias* satBias) {
   int iPrn = satBias->prn().toInt();
   delete _satBiases[iPrn];
@@ -92 +92 @@
 //
 /////////////////////////////////////////////////////////////////////////////
-void t_frqObsPool::putEpoch(const bncTime& epoTime, vector<t_pppSatObs*>& obsVector) {
+void t_pppObsPool::putEpoch(const bncTime& epoTime, vector<t_pppSatObs*>& obsVector) {
   const unsigned MAXSIZE = 2;
   _epochs.push_back(new t_epoch(epoTime, obsVector));

trunk/BNC/src/PPP/pppObsPool.h

@@ -5 +5 @@
 #include <deque>
 #include "pppSatObs.h"
-#include "pppSatBias.h"
 #include "bnctime.h"
 
 namespace BNC_PPP {
 
-class t_frqObsPool {
+class t_pppObsPool {
  public: 
 
@@ -25 +24 @@
   };
 
-  t_frqObsPool();
-  ~t_frqObsPool();
-  void putBiases(t_pppSatBias* satBias);
+  t_pppObsPool();
+  ~t_pppObsPool();
+  void putBias(t_satBias* satBias);
 
   void putEpoch(const bncTime& epoTime, std::vector<t_pppSatObs*>& obsVector);
 
-  const t_pppSatBias* satBias(const t_prn& prn) const {  
+  const t_satBias* satBias(const t_prn& prn) const {  
     return _satBiases[prn.toInt()];
   }
+
   t_epoch* lastEpoch() {
     if (_epochs.size()) {
@@ -44 +44 @@
 
  private:
-  t_pppSatBias*        _satBiases[t_prn::MAXPRN+1];
+  t_satBias*           _satBiases[t_prn::MAXPRN+1];
   std::deque<t_epoch*> _epochs;
 };