Changeset 9545 in ntrip


Ignore:
Timestamp:
Nov 16, 2021, 1:58:13 PM (15 months ago)
Author:
stuerze
Message:

update regarding PPP

Location:
trunk/BNC/src/PPP
Files:
4 edited

Legend:

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

    r9538 r9545  
    277277    }
    278278    if (iObs + 1 < _opt->_minObs) {
    279       LOG << "t_pppClient::cmpBancroft not enough observations" << endl;
     279      LOG << "t_pppClient::cmpBancroft not enough observations: " << iObs + 1 << endl;
    280280      return failure;
    281281    }
     
    507507//
    508508//////////////////////////////////////////////////////////////////////////////
    509 void t_pppClient::finish(t_irc irc) {
     509void t_pppClient::finish(t_irc irc, int ind) {// LOG << "t_pppClient::finish(" << irc << ") " << ind << endl;
    510510
    511511  clearObs();
     
    535535  _output->_log = _log->str();
    536536  delete _log; _log = new ostringstream();
     537
     538  return;
    537539}
    538540
     
    604606        if(_filter->datumTransformation(_refSatMap) != success) {
    605607          LOG << "t_pppFilter::datumTransformation() != success" << endl;
    606           return finish(failure);
     608          return finish(failure,1);
    607609        }
    608610        else {
     
    614616      // ---------------------------------
    615617      if (prepareObs(satObs, _obsRover, _epoTimeRover) != success) {
    616         return finish(failure);
     618        return finish(failure,2);
    617619      }
    618620
     
    627629        bool print = (iter == 2);
    628630        if (cmpBancroft(_epoTimeRover, _obsRover, xyzc, print) != success) {
    629           return finish(failure);
     631          return finish(failure,3);
    630632        }
    631633        if (cmpModel(_staRover, xyzc, _obsRover) != success) {
    632           return finish(failure);
    633         }
     634          return finish(failure,4);
     635        }
     636      }
     637
     638      if (int(_obsRover.size()) < _opt->_minObs) {
     639        LOG << "t_pppClient::processEpoch not enough observations" << endl;
     640        return finish(failure,5);
    634641      }
    635642
    636643      if (_opt->_refSatRequired) {
    637644        if (handleRefSatellites(_obsRover) != success) {
    638           return finish(failure);
     645          return finish(failure,6);
    639646        }
    640647        if (_obsPool->refSatChanged()) {
     
    653660      _pseudoObsIono = preparePseudoObs(_obsRover);
    654661
    655       if (int(_obsRover.size()) < _opt->_minObs) {
    656         LOG << "t_pppClient::processEpoch not enough observations" << endl;
    657         return finish(failure);
    658       }
    659 
    660662      // Store last epoch of data
    661663      // ------------------------
     
    665667      // -----------------------
    666668      if (_filter->processEpoch() != success) {
    667         return finish(failure);
     669        LOG << "filter->processEpoch() != success" << endl;
     670        return finish(failure,7);
    668671      }
    669672
     
    672675      if (_obsPool->refSatChangeRequired() && //SLIP
    673676          _opt->_obsModelType  != t_pppOptions::UncombPPP) {
     677        LOG << "pppClient: _obsPool->refSatChangeRequired() " << endl;
    674678        epochReProcessing = true;
    675679        _obsPool->deleteLastEpoch();
     
    689693  catch (Exception& exc) {
    690694    LOG << exc.what() << endl;
    691     return finish(failure);
     695    return finish(failure,8);
    692696  }
    693697  catch (t_except msg) {
    694698    LOG << msg.what() << endl;
    695     return finish(failure);
     699    return finish(failure,9);
    696700  }
    697701  catch (const char* msg) {
    698702    LOG << msg << endl;
    699     return finish(failure);
     703    return finish(failure,10);
    700704  }
    701705  catch (...) {
    702706    LOG << "unknown exception" << endl;
    703     return finish(failure);
    704   }
    705 
    706   return finish(success);
     707    return finish(failure,11);
     708  }
     709  return finish(success,12);
    707710}
    708711
  • trunk/BNC/src/PPP/pppClient.h

    r9508 r9545  
    5252 private:
    5353  void initOutput(t_output* output);
    54   void finish(t_irc irc);
     54  void finish(t_irc irc, int ind);
    5555  void clearObs();
    5656  t_irc prepareObs(const std::vector<t_satObs*>& satObs,
  • trunk/BNC/src/PPP/pppFilter.cpp

    r9538 r9545  
    693693
    694694  if (OPT->_obsModelType == OPT->UncombPPP) {
     695    _obsPool->putEpoch(_epoTime, allObs, peseudoObsIono, refSatMap);
    695696    return success;
    696697  }
  • trunk/BNC/src/PPP/pppParlist.cpp

    r9535 r9545  
    448448
    449449    else if (par->type() == t_pppParam::amb) {
     450      if (par->lastObsTime().valid() && (epoTime - par->lastObsTime() > 60.0)) {
     451          remove = true;
     452      }
    450453      if (OPT->_obsModelType == OPT->DCMcodeBias ||
    451454          OPT->_obsModelType == OPT->DCMphaseBias) {
     
    453456        t_prn refPrn = (refSatMap[sys])->prn();
    454457        if (par->lastObsTime().valid() && par->prn() == refPrn) {
    455             remove = true;
    456         }
    457       }
    458       else {
    459         if (par->lastObsTime().valid() && (epoTime - par->lastObsTime() > 60.0)) {
    460458            remove = true;
    461459        }
     
    875873        << endl;
    876874  }
     875  return;
    877876}
    878877
Note: See TracChangeset for help on using the changeset viewer.