Changeset 6164 in ntrip


Ignore:
Timestamp:
Sep 14, 2014, 1:07:25 PM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bncutils.cpp

    r5910 r6164  
    606606//////////////////////////////////////////////////////////////////////////////
    607607void kalman(const Matrix& AA, const ColumnVector& ll, const DiagonalMatrix& PP,
    608             SymmetricMatrix& QQ, ColumnVector& xx) {
     608            SymmetricMatrix& QQ, ColumnVector& dx) {
    609609
    610610  Tracer tracer("kalman");
     
    635635  SymmetricMatrix Hi; Hi << SHi * SHi.t();
    636636
    637   xx += KT.t() * (ll - AA * xx);
     637  dx = KT.t() * (ll - AA * xx);
    638638  QQ << (SS.t() * SS);
    639639}
  • trunk/BNC/src/bncutils.h

    r5910 r6164  
    9797
    9898void         kalman(const Matrix& AA, const ColumnVector& ll, const DiagonalMatrix& PP,
    99                     SymmetricMatrix& QQ, ColumnVector& xx);
     99                    SymmetricMatrix& QQ, ColumnVector& dx);
    100100
    101101double       djul(long j1, long m1, double tt);
  • trunk/BNC/src/combination/bnccomb.cpp

    r6161 r6164  
    612612    }
    613613
     614    cout << "AA:  " << AA.Nrows() << ' ' << AA.Ncols() << endl;
     615    cout << "ll:  " << ll.Nrows() << endl;
     616    cout << "PP:  " << PP.Nrows() << ' ' << PP.Ncols() << endl;
     617    cout << "_QQ: " << _QQ.Nrows() << ' ' << _QQ.Ncols() << endl;
     618    cout << "dx: "  << dx.Nrows() << endl;
     619
    614620    dx = 0.0;
    615621    kalman(AA, ll, PP, _QQ, dx);
     622
     623    cout << "after Kalman" << endl;
     624
    616625    ColumnVector vv = ll - AA * dx;
     626
     627    cout << vv.t() << endl;
    617628
    618629    int     maxResIndex;
     
    807818  int iObs = 0;
    808819
     820  cout << "nObs, nCon, nPar: " << nObs << ' ' << nCon << ' ' << nPar << endl;
     821
     822  for (int iPar = 1; iPar <= _params.size(); iPar++) {
     823    cmbParam* pp = _params[iPar-1];
     824    cout << "PAR " << iPar << ' ' << pp->toString().toAscii().data() << endl;
     825  }
     826
    809827  QVectorIterator<cmbCorr*> itCorr(corrs());
    810828  while (itCorr.hasNext()) {
     
    816834    if (corr->_acName == _masterOrbitAC && resCorr.find(prn) == resCorr.end()) {
    817835      resCorr[prn] = new cmbCorr(*corr);
     836      cout << "resCor " << corr->_acName.toAscii().data() << ' '
     837           << prn.toAscii().data() << endl;
    818838    }
    819839
     
    824844
    825845    ll(iObs) = corr->_clkCorr._dClk * t_CST::c - DotProduct(AA.Row(iObs), x0);
     846    cout << "iObs, AC, prn, ll: " << iObs << ' ' << corr->_acName.toAscii().data() << ' '
     847         << corr->_prn.toAscii().data() << ' ' << ll(iObs) << endl;
    826848  }
    827849
Note: See TracChangeset for help on using the changeset viewer.