Changeset 5823 in ntrip

Timestamp:

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

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (4 diffs)
• pppClient.h (modified) (3 diffs)
• pppSatObs.h (modified) (1 diff)
• pppThread.cpp (modified) (2 diffs)
• pppThread.h (modified) (1 diff)

trunk/BNC/src/PPP/pppClient.cpp

@@ -150 +150 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-t_irc t_pppClient::prepareObs(const vector<t_satObs*>& pppSatObs,
+t_irc t_pppClient::prepareObs(const vector<t_satObs*>& satObs,
                               vector<t_pppSatObs*>& obsVector, bncTime& epoTime) {
   // Default 
@@ -159 +159 @@
   // -----------------------------------
   int numValidGPS = 0;
-  for (unsigned ii = 0; ii < pppSatObs.size(); ii++) {
-    char system = pppSatObs[ii]->_prn.system();
+  for (unsigned ii = 0; ii < satObs.size(); ii++) {
+    char system = satObs[ii]->_prn.system();
     if (system == 'G' || (system == 'R' && OPT->useGlonass())) {
-      t_pppSatObs* satObs = new t_pppSatObs(*pppSatObs[ii]);
-      if (satObs->isValid()) {
-        obsVector.push_back(satObs);
-        if (satObs->prn().system() == 'G') {
+      t_pppSatObs* pppSatObs = new t_pppSatObs(*satObs[ii]);
+      if (pppSatObs->isValid()) {
+        obsVector.push_back(pppSatObs);
+        if (pppSatObs->prn().system() == 'G') {
           ++numValidGPS;
         }
       }
       else {
-        delete satObs;
+        delete pppSatObs;
       }
     }
@@ -402 +402 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppClient::processEpoch(const vector<t_satObs*>& pppSatObs, t_output* output) {
+void t_pppClient::processEpoch(const vector<t_satObs*>& satObs, t_output* output) {
 
   try {
@@ -409 +409 @@
     // Prepare Observations of the Rover
     // ---------------------------------    
-    if (prepareObs(pppSatObs, _obsRover, _epoTimeRover) != success) {
+    if (prepareObs(satObs, _obsRover, _epoTimeRover) != success) {
       return finish(failure);
     }

trunk/BNC/src/PPP/pppClient.h

@@ -28 +28 @@
   void putClkCorrections(const std::vector<t_clkCorr*>& corr); 
   void putBiases(const std::vector<t_satBiases*>& biases);   
-  void processEpoch(const std::vector<t_satObs*>& pppSatObs, t_output* output);
+  void processEpoch(const std::vector<t_satObs*>& satObs, t_output* output);
 
   const t_pppEphPool* ephPool() const {return _ephPool;}
@@ -47 +47 @@
   void finish(t_irc irc);
   void clearObs();
-  t_irc prepareObs(const std::vector<t_satObs*>& pppSatObs,
+  t_irc prepareObs(const std::vector<t_satObs*>& satObs,
                    std::vector<t_pppSatObs*>& obsVector, bncTime& epoTime);
   t_irc cmpModel(t_pppStation* station, const ColumnVector& xyzc,
@@ -55 +55 @@
   double cmpOffGG(std::vector<t_pppSatObs*>& obsVector);
 
-  t_output*              _output;
+  t_output*                 _output;
   t_pppEphPool*             _ephPool;
   t_frqObsPool*             _obsPool;
-  bncTime                _epoTimeRover;
+  bncTime                   _epoTimeRover;
   t_pppStation*             _staRover;
-  bncAntex*              _antex;
+  bncAntex*                 _antex;
   t_pppFilter*              _filter;
-  double                 _offGG;
+  double                    _offGG;
   std::vector<t_pppSatObs*> _obsRover;
-  std::ostringstream*    _log; 
+  std::ostringstream*       _log; 
   t_pppOptions*             _opt; 
-  t_tides*               _tides;
+  t_tides*                  _tides;
 };
 

trunk/BNC/src/PPP/pppSatObs.h

@@ -16 +16 @@
 class t_pppSatObs {
  public:
-  t_pppSatObs(const t_satObs& pppSatObs);
+  t_pppSatObs(const t_satObs& satObs);
   ~t_pppSatObs();
   bool                isValid() const {return _valid;}

trunk/BNC/src/PPP/pppThread.cpp

@@ -197 +197 @@
     // --------------------------------------------------------------
     if (epoData != 0) {
-      epoData->_pppSatObs.push_back(newObs);
+      epoData->_satObs.push_back(newObs);
       map<string, t_frqObs*> pppObsMap;
       for (unsigned iEntry = 0; iEntry < GNSSENTRY_NUMBER; iEntry++) {
@@ -233 +233 @@
   if (_pppEpochs.size() > 1) {
 
-    const vector<t_satObs*>& pppSatObs = _pppEpochs.front()->_pppSatObs;
+    const vector<t_satObs*>& satObs = _pppEpochs.front()->_satObs;
 
     t_output output;
-    _pppClient->processEpoch(pppSatObs, &output);
+    _pppClient->processEpoch(satObs, &output);
 
     delete _pppEpochs.front(); _pppEpochs.pop_front();

trunk/BNC/src/PPP/pppThread.h

@@ -33 +33 @@
     t_pppEpoData() {}
     ~t_pppEpoData() {
-      for (unsigned ii = 0; ii < _pppSatObs.size(); ii++) {
-        delete _pppSatObs[ii];
+      for (unsigned ii = 0; ii < _satObs.size(); ii++) {
+        delete _satObs[ii];
       }
     }
-    bncTime                   _time;
-    std::vector<t_satObs*> _pppSatObs;
+    bncTime                _time;
+    std::vector<t_satObs*> _satObs;
   };