Changeset 10018 in ntrip
- Timestamp:
- Mar 22, 2023, 10:28:06 PM (18 months ago)
- Location:
- trunk/BNC/src/PPP
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/PPP/pppClient.cpp
r10015 r10018 568 568 if (OPT->_obsModelType == OPT->DCMcodeBias || 569 569 OPT->_obsModelType == OPT->DCMphaseBias) { 570 if (ind == 1 || ind > 7) {570 if (ind == 1 || ind == 6 || ind > 7) { 571 571 reset(); 572 572 } 573 //else {_filter->restoreState(ind);} 573 574 } 574 575 } … … 640 641 do { 641 642 _numEpoProcessing++; 642 #ifdef BNC_DEBUG_PPP643 LOG << "_numEpoProcessing " << _numEpoProcessing << endl;644 #endif645 643 if (_obsPool->refSatChanged()) { 646 644 if(_filter->datumTransformation(_refSatMap) != success) { … … 678 676 } 679 677 678 if (int(_obsRover.size()) < _opt->_minObs) { 679 LOG << "t_pppClient::processEpoch not enough observations" << endl; 680 return finish(failure,5); 681 } 682 680 683 if (_opt->_refSatRequired) { 681 684 if (handleRefSatellites(_obsRover) != success) { … … 683 686 } 684 687 if (_obsPool->refSatChanged()) { 685 LOG << "t_pppFilter: refSatChanged()" << endl; 688 if (_numEpoProcessing >1 && 689 (OPT->_obsModelType == OPT->DCMcodeBias || 690 OPT->_obsModelType == OPT->DCMphaseBias)) { 691 _obsPool->deleteLastEpoch(); 692 } 686 693 epochReProcessing = true; 687 694 continue; 688 695 } 689 }690 691 if (int(_obsRover.size()) < _opt->_minObs) {692 LOG << "t_pppClient::processEpoch not enough observations" << endl;693 return finish(failure,5);694 696 } 695 697 … … 719 721 LOG << "pppClient: _obsPool->refSatChangeRequired() " << endl; 720 722 epochReProcessing = true; 721 _obsPool->deleteLastEpoch();722 723 _filter->restoreState(0); 723 724 setHistoricalRefSats(); 724 725 } 725 726 else { 726 epochReProcessing = false;727 if (OPT->_obsModelType == OPT->DCMcodeBias ||728 OPT->_obsModelType == OPT->DCMphaseBias) {729 _filter->rememberState(0);730 }727 epochReProcessing = false; 728 if (OPT->_obsModelType == OPT->DCMcodeBias || 729 OPT->_obsModelType == OPT->DCMphaseBias) { 730 _filter->rememberState(0); 731 } 731 732 } 732 733 } while (epochReProcessing); -
trunk/BNC/src/PPP/pppFilter.cpp
r10017 r10018 83 83 if (OPT->_obsModelType == OPT->DCMcodeBias || 84 84 OPT->_obsModelType == OPT->DCMphaseBias) { 85 _parlist.printParams(_epoTime);85 // _parlist.printParams(_epoTime); 86 86 } 87 87 #endif … … 100 100 } 101 101 } 102 if (num < OPT->_minObs) {103 setNeuNoiseToZero = true;104 }102 // if (num < OPT->_minObs) { 103 // setNeuNoiseToZero = true; 104 // } 105 105 } 106 106 setStateVectorAndVarCovMatrix(xFltOld, QFltOld, setNeuNoiseToZero); … … 132 132 _xFlt = xFltOld; 133 133 _QFlt = QFltOld; 134 _obsPool->deleteLastEpoch(); 135 restoreState(2); 134 restoreState(1); 136 135 return failure; 137 136 } … … 177 176 _xFlt = xFltOld; 178 177 _QFlt = QFltOld; 179 _obsPool->deleteLastEpoch(); 180 restoreState(3); 178 restoreState(2); 181 179 } 182 180 return failure; … … 277 275 // Check number of observations 278 276 // ---------------------------- 279 if ( iObs == -1) {280 LOG << " number of observations ==" << iObs + 1 << "\n";277 if ((iObs +1) < OPT->_minObs) { 278 LOG << "t_pppFilter::processSystem not enough observations: " << iObs + 1 << "\n"; 281 279 if (preProcessing) { 282 280 _obsPool->setRefSatChangeRequired(sys, true); … … 363 361 if (preProcessing) { 364 362 if (obs->prn() == refPrn) { 365 LOG << epoTimeStr << " Outlier (" 366 << ((preProcessing) ? "pre-processing) " : "fin-processing) ") 367 << t_lc::toString(maxOutlierLC) << ' ' << obs->prn().toString() 368 << ' ' << setw(8) << setprecision(4) << maxOutlier << endl; 369 _obsPool->setRefSatChangeRequired(sys, true); 370 break; 371 } else { 372 obs->setOutlier(); 373 } 374 } else { // fin-processing 375 LOG << epoTimeStr << " Outlier " << t_lc::toString(maxOutlierLC) << ' ' 376 << obs->prn().toString() << ' ' << setw(8) << setprecision(4) 377 << maxOutlier << endl; 378 if (par) { 379 resetAmb(par->prn(), obsVector, maxOutlierLC, &QSav, &xSav); 363 LOG << epoTimeStr << " Outlier (" 364 << ((preProcessing) ? "pre-processing) " : "fin-processing) ") 365 << t_lc::toString(maxOutlierLC) << ' ' << obs->prn().toString() 366 << ' ' << setw(8) << setprecision(4) << maxOutlier << endl; 367 _obsPool->setRefSatChangeRequired(sys, true); 368 break; 380 369 } 381 370 else { 382 371 obs->setOutlier(); 372 } 373 } else { // fin-processing 374 if (obs->prn() != refPrn) { 375 LOG << epoTimeStr << " Outlier " << t_lc::toString(maxOutlierLC) << ' ' 376 << obs->prn().toString() << ' ' << setw(8) << setprecision(4) 377 << maxOutlier << endl; 378 if (par) { 379 resetAmb(par->prn(), obsVector, maxOutlierLC, &QSav, &xSav); 380 } 381 else { 382 obs->setOutlier(); 383 } 383 384 } 384 385 } … … 715 716 } 716 717 #ifdef BNC_DEBUG_PPP 717 _parlist.printParams(_epoTime);718 //_parlist.printParams(_epoTime); 718 719 #endif 719 720 -
trunk/BNC/src/PPP/pppFilter.h
r10015 r10018 31 31 void restoreState(int num) { 32 32 #ifdef BNC_DEBUG_PPP 33 LOG << "Restore parameter from last epoch: _parlist = _parlist_sav ("<< num << ")\n";33 LOG << "Restore parameter from last successful epoch: _parlist = _parlist_sav ("<< num << ")\n"; 34 34 #endif 35 35 _QFlt = _QFlt_sav; … … 38 38 void rememberState(int num) { 39 39 #ifdef BNC_DEBUG_PPP 40 LOG << "Remember parameters from last epoch: _parlist_sav = _parlist ("<< num << ")\n";40 LOG << "Remember parameters from successful epoch : _parlist_sav = _parlist ("<< num << ")\n"; 41 41 #endif 42 42 _QFlt_sav = _QFlt; … … 141 141 Prep = &_AA1; 142 142 } 143 144 143 if (AA.Ncols() != _numPar) { 145 144 LOG << "t_pppFilter::prepareAA: AA.Ncols() != _numPar: " << AA.Ncols() << " != " << _numPar << "\n RETURN FAILURE" << std::endl; -
trunk/BNC/src/PPP/pppObsPool.cpp
r9508 r10018 131 131 132 132 if (!_epochs.empty()) { 133 //LOG << " " << _epochs.back()->epoTime().timestr().c_str() << endl; 133 134 delete _epochs.back(); 134 135 _epochs.pop_back(); -
trunk/BNC/src/PPP/pppParlist.cpp
r10009 r10018 465 465 if (remove) { 466 466 #ifdef BNC_DEBUG_PPP 467 LOG << "remove0 " << par->toString() << std::endl;467 // LOG << "remove0 " << par->toString() << std::endl; 468 468 #endif 469 469 delete par; … … 521 521 (!par->lastObsTime().valid() || (epoTime - par->lastObsTime() > 0.0))) { 522 522 #ifdef BNC_DEBUG_PPP 523 LOG << "remove1 " << par->toString() << std::endl;523 // LOG << "remove1 " << par->toString() << std::endl; 524 524 #endif 525 525 lostSats.append(par->prn()); … … 534 534 par->type() == t_pppParam::pBiasG2) && !usedSystems().contains('G')) { 535 535 #ifdef BNC_DEBUG_PPP 536 LOG << "remove1 " << par->toString() << std::endl;536 //LOG << "remove1 " << par->toString() << std::endl; 537 537 #endif 538 538 delete par; … … 544 544 par->type() == t_pppParam::pBiasR2) && !usedSystems().contains('R')) { 545 545 #ifdef BNC_DEBUG_PPP 546 LOG << "remove1 " << par->toString() << std::endl;546 // LOG << "remove1 " << par->toString() << std::endl; 547 547 #endif 548 548 delete par; … … 554 554 par->type() == t_pppParam::pBiasE2) && !usedSystems().contains('E')) { 555 555 #ifdef BNC_DEBUG_PPP 556 LOG << "remove1 " << par->toString() << std::endl;556 // LOG << "remove1 " << par->toString() << std::endl; 557 557 #endif 558 558 delete par; … … 564 564 par->type() == t_pppParam::pBiasC2) && !usedSystems().contains('C')) { 565 565 #ifdef BNC_DEBUG_PPP 566 LOG << "remove1 " << par->toString() << std::endl;566 // LOG << "remove1 " << par->toString() << std::endl; 567 567 #endif 568 568 delete par; … … 581 581 (lostSats.contains(par->prn()) || (epoTime - par->lastObsTime() > 0.0))) { 582 582 #ifdef BNC_DEBUG_PPP 583 LOG << "remove1 " << par->toString() << std::endl;583 //LOG << "remove1 " << par->toString() << std::endl; 584 584 #endif 585 585 delete par; … … 761 761 else { 762 762 #ifdef BNC_DEBUG_PPP 763 LOG << "push_back parReq " << parReq->toString() << std::endl;763 // LOG << "push_back parReq " << parReq->toString() << std::endl; 764 764 #endif 765 765 _params.push_back(parReq);
Note:
See TracChangeset
for help on using the changeset viewer.