Changeset 5826 in ntrip for trunk/BNC/src/PPP


Ignore:
Timestamp:
Aug 6, 2014, 1:39:41 PM (10 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src/PPP
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/PPP/pppClient.cpp

    r5825 r5826  
    5151#include "pppEphPool.h"
    5252#include "pppObsPool.h"
    53 #include "pppSatBias.h"
    5453#include "bncconst.h"
    5554#include "bncutils.h"
     
    7877  _log      = new ostringstream();
    7978  _ephPool  = new t_pppEphPool();
    80   _obsPool  = new t_frqObsPool();
     79  _obsPool  = new t_pppObsPool();
    8180  _staRover = new t_pppStation();
    8281  _filter   = new t_pppFilter();
     
    142141//
    143142//////////////////////////////////////////////////////////////////////////////
    144 void t_pppClient::putBiases(const vector<t_satBiases*>& biases) {
     143void t_pppClient::putBiases(const vector<t_satBias*>& biases) {
    145144  for (unsigned ii = 0; ii < biases.size(); ii++) {
    146     _obsPool->putBiases(new t_pppSatBias(*biases[ii]));
     145    _obsPool->putBias(new t_satBias(*biases[ii]));
    147146  }
    148147}
  • trunk/BNC/src/PPP/pppClient.h

    r5823 r5826  
    1414
    1515class t_pppEphPool;
    16 class t_frqObsPool;
     16class t_pppObsPool;
    1717class t_pppSatObs;
    1818class t_pppStation;
     
    2727  void putOrbCorrections(const std::vector<t_orbCorr*>& corr);
    2828  void putClkCorrections(const std::vector<t_clkCorr*>& corr);
    29   void putBiases(const std::vector<t_satBiases*>& biases);   
     29  void putBiases(const std::vector<t_satBias*>& satBias);   
    3030  void processEpoch(const std::vector<t_satObs*>& satObs, t_output* output);
    3131
    3232  const t_pppEphPool* ephPool() const {return _ephPool;}
    33   const t_frqObsPool* obsPool() const {return _obsPool;}
     33  const t_pppObsPool* obsPool() const {return _obsPool;}
    3434  const bncAntex*  antex() const {return _antex;}
    3535  const t_pppStation* staRover() const {return _staRover;}
     
    5757  t_output*                 _output;
    5858  t_pppEphPool*             _ephPool;
    59   t_frqObsPool*             _obsPool;
     59  t_pppObsPool*             _obsPool;
    6060  bncTime                   _epoTimeRover;
    6161  t_pppStation*             _staRover;
  • trunk/BNC/src/PPP/pppFilter.cpp

    r5819 r5826  
    3030// Process Single Epoch
    3131////////////////////////////////////////////////////////////////////////////
    32 t_irc t_pppFilter::processEpoch(t_frqObsPool* obsPool) {
     32t_irc t_pppFilter::processEpoch(t_pppObsPool* obsPool) {
    3333
    3434  _numSat     = 0;
     
    4040  // Vector of all Observations
    4141  // --------------------------
    42   t_frqObsPool::t_epoch* epoch = obsPool->lastEpoch();
     42  t_pppObsPool::t_epoch* epoch = obsPool->lastEpoch();
    4343  if (!epoch) {
    4444    return failure;
  • trunk/BNC/src/PPP/pppFilter.h

    r5819 r5826  
    1212
    1313class t_pppParlist;
    14 class t_frqObsPool;
     14class t_pppObsPool;
    1515class t_pppSatObs;
    1616
     
    2020  ~t_pppFilter();
    2121
    22   t_irc processEpoch(t_frqObsPool* obsPool);
     22  t_irc processEpoch(t_pppObsPool* obsPool);
    2323
    2424  const ColumnVector&    x() const {return _xFlt;}
  • trunk/BNC/src/PPP/pppObsPool.cpp

    r5819 r5826  
    4646// Constructor
    4747/////////////////////////////////////////////////////////////////////////////
    48 t_frqObsPool::t_epoch::t_epoch(const bncTime& epoTime, vector<t_pppSatObs*>& obsVector) {
     48t_pppObsPool::t_epoch::t_epoch(const bncTime& epoTime, vector<t_pppSatObs*>& obsVector) {
    4949  _epoTime   = epoTime;
    5050  for (unsigned ii = 0; ii < obsVector.size(); ii++) {
     
    5656// Destructor
    5757/////////////////////////////////////////////////////////////////////////////
    58 t_frqObsPool::t_epoch::~t_epoch() {
     58t_pppObsPool::t_epoch::~t_epoch() {
    5959  for (unsigned ii = 0; ii < _obsVector.size(); ii++) {
    6060    delete _obsVector[ii];
     
    6464// Constructor
    6565/////////////////////////////////////////////////////////////////////////////
    66 t_frqObsPool::t_frqObsPool() {
     66t_pppObsPool::t_pppObsPool() {
    6767  for (unsigned ii = 0; ii <= t_prn::MAXPRN; ii++) {
    6868    _satBiases[ii] = 0;
     
    7272// Destructor
    7373/////////////////////////////////////////////////////////////////////////////
    74 t_frqObsPool::~t_frqObsPool() {
     74t_pppObsPool::~t_pppObsPool() {
    7575  for (unsigned ii = 0; ii <= t_prn::MAXPRN; ii++) {
    7676    delete _satBiases[ii];
     
    8484//
    8585/////////////////////////////////////////////////////////////////////////////
    86 void t_frqObsPool::putBiases(t_pppSatBias* satBias) {
     86void t_pppObsPool::putBias(t_satBias* satBias) {
    8787  int iPrn = satBias->prn().toInt();
    8888  delete _satBiases[iPrn];
     
    9292//
    9393/////////////////////////////////////////////////////////////////////////////
    94 void t_frqObsPool::putEpoch(const bncTime& epoTime, vector<t_pppSatObs*>& obsVector) {
     94void t_pppObsPool::putEpoch(const bncTime& epoTime, vector<t_pppSatObs*>& obsVector) {
    9595  const unsigned MAXSIZE = 2;
    9696  _epochs.push_back(new t_epoch(epoTime, obsVector));
  • trunk/BNC/src/PPP/pppObsPool.h

    r5822 r5826  
    55#include <deque>
    66#include "pppSatObs.h"
    7 #include "pppSatBias.h"
    87#include "bnctime.h"
    98
    109namespace BNC_PPP {
    1110
    12 class t_frqObsPool {
     11class t_pppObsPool {
    1312 public:
    1413
     
    2524  };
    2625
    27   t_frqObsPool();
    28   ~t_frqObsPool();
    29   void putBiases(t_pppSatBias* satBias);
     26  t_pppObsPool();
     27  ~t_pppObsPool();
     28  void putBias(t_satBias* satBias);
    3029
    3130  void putEpoch(const bncTime& epoTime, std::vector<t_pppSatObs*>& obsVector);
    3231
    33   const t_pppSatBias* satBias(const t_prn& prn) const { 
     32  const t_satBias* satBias(const t_prn& prn) const { 
    3433    return _satBiases[prn.toInt()];
    3534  }
     35
    3636  t_epoch* lastEpoch() {
    3737    if (_epochs.size()) {
     
    4444
    4545 private:
    46   t_pppSatBias*        _satBiases[t_prn::MAXPRN+1];
     46  t_satBias*           _satBiases[t_prn::MAXPRN+1];
    4747  std::deque<t_epoch*> _epochs;
    4848};
Note: See TracChangeset for help on using the changeset viewer.