Index: /trunk/BNC/src/PPP_free/pppClient.cpp =================================================================== --- /trunk/BNC/src/PPP_free/pppClient.cpp (revision 6092) +++ /trunk/BNC/src/PPP_free/pppClient.cpp (revision 6093) @@ -44,8 +44,8 @@ #include "pppClient.h" +#include "pppFilter.h" #include "pppOptions.h" #include "bncutils.h" #include "bncconst.h" -#include "bncmodel.h" using namespace BNC_PPP; @@ -66,9 +66,9 @@ t_pppClient::t_pppClient(const t_pppOptions* opt) : bncEphUser(false) { - _opt = new t_pppOptions(*opt); - _model = new bncModel(this); - _epoData = new t_epoData(); - _log = new ostringstream(); - _staID = QByteArray(_opt->_roverName.c_str()); + _opt = new t_pppOptions(*opt); + _filter = new t_pppFilter(this); + _epoData = new t_epoData(); + _log = new ostringstream(); + _staID = QByteArray(_opt->_roverName.c_str()); CLIENTS.setLocalData(this); // CLIENTS takes ownership over "this" @@ -78,5 +78,5 @@ //////////////////////////////////////////////////////////////////////////// t_pppClient::~t_pppClient() { - delete _model; + delete _filter; delete _epoData; delete _opt; @@ -147,10 +147,10 @@ // Filter Solution // --------------- - if (_model->update(_epoData) == success) { + if (_filter->update(_epoData) == success) { output->_error = false; - output->_epoTime = _model->time(); - output->_xyzRover[0] = _model->x(); - output->_xyzRover[1] = _model->y(); - output->_xyzRover[2] = _model->z(); + output->_epoTime = _filter->time(); + output->_xyzRover[0] = _filter->x(); + output->_xyzRover[1] = _filter->y(); + output->_xyzRover[2] = _filter->z(); output->_numSat = 0; output->_pDop = 0.0; Index: /trunk/BNC/src/PPP_free/pppClient.h =================================================================== --- /trunk/BNC/src/PPP_free/pppClient.h (revision 6092) +++ /trunk/BNC/src/PPP_free/pppClient.h (revision 6093) @@ -23,6 +23,6 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#ifndef BNCPPPCLIENT_H -#define BNCPPPCLIENT_H +#ifndef PPPCLIENT_H +#define PPPCLIENT_H #include @@ -31,5 +31,5 @@ namespace BNC_PPP { -class bncModel; +class t_pppFilter; class t_pppOptions; class t_satObs; @@ -63,5 +63,5 @@ QByteArray _staID; t_epoData* _epoData; - bncModel* _model; + t_pppFilter* _filter; std::ostringstream* _log; }; Index: /trunk/BNC/src/PPP_free/pppFilter.cpp =================================================================== --- /trunk/BNC/src/PPP_free/pppFilter.cpp (revision 6092) +++ /trunk/BNC/src/PPP_free/pppFilter.cpp (revision 6093) @@ -27,5 +27,5 @@ * ------------------------------------------------------------------------- * - * Class: bncParam, bncModel + * Class: t_pppParam, t_pppFilter * * Purpose: Model for PPP @@ -44,5 +44,5 @@ #include -#include "bncmodel.h" +#include "pppFilter.h" #include "pppClient.h" #include "bncutils.h" @@ -63,5 +63,5 @@ // Constructor //////////////////////////////////////////////////////////////////////////// -bncParam::bncParam(bncParam::parType typeIn, int indexIn, +t_pppParam::t_pppParam(t_pppParam::parType typeIn, int indexIn, const QString& prnIn) { type = typeIn; @@ -75,12 +75,12 @@ // Destructor //////////////////////////////////////////////////////////////////////////// -bncParam::~bncParam() { +t_pppParam::~t_pppParam() { } // Partial //////////////////////////////////////////////////////////////////////////// -double bncParam::partial(t_satData* satData, bool phase) { - - Tracer tracer("bncParam::partial"); +double t_pppParam::partial(t_satData* satData, bool phase) { + + Tracer tracer("t_pppParam::partial"); // Coordinates @@ -148,5 +148,5 @@ // Constructor //////////////////////////////////////////////////////////////////////////// -bncModel::bncModel(t_pppClient* pppClient) { +t_pppFilter::t_pppFilter(t_pppClient* pppClient) { _pppClient = pppClient; @@ -175,5 +175,5 @@ // Destructor //////////////////////////////////////////////////////////////////////////// -bncModel::~bncModel() { +t_pppFilter::~t_pppFilter() { delete _tides; for (int ii = 0; ii < _posAverage.size(); ++ii) { @@ -192,12 +192,12 @@ // Reset Parameters and Variance-Covariance Matrix //////////////////////////////////////////////////////////////////////////// -void bncModel::reset() { - - Tracer tracer("bncModel::reset"); +void t_pppFilter::reset() { + + Tracer tracer("t_pppFilter::reset"); double lastTrp = 0.0; for (int ii = 0; ii < _params.size(); ii++) { - bncParam* pp = _params[ii]; - if (pp->type == bncParam::TROPO) { + t_pppParam* pp = _params[ii]; + if (pp->type == t_pppParam::TROPO) { lastTrp = pp->xx; } @@ -207,16 +207,16 @@ int nextPar = 0; - _params.push_back(new bncParam(bncParam::CRD_X, ++nextPar, "")); - _params.push_back(new bncParam(bncParam::CRD_Y, ++nextPar, "")); - _params.push_back(new bncParam(bncParam::CRD_Z, ++nextPar, "")); - _params.push_back(new bncParam(bncParam::RECCLK, ++nextPar, "")); + _params.push_back(new t_pppParam(t_pppParam::CRD_X, ++nextPar, "")); + _params.push_back(new t_pppParam(t_pppParam::CRD_Y, ++nextPar, "")); + _params.push_back(new t_pppParam(t_pppParam::CRD_Z, ++nextPar, "")); + _params.push_back(new t_pppParam(t_pppParam::RECCLK, ++nextPar, "")); if (_opt->estTrp()) { - _params.push_back(new bncParam(bncParam::TROPO, ++nextPar, "")); + _params.push_back(new t_pppParam(t_pppParam::TROPO, ++nextPar, "")); } if (_opt->useSystem('R')) { - _params.push_back(new bncParam(bncParam::GLONASS_OFFSET, ++nextPar, "")); + _params.push_back(new t_pppParam(t_pppParam::GLONASS_OFFSET, ++nextPar, "")); } if (_opt->useSystem('E')) { - _params.push_back(new bncParam(bncParam::GALILEO_OFFSET, ++nextPar, "")); + _params.push_back(new t_pppParam(t_pppParam::GALILEO_OFFSET, ++nextPar, "")); } @@ -224,20 +224,20 @@ _QQ = 0.0; for (int iPar = 1; iPar <= _params.size(); iPar++) { - bncParam* pp = _params[iPar-1]; + t_pppParam* pp = _params[iPar-1]; pp->xx = 0.0; if (pp->isCrd()) { _QQ(iPar,iPar) = _opt->_aprSigCrd(1) * _opt->_aprSigCrd(1); } - else if (pp->type == bncParam::RECCLK) { + else if (pp->type == t_pppParam::RECCLK) { _QQ(iPar,iPar) = _opt->_noiseClk * _opt->_noiseClk; } - else if (pp->type == bncParam::TROPO) { + else if (pp->type == t_pppParam::TROPO) { _QQ(iPar,iPar) = _opt->_aprSigTrp * _opt->_aprSigTrp; pp->xx = lastTrp; } - else if (pp->type == bncParam::GLONASS_OFFSET) { + else if (pp->type == t_pppParam::GLONASS_OFFSET) { _QQ(iPar,iPar) = 1000.0 * 1000.0; } - else if (pp->type == bncParam::GALILEO_OFFSET) { + else if (pp->type == t_pppParam::GALILEO_OFFSET) { _QQ(iPar,iPar) = 1000.0 * 1000.0; } @@ -247,10 +247,10 @@ // Bancroft Solution //////////////////////////////////////////////////////////////////////////// -t_irc bncModel::cmpBancroft(t_epoData* epoData) { - - Tracer tracer("bncModel::cmpBancroft"); +t_irc t_pppFilter::cmpBancroft(t_epoData* epoData) { + + Tracer tracer("t_pppFilter::cmpBancroft"); if (epoData->sizeSys('G') < MINOBS) { - _log += "bncModel::cmpBancroft: not enough data\n"; + _log += "t_pppFilter::cmpBancroft: not enough data\n"; return failure; } @@ -297,7 +297,7 @@ // Computed Value //////////////////////////////////////////////////////////////////////////// -double bncModel::cmpValue(t_satData* satData, bool phase) { - - Tracer tracer("bncModel::cmpValue"); +double t_pppFilter::cmpValue(t_satData* satData, bool phase) { + + Tracer tracer("t_pppFilter::cmpValue"); ColumnVector xRec(3); @@ -357,7 +357,7 @@ // Tropospheric Model (Saastamoinen) //////////////////////////////////////////////////////////////////////////// -double bncModel::delay_saast(double Ele) { - - Tracer tracer("bncModel::delay_saast"); +double t_pppFilter::delay_saast(double Ele) { + + Tracer tracer("t_pppFilter::delay_saast"); double xyz[3]; @@ -398,7 +398,7 @@ // Prediction Step of the Filter //////////////////////////////////////////////////////////////////////////// -void bncModel::predict(int iPhase, t_epoData* epoData) { - - Tracer tracer("bncModel::predict"); +void t_pppFilter::predict(int iPhase, t_epoData* epoData) { + + Tracer tracer("t_pppFilter::predict"); if (iPhase == 0) { @@ -423,9 +423,9 @@ // ----------------------------------------- for (int iPar = 1; iPar <= _params.size(); iPar++) { - bncParam* pp = _params[iPar-1]; + t_pppParam* pp = _params[iPar-1]; // Coordinates // ----------- - if (pp->type == bncParam::CRD_X) { + if (pp->type == t_pppParam::CRD_X) { if (firstCrd) { if (_opt->xyzAprRoverSet()) { @@ -438,5 +438,5 @@ _QQ(iPar,iPar) += sigCrdP_used * sigCrdP_used; } - else if (pp->type == bncParam::CRD_Y) { + else if (pp->type == t_pppParam::CRD_Y) { if (firstCrd) { if (_opt->xyzAprRoverSet()) { @@ -449,5 +449,5 @@ _QQ(iPar,iPar) += sigCrdP_used * sigCrdP_used; } - else if (pp->type == bncParam::CRD_Z) { + else if (pp->type == t_pppParam::CRD_Z) { if (firstCrd) { if (_opt->xyzAprRoverSet()) { @@ -463,5 +463,5 @@ // Receiver Clocks // --------------- - else if (pp->type == bncParam::RECCLK) { + else if (pp->type == t_pppParam::RECCLK) { pp->xx = _xcBanc(4); for (int jj = 1; jj <= _params.size(); jj++) { @@ -473,5 +473,5 @@ // Tropospheric Delay // ------------------ - else if (pp->type == bncParam::TROPO) { + else if (pp->type == t_pppParam::TROPO) { _QQ(iPar,iPar) += _opt->_noiseTrp * _opt->_noiseTrp; } @@ -479,5 +479,5 @@ // Glonass Offset // -------------- - else if (pp->type == bncParam::GLONASS_OFFSET) { + else if (pp->type == t_pppParam::GLONASS_OFFSET) { pp->xx = 0.0; for (int jj = 1; jj <= _params.size(); jj++) { @@ -489,5 +489,5 @@ // Galileo Offset // -------------- - else if (pp->type == bncParam::GALILEO_OFFSET) { + else if (pp->type == t_pppParam::GALILEO_OFFSET) { _QQ(iPar,iPar) += 0.1 * 0.1; } @@ -511,9 +511,9 @@ // ------------------------------------------------ int iPar = 0; - QMutableVectorIterator im(_params); + QMutableVectorIterator im(_params); while (im.hasNext()) { - bncParam* par = im.next(); + t_pppParam* par = im.next(); bool removed = false; - if (par->type == bncParam::AMB_L3) { + if (par->type == t_pppParam::AMB_L3) { if (epoData->satData.find(par->prn) == epoData->satData.end()) { removed = true; @@ -540,9 +540,9 @@ _QQ.ReSize(nPar); _QQ = 0.0; for (int i1 = 1; i1 <= nPar; i1++) { - bncParam* p1 = _params[i1-1]; + t_pppParam* p1 = _params[i1-1]; if (p1->index_old != 0) { _QQ(p1->index, p1->index) = QQ_old(p1->index_old, p1->index_old); for (int i2 = 1; i2 <= nPar; i2++) { - bncParam* p2 = _params[i2-1]; + t_pppParam* p2 = _params[i2-1]; if (p2->index_old != 0) { _QQ(p1->index, p2->index) = QQ_old(p1->index_old, p2->index_old); @@ -553,5 +553,5 @@ for (int ii = 1; ii <= nPar; ii++) { - bncParam* par = _params[ii-1]; + t_pppParam* par = _params[ii-1]; if (par->index_old == 0) { _QQ(par->index, par->index) = _opt->_aprSigAmb * _opt->_aprSigAmb; @@ -564,7 +564,7 @@ // Update Step of the Filter (currently just a single-epoch solution) //////////////////////////////////////////////////////////////////////////// -t_irc bncModel::update(t_epoData* epoData) { - - Tracer tracer("bncModel::update"); +t_irc t_pppFilter::update(t_epoData* epoData) { + + Tracer tracer("t_pppFilter::update"); _log.clear(); @@ -599,14 +599,14 @@ ostringstream strB; strB.setf(ios::fixed); - QVectorIterator itPar(_params); + QVectorIterator itPar(_params); while (itPar.hasNext()) { - bncParam* par = itPar.next(); - - if (par->type == bncParam::RECCLK) { + t_pppParam* par = itPar.next(); + + if (par->type == t_pppParam::RECCLK) { strB << "\n clk = " << setw(10) << setprecision(3) << par->xx << " +- " << setw(6) << setprecision(3) << sqrt(_QQ(par->index,par->index)); } - else if (par->type == bncParam::AMB_L3) { + else if (par->type == t_pppParam::AMB_L3) { ++par->numEpo; strB << "\n amb " << par->prn.toAscii().data() << " = " @@ -616,5 +616,5 @@ << " nEpo = " << par->numEpo; } - else if (par->type == bncParam::TROPO) { + else if (par->type == t_pppParam::TROPO) { double aprTrp = delay_saast(M_PI/2.0); strB << "\n trp = " << par->prn.toAscii().data() @@ -625,10 +625,10 @@ newPos->xnt[6] = aprTrp + par->xx; } - else if (par->type == bncParam::GLONASS_OFFSET) { + else if (par->type == t_pppParam::GLONASS_OFFSET) { strB << "\n offGlo = " << setw(10) << setprecision(3) << par->xx << " +- " << setw(6) << setprecision(3) << sqrt(_QQ(par->index,par->index)); } - else if (par->type == bncParam::GALILEO_OFFSET) { + else if (par->type == t_pppParam::GALILEO_OFFSET) { strB << "\n offGal = " << setw(10) << setprecision(3) << par->xx << " +- " << setw(6) << setprecision(3) @@ -681,8 +681,8 @@ // Outlier Detection //////////////////////////////////////////////////////////////////////////// -QString bncModel::outlierDetection(int iPhase, const ColumnVector& vv, +QString t_pppFilter::outlierDetection(int iPhase, const ColumnVector& vv, QMap& satData) { - Tracer tracer("bncModel::outlierDetection"); + Tracer tracer("t_pppFilter::outlierDetection"); QString prnGPS; @@ -715,9 +715,9 @@ // ////////////////////////////////////////////////////////////////////////////// -void bncModel::kalman(const Matrix& AA, const ColumnVector& ll, +void t_pppFilter::kalman(const Matrix& AA, const ColumnVector& ll, const DiagonalMatrix& PP, SymmetricMatrix& QQ, ColumnVector& dx) { - Tracer tracer("bncModel::kalman"); + Tracer tracer("t_pppFilter::kalman"); int nPar = AA.Ncols(); @@ -752,8 +752,8 @@ // Phase Wind-Up Correction /////////////////////////////////////////////////////////////////////////// -double bncModel::windUp(const QString& prn, const ColumnVector& rSat, +double t_pppFilter::windUp(const QString& prn, const ColumnVector& rSat, const ColumnVector& rRec) { - Tracer tracer("bncModel::windUp"); + Tracer tracer("t_pppFilter::windUp"); double Mjd = _time.mjd() + _time.daysec() / 86400.0; @@ -835,6 +835,6 @@ // /////////////////////////////////////////////////////////////////////////// -void bncModel::cmpEle(t_satData* satData) { - Tracer tracer("bncModel::cmpEle"); +void t_pppFilter::cmpEle(t_satData* satData) { + Tracer tracer("t_pppFilter::cmpEle"); ColumnVector rr = satData->xx - _xcBanc.Rows(1,3); double rho = rr.norm_Frobenius(); @@ -852,9 +852,9 @@ // /////////////////////////////////////////////////////////////////////////// -void bncModel::addAmb(t_satData* satData) { - Tracer tracer("bncModel::addAmb"); +void t_pppFilter::addAmb(t_satData* satData) { + Tracer tracer("t_pppFilter::addAmb"); bool found = false; for (int iPar = 1; iPar <= _params.size(); iPar++) { - if (_params[iPar-1]->type == bncParam::AMB_L3 && + if (_params[iPar-1]->type == t_pppParam::AMB_L3 && _params[iPar-1]->prn == satData->prn) { found = true; @@ -863,5 +863,5 @@ } if (!found) { - bncParam* par = new bncParam(bncParam::AMB_L3, + t_pppParam* par = new t_pppParam(t_pppParam::AMB_L3, _params.size()+1, satData->prn); _params.push_back(par); @@ -872,8 +872,8 @@ // /////////////////////////////////////////////////////////////////////////// -void bncModel::addObs(int iPhase, unsigned& iObs, t_satData* satData, +void t_pppFilter::addObs(int iPhase, unsigned& iObs, t_satData* satData, Matrix& AA, ColumnVector& ll, DiagonalMatrix& PP) { - Tracer tracer("bncModel::addObs"); + Tracer tracer("t_pppFilter::addObs"); const double ELEWGHT = 20.0; @@ -899,5 +899,5 @@ PP(iObs,iObs) = 1.0 / (sigL3 * sigL3) / (ellWgtCoef * ellWgtCoef); for (int iPar = 1; iPar <= _params.size(); iPar++) { - if (_params[iPar-1]->type == bncParam::AMB_L3 && + if (_params[iPar-1]->type == t_pppParam::AMB_L3 && _params[iPar-1]->prn == satData->prn) { ll(iObs) -= _params[iPar-1]->xx; @@ -921,8 +921,8 @@ // /////////////////////////////////////////////////////////////////////////// -QByteArray bncModel::printRes(int iPhase, const ColumnVector& vv, +QByteArray t_pppFilter::printRes(int iPhase, const ColumnVector& vv, const QMap& satDataMap) { - Tracer tracer("bncModel::printRes"); + Tracer tracer("t_pppFilter::printRes"); ostringstream str; @@ -946,10 +946,10 @@ // /////////////////////////////////////////////////////////////////////////// -void bncModel::findMaxRes(const ColumnVector& vv, +void t_pppFilter::findMaxRes(const ColumnVector& vv, const QMap& satData, QString& prnGPS, QString& prnGlo, double& maxResGPS, double& maxResGlo) { - Tracer tracer("bncModel::findMaxRes"); + Tracer tracer("t_pppFilter::findMaxRes"); maxResGPS = 0.0; @@ -980,7 +980,7 @@ // Update Step (private - loop over outliers) //////////////////////////////////////////////////////////////////////////// -t_irc bncModel::update_p(t_epoData* epoData) { - - Tracer tracer("bncModel::update_p"); +t_irc t_pppFilter::update_p(t_epoData* epoData) { + + Tracer tracer("t_pppFilter::update_p"); // Save Variance-Covariance Matrix, and Status Vector @@ -1065,7 +1065,7 @@ if (lastOutlierPrn.isEmpty()) { - QVectorIterator itPar(_params); + QVectorIterator itPar(_params); while (itPar.hasNext()) { - bncParam* par = itPar.next(); + t_pppParam* par = itPar.next(); par->xx += dx(par->index); } @@ -1108,19 +1108,19 @@ // Remeber Original State Vector and Variance-Covariance Matrix //////////////////////////////////////////////////////////////////////////// -void bncModel::rememberState(t_epoData* epoData) { +void t_pppFilter::rememberState(t_epoData* epoData) { _QQ_sav = _QQ; - QVectorIterator itSav(_params_sav); + QVectorIterator itSav(_params_sav); while (itSav.hasNext()) { - bncParam* par = itSav.next(); + t_pppParam* par = itSav.next(); delete par; } _params_sav.clear(); - QVectorIterator it(_params); + QVectorIterator it(_params); while (it.hasNext()) { - bncParam* par = it.next(); - _params_sav.push_back(new bncParam(*par)); + t_pppParam* par = it.next(); + _params_sav.push_back(new t_pppParam(*par)); } @@ -1130,19 +1130,19 @@ // Restore Original State Vector and Variance-Covariance Matrix //////////////////////////////////////////////////////////////////////////// -void bncModel::restoreState(t_epoData* epoData) { +void t_pppFilter::restoreState(t_epoData* epoData) { _QQ = _QQ_sav; - QVectorIterator it(_params); + QVectorIterator it(_params); while (it.hasNext()) { - bncParam* par = it.next(); + t_pppParam* par = it.next(); delete par; } _params.clear(); - QVectorIterator itSav(_params_sav); + QVectorIterator itSav(_params_sav); while (itSav.hasNext()) { - bncParam* par = itSav.next(); - _params.push_back(new bncParam(*par)); + t_pppParam* par = itSav.next(); + _params.push_back(new t_pppParam(*par)); } @@ -1152,5 +1152,5 @@ // //////////////////////////////////////////////////////////////////////////// -t_irc bncModel::selectSatellites(const QString& lastOutlierPrn, +t_irc t_pppFilter::selectSatellites(const QString& lastOutlierPrn, QMap& satData) { @@ -1209,5 +1209,5 @@ // //////////////////////////////////////////////////////////////////////////// -void bncModel::bancroft(const Matrix& BBpass, ColumnVector& pos) { +void t_pppFilter::bancroft(const Matrix& BBpass, ColumnVector& pos) { if (pos.Nrows() != 4) { Index: /trunk/BNC/src/PPP_free/pppFilter.h =================================================================== --- /trunk/BNC/src/PPP_free/pppFilter.h (revision 6092) +++ /trunk/BNC/src/PPP_free/pppFilter.h (revision 6093) @@ -23,6 +23,6 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#ifndef BNCMODEL_H -#define BNCMODEL_H +#ifndef PPPFILTER_H +#define PPPFILTER_H #include @@ -43,10 +43,10 @@ class t_tides; -class bncParam { +class t_pppParam { public: enum parType {CRD_X, CRD_Y, CRD_Z, RECCLK, TROPO, AMB_L3, GLONASS_OFFSET, GALILEO_OFFSET}; - bncParam(parType typeIn, int indexIn, const QString& prn); - ~bncParam(); + t_pppParam(parType typeIn, int indexIn, const QString& prn); + ~t_pppParam(); double partial(t_satData* satData, bool phase); bool isCrd() const { @@ -61,8 +61,8 @@ }; -class bncModel { +class t_pppFilter { public: - bncModel(t_pppClient* pppClient); - ~bncModel(); + t_pppFilter(t_pppClient* pppClient); + ~t_pppFilter(); t_irc update(t_epoData* epoData); bncTime time() const {return _time;} @@ -73,6 +73,6 @@ double trp() const { for (int ii = 0; ii < _params.size(); ++ii) { - bncParam* pp = _params[ii]; - if (pp->type == bncParam::TROPO) { + t_pppParam* pp = _params[ii]; + if (pp->type == t_pppParam::TROPO) { return pp->xx; } @@ -82,6 +82,6 @@ double Glonass_offset() const { for (int ii = 0; ii < _params.size(); ++ii) { - bncParam* pp = _params[ii]; - if (pp->type == bncParam::GLONASS_OFFSET) { + t_pppParam* pp = _params[ii]; + if (pp->type == t_pppParam::GLONASS_OFFSET) { return pp->xx; } @@ -91,6 +91,6 @@ double Galileo_offset() const { for (int ii = 0; ii < _params.size(); ++ii) { - bncParam* pp = _params[ii]; - if (pp->type == bncParam::GALILEO_OFFSET) { + t_pppParam* pp = _params[ii]; + if (pp->type == t_pppParam::GALILEO_OFFSET) { return pp->xx; } @@ -152,7 +152,7 @@ bncTime _lastTimeOK; QByteArray _staID; - QVector _params; + QVector _params; SymmetricMatrix _QQ; - QVector _params_sav; + QVector _params_sav; SymmetricMatrix _QQ_sav; t_epoData* _epoData_sav;