Changeset 9524 in ntrip


Ignore:
Timestamp:
Oct 22, 2021, 1:56:36 PM (16 months ago)
Author:
stuerze
Message:

minor changes

File:
1 edited

Legend:

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

    r9521 r9524  
    8686  }
    8787  const vector<t_pppParam*>& params = _parlist.params();
     88  unsigned nPar = _parlist.nPar();
    8889#ifdef BNC_DEBUG_PPP
    89   for (unsigned iPar = 0; iPar < params.size(); iPar++) {
     90  for (unsigned iPar = 0; iPar < nPar; iPar++) {
    9091    LOG << "t_pppFilter::processEpoch par_cur " << params[iPar]->toString()
    9192        << "  lastObsTime().valid() " << params[iPar]->lastObsTime().valid()
     
    99100  SymmetricMatrix QFltOld = _QFlt;
    100101
    101   _QFlt.ReSize(_parlist.nPar()); _QFlt = 0.0;
    102   _xFlt.ReSize(_parlist.nPar()); _xFlt = 0.0;
    103   _x0.ReSize(_parlist.nPar());   _x0   = 0.0;
    104 
    105   for (unsigned ii = 0; ii < params.size(); ii++) {
     102  _QFlt.ReSize(nPar); _QFlt = 0.0;
     103  _xFlt.ReSize(nPar); _xFlt = 0.0;
     104  _x0.ReSize(nPar);   _x0   = 0.0;
     105
     106  for (unsigned ii = 0; ii < nPar; ii++) {
    106107    t_pppParam* par1 = params[ii];
    107108    if (QFltOld.size() == 0) {
     
    227228  string                     epoTimeStr = string(_epoTime);
    228229  const vector<t_pppParam*>& params     = _parlist.params();
     230  unsigned nPar = _parlist.nPar();
    229231
    230232  unsigned usedLCs     = LCs.size();
     
    256258    // First-Design Matrix, Terms Observed-Computed, Weight Matrix
    257259    // -----------------------------------------------------------
    258     Matrix                AA(maxObs, _parlist.nPar());
     260    Matrix                AA(maxObs, nPar);
    259261    ColumnVector          ll(maxObs);
    260262    DiagonalMatrix        PP(maxObs); PP = 0.0;
     
    279281          usedObs.push_back(obs);
    280282          usedTypes.push_back(tLC);
    281           for (unsigned iPar = 0; iPar < params.size(); iPar++) {
     283          for (unsigned iPar = 0; iPar < nPar; iPar++) {
    282284            const t_pppParam* par = params[iPar];
    283285            AA[iObs][iPar] = par->partial(_epoTime, obs, tLC, refPrn);
     
    303305          usedObs.push_back(obs);
    304306          usedTypes.push_back(tLC);
    305           for (unsigned iPar = 0; iPar < params.size(); iPar++) {
     307          for (unsigned iPar = 0; iPar < nPar; iPar++) {
    306308            const t_pppParam* par = params[iPar];
    307309            AA[iObs][iPar] = par->partial(_epoTime, obs, tLC, refPrn);
     
    334336            usedObs.push_back(obs);
    335337            usedTypes.push_back(tLC);
    336             for (unsigned iPar = 0; iPar < params.size(); iPar++) {
     338            for (unsigned iPar = 0; iPar < nPar; iPar++) {
    337339              const t_pppParam* par = params[iPar];
    338340              AA[iObs][iPar] = par->partial(_epoTime, obs, tLC, refPrn);
     
    385387          << obs->prn().toString()                        << ' '
    386388          << setw(8) << setprecision(4) << maxOutlier << endl;
    387       for (unsigned iPar = 0; iPar < params.size(); iPar++) {
     389      for (unsigned iPar = 0; iPar < nPar; iPar++) {
    388390        t_pppParam* hlp = params[iPar];
    389391        if (hlp->type() == t_pppParam::amb &&
     
    461463  string epoTimeStr = string(_epoTime);
    462464  const vector<t_pppParam*>& params  = _parlist.params();
     465  unsigned nPar = _parlist.nPar();
    463466
    464467  for (unsigned ii = 0; ii < LCs.size(); ii++) {
     
    512515        else {
    513516          if (refPrn != t_prn()) {return success;}
    514           ColumnVector AA(params.size());
    515           for (unsigned iPar = 0; iPar < params.size(); iPar++) {
     517          ColumnVector AA(nPar);
     518          for (unsigned iPar = 0; iPar < nPar; iPar++) {
    516519            const t_pppParam* par = params[iPar];
    517520            AA[iPar] = par->partial(_epoTime, obs, tLC, refPrn);
     
    713716    return failure;
    714717  }
    715   vector<t_pppParam*>& _params = _parlist.params();
     718  const vector<t_pppParam*>& params = _parlist.params();
    716719  unsigned nPar = _parlist.nPar();
    717720#ifdef BNC_DEBUG_PPP
    718   LOG << " t_pppFilter::datumTransformation par last epoch: " << _params.size() << "/" << nPar <<  endl;
     721  LOG << " t_pppFilter::datumTransformation par last epoch: " << nPar << "/" << nPar <<  endl;
    719722  for (unsigned iPar = 0; iPar < nPar; iPar++) {
    720     LOG << "t_pppFilter::processEpoch par_cur " << _params[iPar]->toString()
    721         << "  lastObsTime().valid() " << _params[iPar]->lastObsTime().valid()
    722         << "  epoTime-params[iPar]->lastObsTime() " << (_epoTime - _params[iPar]->lastObsTime()) << endl;
     723    LOG << "t_pppFilter::processEpoch par_cur " << params[iPar]->toString()
     724        << "  lastObsTime().valid() " << params[iPar]->lastObsTime().valid()
     725        << "  epoTime-params[iPar]->lastObsTime() " << (_epoTime - params[iPar]->lastObsTime()) << endl;
    723726  }
    724727#endif
     
    755758    }
    756759    Matrix  AA(maxObs, nPar);
     760
    757761    // Real Observations
    758762    // -----------------
     
    765769        if (tLC == t_lc::Tz0) {continue;}
    766770        ++iObs;
    767         for (unsigned iPar = 0; iPar < _params.size(); iPar++) {
    768           const t_pppParam* par = _params[iPar];
     771        for (unsigned iPar = 0; iPar < nPar; iPar++) {
     772          const t_pppParam* par = params[iPar];
    769773          AA[iObs][iPar] = par->partial(_epoTime, obs, tLC, refPrn);
    770774        }
     
    783787          ++iObs;
    784788          pseudoObsTropoConsidered = true;
    785           for (unsigned iPar = 0; iPar < _params.size(); iPar++) {
    786             const t_pppParam* par = _params[iPar];
     789          for (unsigned iPar = 0; iPar < nPar; iPar++) {
     790            const t_pppParam* par = params[iPar];
    787791            AA[iObs][iPar] = par->partial(_epoTime, obs, tLC, refPrn);
    788792          }
Note: See TracChangeset for help on using the changeset viewer.