Index: trunk/BNC/src/combination/bnccomb.cpp =================================================================== --- trunk/BNC/src/combination/bnccomb.cpp (revision 7132) +++ trunk/BNC/src/combination/bnccomb.cpp (revision 7297) @@ -11,5 +11,5 @@ * Created: 22-Jan-2011 * - * Changes: + * Changes: * * -----------------------------------------------------------------------*/ @@ -78,5 +78,5 @@ //////////////////////////////////////////////////////////////////////////// double bncComb::cmbParam::partial(const QString& AC_, const QString& prn_) { - + if (type == offACgps) { if (AC == AC_ && prn_[0] == 'G') { @@ -103,10 +103,10 @@ } -// +// //////////////////////////////////////////////////////////////////////////// QString bncComb::cmbParam::toString() const { QString outStr; - + if (type == offACgps) { outStr = "AC offset GPS " + AC; @@ -131,5 +131,5 @@ bncSettings settings; - QStringList combineStreams = settings.value("combineStreams").toStringList(); + QStringList cmbStreams = settings.value("cmbStreams").toStringList(); _cmbSampl = settings.value("cmbSampl").toInt(); @@ -140,6 +140,6 @@ _masterMissingEpochs = 0; - if (combineStreams.size() >= 1 && !combineStreams[0].isEmpty()) { - QListIterator it(combineStreams); + if (cmbStreams.size() >= 1 && !cmbStreams[0].isEmpty()) { + QListIterator it(cmbStreams); while (it.hasNext()) { QStringList hlp = it.next().split(" "); @@ -157,5 +157,5 @@ _rtnetDecoder = 0; - connect(this, SIGNAL(newMessage(QByteArray,bool)), + connect(this, SIGNAL(newMessage(QByteArray,bool)), BNC_CORE, SLOT(slotMessage(const QByteArray,bool))); @@ -197,5 +197,5 @@ for (unsigned iGps = 1; iGps <= t_prn::MAXPRN_GPS; iGps++) { QString prn = QString("G%1_0").arg(iGps, 2, 10, QChar('0')); - _params.push_back(new cmbParam(cmbParam::offACSat, ++nextPar, + _params.push_back(new cmbParam(cmbParam::offACSat, ++nextPar, AC->name, prn)); } @@ -204,5 +204,5 @@ for (unsigned iGlo = 1; iGlo <= t_prn::MAXPRN_GLONASS; iGlo++) { QString prn = QString("R%1_0").arg(iGlo, 2, 10, QChar('0')); - _params.push_back(new cmbParam(cmbParam::offACSat, ++nextPar, + _params.push_back(new cmbParam(cmbParam::offACSat, ++nextPar, AC->name, prn)); } @@ -219,5 +219,5 @@ } } - + // Initialize Variance-Covariance Matrix // ------------------------------------- @@ -353,5 +353,5 @@ continue; } - + // Create new correction // --------------------- @@ -424,5 +424,5 @@ } -// Change the correction so that it refers to last received ephemeris +// Change the correction so that it refers to last received ephemeris //////////////////////////////////////////////////////////////////////////// void bncComb::switchToLastEph(t_eph* lastEph, cmbCorr* corr) { @@ -471,5 +471,5 @@ QTextStream out(&_log, QIODevice::WriteOnly); - out << endl << "Combination:" << endl + out << endl << "Combination:" << endl << "------------------------------" << endl; @@ -515,7 +515,7 @@ if (AC->numObs > 0) { out << "Switching Master AC " - << _masterOrbitAC.toAscii().data() << " --> " - << AC->name.toAscii().data() << " " - << _resTime.datestr().c_str() << " " + << _masterOrbitAC.toAscii().data() << " --> " + << AC->name.toAscii().data() << " " + << _resTime.datestr().c_str() << " " << _resTime.timestr().c_str() << endl; _masterOrbitAC = AC->name; @@ -550,5 +550,5 @@ } } - out << _resTime.datestr().c_str() << " " + out << _resTime.datestr().c_str() << " " << _resTime.timestr().c_str() << " "; out.setRealNumberNotation(QTextStream::FixedNotation); @@ -618,7 +618,7 @@ int maxResIndex; - double maxRes = vv.maximum_absolute_value1(maxResIndex); + double maxRes = vv.maximum_absolute_value1(maxResIndex); out.setRealNumberNotation(QTextStream::FixedNotation); - out.setRealNumberPrecision(3); + out.setRealNumberPrecision(3); out << _resTime.datestr().c_str() << " " << _resTime.timestr().c_str() << " Maximum Residuum " << maxRes << ' ' @@ -627,5 +627,5 @@ for (int iPar = 1; iPar <= _params.size(); iPar++) { cmbParam* pp = _params[iPar-1]; - if (pp->type == cmbParam::offACSat && + if (pp->type == cmbParam::offACSat && pp->AC == corrs()[maxResIndex-1]->_acName && pp->prn == corrs()[maxResIndex-1]->_prn.mid(0,3)) { @@ -675,5 +675,5 @@ eph->getCrd(_resTime, xc, vv, false); - out << _resTime.datestr().c_str() << " " + out << _resTime.datestr().c_str() << " " << _resTime.timestr().c_str() << " "; out.setFieldWidth(3); @@ -704,5 +704,5 @@ _resTime.civil_time(hour, minute, sec); - outLines.sprintf("* %4d %2d %2d %d %d %12.8f\n", + outLines.sprintf("* %4d %2d %2d %d %d %12.8f\n", year, month, day, hour, minute, sec); @@ -797,9 +797,9 @@ //////////////////////////////////////////////////////////////////////////// t_irc bncComb::createAmat(Matrix& AA, ColumnVector& ll, DiagonalMatrix& PP, - const ColumnVector& x0, + const ColumnVector& x0, QMap& resCorr) { unsigned nPar = _params.size(); - unsigned nObs = corrs().size(); + unsigned nObs = corrs().size(); if (nObs == 0) { @@ -858,5 +858,5 @@ cmbParam* pp = _params[iPar-1]; if ( AA.Column(iPar).maximum_absolute_value() > 0.0 && - pp->type == cmbParam::offACSat && + pp->type == cmbParam::offACSat && pp->prn == prn) { AA(nObs+iCond, iPar) = 1.0; @@ -872,5 +872,5 @@ // cmbParam* pp = _params[iPar-1]; // if ( AA.Column(iPar).maximum_absolute_value() > 0.0 && -// pp->type == cmbParam::offACSat && +// pp->type == cmbParam::offACSat && // pp->prn == prn) { // AA(nObs+iCond, iPar) = 1.0; @@ -899,5 +899,5 @@ // ---------------------- while (true) { - + // Remove Satellites that are not in Master // ---------------------------------------- @@ -922,5 +922,5 @@ } } - + // Count Number of Observations per Satellite and per AC // ----------------------------------------------------- @@ -945,5 +945,5 @@ } } - + // Clean-Up the Paramters // ---------------------- @@ -952,9 +952,9 @@ } _params.clear(); - + // Set new Parameters // ------------------ int nextPar = 0; - + QMapIterator itAC(numObsAC); while (itAC.hasNext()) { @@ -968,6 +968,6 @@ } } - } - + } + QMapIterator itPrn(numObsPrn); while (itPrn.hasNext()) { @@ -978,10 +978,10 @@ _params.push_back(new cmbParam(cmbParam::clkSat, ++nextPar, "", prn)); } - } - + } + int nPar = _params.size(); - ColumnVector x0(nPar); + ColumnVector x0(nPar); x0 = 0.0; - + // Create First-Design Matrix // -------------------------- @@ -992,5 +992,5 @@ return failure; } - + ColumnVector vv; try { @@ -1008,7 +1008,7 @@ int maxResIndex; - double maxRes = vv.maximum_absolute_value1(maxResIndex); + double maxRes = vv.maximum_absolute_value1(maxResIndex); out.setRealNumberNotation(QTextStream::FixedNotation); - out.setRealNumberPrecision(3); + out.setRealNumberPrecision(3); out << _resTime.datestr().c_str() << " " << _resTime.timestr().c_str() << " Maximum Residuum " << maxRes << ' ' @@ -1023,8 +1023,8 @@ out << " OK" << endl; out.setRealNumberNotation(QTextStream::FixedNotation); - out.setRealNumberPrecision(3); + out.setRealNumberPrecision(3); for (int ii = 0; ii < vv.Nrows(); ii++) { const cmbCorr* corr = corrs()[ii]; - out << _resTime.datestr().c_str() << ' ' + out << _resTime.datestr().c_str() << ' ' << _resTime.timestr().c_str() << " " << corr->_acName << ' ' << corr->_prn.mid(0,3); @@ -1092,9 +1092,9 @@ meanRao[prn].ReSize(4); meanRao[prn].Rows(1,3) = corr->_orbCorr._xr; - meanRao[prn](4) = 1; + meanRao[prn](4) = 1; } else { meanRao[prn].Rows(1,3) += corr->_orbCorr._xr; - meanRao[prn](4) += 1; + meanRao[prn](4) += 1; } if (numCorr.find(prn) == numCorr.end()) { @@ -1105,5 +1105,5 @@ } } - + // Compute Differences wrt Mean, find Maximum // ------------------------------------------ @@ -1127,7 +1127,7 @@ maxDiff[prn] = corr; } - } - } - + } + } + if (_ACs.size() == 1) { break; @@ -1150,8 +1150,8 @@ out << _resTime.datestr().c_str() << " " << _resTime.timestr().c_str() << " " - << "Orbit Outlier: " - << corr->_acName.toAscii().data() << " " + << "Orbit Outlier: " + << corr->_acName.toAscii().data() << " " << prn.mid(0,3).toAscii().data() << " " - << corr->_iod << " " + << corr->_iod << " " << norm << endl; delete corr; @@ -1161,5 +1161,5 @@ } } - + if (!removed) { break; @@ -1170,5 +1170,5 @@ } -// +// //////////////////////////////////////////////////////////////////////////// void bncComb::slotProviderIDChanged(QString mountPoint) {