Changeset 5819 in ntrip for trunk/BNC/src/PPP/pppClient.cpp

Timestamp:

Aug 6, 2014, 1:02:08 PM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/PPP/pppClient.cpp (modified) (13 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -78 +78 @@
   _log      = new ostringstream();
   _ephPool  = new t_pppEphPool();
-  _obsPool  = new t_pppObsPool();
+  _obsPool  = new t_frqObsPool();
   _staRover = new t_pppStation();
   _filter   = new t_pppFilter();
@@ -150 +150 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-t_irc t_pppClient::prepareObs(const vector<t_pppSatObs*>& pppSatObs,
-                              vector<t_satObs*>& obsVector, bncTime& epoTime) {
+t_irc t_pppClient::prepareObs(const vector<t_satObs*>& pppSatObs,
+                              vector<t_pppSatObs*>& obsVector, bncTime& epoTime) {
   // Default 
   // -------
@@ -162 +162 @@
     char system = pppSatObs[ii]->_prn.system();
     if (system == 'G' || (system == 'R' && OPT->useGlonass())) {
-      t_satObs* satObs = new t_satObs(*pppSatObs[ii]);
+      t_pppSatObs* satObs = new t_pppSatObs(*pppSatObs[ii]);
       if (satObs->isValid()) {
         obsVector.push_back(satObs);
@@ -180 +180 @@
   double meanDt = 0.0;
   for (unsigned ii = 0; ii < obsVector.size(); ii++) {
-    const t_satObs* satObs = obsVector.at(ii);
+    const t_pppSatObs* satObs = obsVector.at(ii);
     if (epoTime.undef()) {
       epoTime = satObs->time();
@@ -204 +204 @@
 //////////////////////////////////////////////////////////////////////////////
 t_irc t_pppClient::cmpBancroft(const bncTime& epoTime, 
-                                  vector<t_satObs*>& obsVector,
+                                  vector<t_pppSatObs*>& obsVector,
                                   ColumnVector& xyzc, bool print) {
 
@@ -213 +213 @@
     int iObs = -1;
     for (unsigned ii = 0; ii < obsVector.size(); ii++) {
-      const t_satObs* satObs = obsVector.at(ii);
+      const t_pppSatObs* satObs = obsVector.at(ii);
       if ( satObs->isValid() && satObs->prn().system() == 'G' &&
            (!satObs->modelSet() || satObs->eleSat() >= OPT->_minEle) ) {
@@ -238 +238 @@
     unsigned maxResIndex = 0;
     for (unsigned ii = 0; ii < obsVector.size(); ii++) {
-      const t_satObs* satObs = obsVector.at(ii);
+      const t_pppSatObs* satObs = obsVector.at(ii);
       if ( satObs->isValid() && satObs->prn().system() == 'G' &&
            (!satObs->modelSet() || satObs->eleSat() >= OPT->_minEle) ) {
@@ -262 +262 @@
     }
     else {
-      t_satObs* satObs = obsVector.at(maxResIndex);
+      t_pppSatObs* satObs = obsVector.at(maxResIndex);
       LOG << "t_pppClient::cmpBancroft outlier " << satObs->prn().toString()
           << " " << maxRes << endl;
@@ -275 +275 @@
 // Compute A Priori GPS-Glonass Offset
 //////////////////////////////////////////////////////////////////////////////
-double t_pppClient::cmpOffGG(vector<t_satObs*>& obsVector) {
+double t_pppClient::cmpOffGG(vector<t_pppSatObs*>& obsVector) {
 
   t_lc::type tLC   = (OPT->dualFreqRequired() ? t_lc::cIF : t_lc::c1);
@@ -286 +286 @@
       unsigned nObs  = 0;
       for (unsigned ii = 0; ii < obsVector.size(); ii++) {
-        t_satObs* satObs = obsVector.at(ii);
+        t_pppSatObs* satObs = obsVector.at(ii);
         if ( !satObs->outlier() && satObs->isValid() && satObs->prn().system() == 'R' &&
              (!satObs->modelSet() || satObs->eleSat() >= OPT->_minEle) ) {
@@ -360 +360 @@
 //////////////////////////////////////////////////////////////////////////////
 t_irc t_pppClient::cmpModel(t_pppStation* station, const ColumnVector& xyzc,
-                               vector<t_satObs*>& obsVector) {
+                               vector<t_pppSatObs*>& obsVector) {
 
   bncTime time;
@@ -384 +384 @@
   // Observation model
   // -----------------
-  vector<t_satObs*>::iterator it = obsVector.begin();
+  vector<t_pppSatObs*>::iterator it = obsVector.begin();
   while (it != obsVector.end()) {
-    t_satObs* satObs = *it;
+    t_pppSatObs* satObs = *it;
     satObs->cmpModel(station);
     if (satObs->isValid() && satObs->eleSat() >= OPT->_minEle) {
@@ -402 +402 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppClient::processEpoch(const vector<t_pppSatObs*>& pppSatObs, t_output* output) {
+void t_pppClient::processEpoch(const vector<t_satObs*>& pppSatObs, t_output* output) {
 
   try {