Changeset 3441 in ntrip for trunk/BNC


Ignore:
Timestamp:
Sep 22, 2011, 11:22:09 AM (13 years ago)
Author:
mervart
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/combination/bnccomb.cpp

    r3440 r3441  
    399399  }
    400400
    401   Matrix         AA;
    402   ColumnVector   ll;
    403   DiagonalMatrix PP;
     401  SymmetricMatrix QQ_sav = _QQ;
     402
     403  ColumnVector dx;
    404404  QMap<QString, t_corr*> resCorr;
    405 
    406   if (createAmat(AA, ll, PP, x0, resCorr) != success) {
    407     return;
    408   }
    409 
    410   ColumnVector dx;
    411   SymmetricMatrix QQ_sav = _QQ;
    412 
     405   
    413406  // Update and outlier detection loop
    414407  // ---------------------------------
    415   for (int ii = 1; ii < 10; ii++) {
     408  while (true) {
     409
     410    Matrix         AA;
     411    ColumnVector   ll;
     412    DiagonalMatrix PP;
     413
     414    if (createAmat(AA, ll, PP, x0, resCorr) != success) {
     415      return;
     416    }
     417
    416418    bncModel::kalman(AA, ll, PP, _QQ, dx);
    417419    ColumnVector vv = ll - AA * dx;
     
    439441      out << "  Outlier" << endl;
    440442      _QQ = QQ_sav;
    441       AA.Row(maxResIndex) = 0.0;
    442       ll.Row(maxResIndex) = 0.0;
     443      corrs().remove(maxResIndex-1);
    443444    }
    444445    else {
Note: See TracChangeset for help on using the changeset viewer.