Changeset 5734 in ntrip

Timestamp:

Jul 31, 2014, 4:49:34 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (22 diffs)
• pppClient.h (modified) (3 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -6 +6 @@
 #include <stdexcept>
 
-#include "pppMain.h"
+#include "pppClient.h"
 #include "ephpool.h"
 #include "obspool.h"
@@ -22 +22 @@
 // Global Variable
 //////////////////////////////////////////////////////////////////////////////
-t_pppMain* pppMain = 0;
+t_pppClient* pppClient = 0;
 
 // Constructor
 //////////////////////////////////////////////////////////////////////////////
-t_pppMain::t_pppMain() {
+t_pppClient::t_pppClient() {
   _opt      = 0;
   _output   = 0;
@@ -40 +40 @@
 // Destructor
 //////////////////////////////////////////////////////////////////////////////
-t_pppMain::~t_pppMain() {
+t_pppClient::~t_pppClient() {
   delete _log;
   delete _opt;
@@ -54 +54 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppMain::setOptions(const t_pppOpt* opt) {
+void t_pppClient::setOptions(const t_pppOpt* opt) {
   delete _opt;
   _opt = new t_options(opt);
@@ -68 +68 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppMain::putGPSEphemeris(const t_ephGPS* eph) {
+void t_pppClient::putGPSEphemeris(const t_ephGPS* eph) {
   _ephPool->putEphemeris(new t_ephGPS(*eph));
 }
@@ -74 +74 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppMain::putGloEphemeris(const t_ephGlo* eph) {
+void t_pppClient::putGloEphemeris(const t_ephGlo* eph) {
   _ephPool->putEphemeris(new t_ephGlo(*eph));
 }
@@ -80 +80 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppMain::putOrbCorrections(int numCorr, const t_pppOrbCorr* corr) {
+void t_pppClient::putOrbCorrections(int numCorr, const t_pppOrbCorr* corr) {
   for (int ii = 0; ii < numCorr; ii++) {
     _ephPool->putOrbCorrection(new t_orbCorr(corr[ii]));
@@ -88 +88 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppMain::putClkCorrections(int numCorr, const t_pppClkCorr* corr) {
+void t_pppClient::putClkCorrections(int numCorr, const t_pppClkCorr* corr) {
   for (int ii = 0; ii < numCorr; ii++) {
     _ephPool->putClkCorrection(new t_clkCorr(corr[ii]));
@@ -96 +96 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppMain::putBiases(int numBiases, const t_pppSatBiases* biases) {
+void t_pppClient::putBiases(int numBiases, const t_pppSatBiases* biases) {
   for (int ii = 0; ii < numBiases; ii++) {
     _obsPool->putBiases(new t_satBias(biases[ii]));
@@ -104 +104 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-t_irc::irc t_pppMain::prepareObs(int numSat, const t_pppSatObs* satObs,
+t_irc::irc t_pppClient::prepareObs(int numSat, const t_pppSatObs* satObs,
                                  vector<t_satObs*>& obsVector, t_time& epoTime) {
   // Default 
@@ -141 +141 @@
       double dt = satObs->time() - epoTime;
       if (fabs(dt) > MAXSYNC) {
-        LOG << "t_pppMain::prepareObs asynchronous observations" << endl;
+        LOG << "t_pppClient::prepareObs asynchronous observations" << endl;
         return t_irc::failure;
       }
@@ -154 +154 @@
 // Compute the Bancroft position, check for blunders
 //////////////////////////////////////////////////////////////////////////////
-t_irc::irc t_pppMain::cmpBancroft(const t_time& epoTime, 
+t_irc::irc t_pppClient::cmpBancroft(const t_time& epoTime, 
                                   vector<t_satObs*>& obsVector,
                                   ColumnVector& xyzc, bool print) {
@@ -175 +175 @@
     }
     if (iObs + 1 < OPT->minobs()) {
-      LOG << "t_pppMain::cmpBancroft not enough observations" << endl;
+      LOG << "t_pppClient::cmpBancroft not enough observations" << endl;
       return t_irc::failure;
     }
@@ -214 +214 @@
     else {
       t_satObs* satObs = obsVector.at(maxResIndex);
-      LOG << "t_pppMain::cmpBancroft outlier " << satObs->prn().toString()
+      LOG << "t_pppClient::cmpBancroft outlier " << satObs->prn().toString()
           << " " << maxRes << endl;
       delete satObs;
@@ -226 +226 @@
 // Compute A Priori GPS-Glonass Offset
 //////////////////////////////////////////////////////////////////////////////
-double t_pppMain::cmpOffGG(vector<t_satObs*>& obsVector) {
+double t_pppClient::cmpOffGG(vector<t_satObs*>& obsVector) {
 
   t_lc::type tLC   = (OPT->dualFreqRequired() ? t_lc::cIF : t_lc::c1);
@@ -245 +245 @@
             satObs->setOutlier();
             outlierFound = true;
-           LOG << "t_pppMain::cmpOffGG outlier " << satObs->prn().toString()
+           LOG << "t_pppClient::cmpOffGG outlier " << satObs->prn().toString()
                << " " << ll << endl;
           }
@@ -268 +268 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppMain::initOutput(t_pppOutput* output) {
+void t_pppClient::initOutput(t_pppOutput* output) {
   _output = output;
   _output->_epoTime._mjd = 0;
@@ -281 +281 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppMain::clearObs() {
+void t_pppClient::clearObs() {
   for (unsigned ii = 0; ii < _obsRover.size(); ii++) {
     delete _obsRover.at(ii);
@@ -294 +294 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppMain::finish(t_irc::irc irc) {
+void t_pppClient::finish(t_irc::irc irc) {
 
   clearObs();
@@ -322 +322 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-t_irc::irc t_pppMain::cmpModel(t_station* station, const ColumnVector& xyzc,
+t_irc::irc t_pppClient::cmpModel(t_station* station, const ColumnVector& xyzc,
                                vector<t_satObs*>& obsVector) {
 
@@ -378 +378 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-t_irc::irc t_pppMain::createDifferences() {
+t_irc::irc t_pppClient::createDifferences() {
 
   vector<t_satObs*>::iterator it = _obsRover.begin();
@@ -405 +405 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppMain::processEpoch(int numSatRover, const t_pppSatObs* satObsRover,
+void t_pppClient::processEpoch(int numSatRover, const t_pppSatObs* satObsRover,
                              t_pppOutput* output) {
 

trunk/BNC/src/PPP/pppClient.h

@@ -1 @@
-#ifndef PPPMAIN_H
-#define PPPMAIN_H
+#ifndef PPPCLIENT_H
+#define PPPCLIENT_H
 
 #include <sstream>
@@ -15 +15 @@
 class t_filter;
 
-class t_pppMain {
+class t_pppClient {
  public:
-  t_pppMain();                                                      
-  ~t_pppMain();                                                     
+  t_pppClient();                                                      
+  ~t_pppClient();                                                     
   void setOptions(const t_pppOpt* opt);                          
   void putGPSEphemeris(const t_ephGPS* eph);                  
@@ -68 +68 @@
 
 /// Pointer to the main object
-extern BNC::t_pppMain* pppMain;
+extern BNC::t_pppClient* pppClient;
 
 /// Log stream abbreviation
-#define LOG (*pppMain->_log)
+#define LOG (*pppClient->_log)
 
 /// Options abbreviation
-#define OPT (pppMain->_opt)
+#define OPT (pppClient->_opt)
 
 #endif