Index: /trunk/BNC/bncmodel.cpp
===================================================================
--- /trunk/BNC/bncmodel.cpp	(revision 2107)
+++ /trunk/BNC/bncmodel.cpp	(revision 2108)
@@ -143,7 +143,5 @@
 
   _QQ.ReSize(nPar); 
-  _xx.ReSize(nPar);
   _QQ = 0.0;
-  _xx = 0.0;
 
   _QQ(1,1) = sig_crd_0 * sig_crd_0; 
@@ -285,5 +283,4 @@
     // -----------------------------------------------
     SymmetricMatrix QQ_old = _QQ;
-    ColumnVector    xx_old = _xx;
     
     for (int iPar = 1; iPar <= _params.size(); iPar++) {
@@ -333,10 +330,8 @@
     
     int nPar = _params.size();
-    _xx.ReSize(nPar); _xx = 0.0;
     _QQ.ReSize(nPar); _QQ = 0.0;
     for (int i1 = 1; i1 <= nPar; i1++) {
       bncParam* p1 = _params[i1-1];
       if (p1->index_old != 0) {
-        _xx(p1->index)            = xx_old(p1->index_old);
         _QQ(p1->index, p1->index) = QQ_old(p1->index_old, p1->index_old);
         for (int i2 = 1; i2 <= nPar; i2++) {
@@ -410,5 +405,4 @@
     _params[iPar-1]->xx = 0.0;
   }
-  _xx = 0.0;
 }
 
@@ -417,75 +411,139 @@
 t_irc bncModel::update(t_epoData* epoData) {
 
-  if (epoData->size() < MINOBS) {
-    return failure;
-  }
-
-  predict(epoData);
-
-  unsigned nPar = _params.size();
-  unsigned nObs = _usePhase ? 2 * epoData->size() : epoData->size();
-
-  // Create First-Design Matrix
-  // --------------------------
-  Matrix          AA(nObs, nPar);  // first design matrix
-  ColumnVector    ll(nObs);        // tems observed-computed
-  SymmetricMatrix PP(nObs); PP = 0.0;
-
-  unsigned iObs = 0;
-  QMapIterator<QString, t_satData*> itObs(epoData->satData);
-  while (itObs.hasNext()) {
-    ++iObs;
-    itObs.next();
-    QString    prn     = itObs.key();
-    t_satData* satData = itObs.value();
-
-    double rhoCmp = cmpValue(satData);
-
-    ll(iObs)      = satData->P3 - rhoCmp;
-    PP(iObs,iObs) = 1.0 / (sig_P3 * sig_P3);
-    for (int iPar = 1; iPar <= _params.size(); iPar++) {
-      AA(iObs, iPar) = _params[iPar-1]->partial(satData, "");
-    }
-
-    if (_usePhase) {
+  const static double MAXRES_CODE  = 10.0;
+  const static double MAXRES_PHASE = 0.10;
+
+  ColumnVector    xx;
+
+  bool outlier = false;
+
+  do {
+
+    outlier = false;
+
+    if (epoData->size() < MINOBS) {
+      return failure;
+    }
+    
+    // Bancroft Solution
+    // -----------------
+    if (cmpBancroft(epoData) != success) {
+      return failure;
+    }
+
+    // Status Prediction
+    // -----------------
+    predict(epoData);
+    
+    SymmetricMatrix QQsav = _QQ;
+
+    unsigned nPar = _params.size();
+    unsigned nObs = _usePhase ? 2 * epoData->size() : epoData->size();
+    
+    // Set Solution Vector
+    // -------------------
+    xx.ReSize(nPar);
+    QVectorIterator<bncParam*> itPar(_params);
+    while (itPar.hasNext()) {
+      bncParam* par = itPar.next();
+      xx(par->index) = par->xx;
+    }
+    
+    // Create First-Design Matrix
+    // --------------------------
+    Matrix          AA(nObs, nPar);  // first design matrix
+    ColumnVector    ll(nObs);        // tems observed-computed
+    SymmetricMatrix PP(nObs); PP = 0.0;
+    
+    unsigned iObs = 0;
+    QMapIterator<QString, t_satData*> itObs(epoData->satData);
+    while (itObs.hasNext()) {
       ++iObs;
-      ll(iObs)      = satData->L3 - rhoCmp;
-      PP(iObs,iObs) = 1.0 / (sig_L3 * sig_L3);
+      itObs.next();
+      QString    prn     = itObs.key();
+      t_satData* satData = itObs.value();
+    
+      double rhoCmp = cmpValue(satData);
+    
+      ll(iObs)      = satData->P3 - rhoCmp;
+      PP(iObs,iObs) = 1.0 / (sig_P3 * sig_P3);
       for (int iPar = 1; iPar <= _params.size(); iPar++) {
-        if (_params[iPar-1]->type == bncParam::AMB_L3 &&
-            _params[iPar-1]->prn  == prn) {
-          ll(iObs) -= _params[iPar-1]->x0;
-        } 
-        AA(iObs, iPar) = _params[iPar-1]->partial(satData, prn);
-      }
-    }
-  }
-
-  // Compute Kalman Update
-  // ---------------------
-  if (false) {
-    SymmetricMatrix HH; HH << PP + AA * _QQ * AA.t();
-    SymmetricMatrix Hi = HH.i();
-    Matrix          KK  = _QQ * AA.t() * Hi;
-    ColumnVector    v1  = ll - AA * _xx;
-                    _xx = _xx + KK * v1;
-    IdentityMatrix Id(nPar);
-    _QQ << (Id - KK * AA) * _QQ;
-  }
-  else {
-    Matrix ATP = AA.t() * PP;
-    SymmetricMatrix NN = _QQ.i();
-    ColumnVector    bb = NN * _xx + ATP * ll;
-    NN << NN + ATP * AA;
-    _QQ = NN.i();
-    _xx = _QQ * bb; 
-  }
-
-  // Set Solution Vector
-  // -------------------
+        AA(iObs, iPar) = _params[iPar-1]->partial(satData, "");
+      }
+    
+      if (_usePhase) {
+        ++iObs;
+        ll(iObs)      = satData->L3 - rhoCmp;
+        PP(iObs,iObs) = 1.0 / (sig_L3 * sig_L3);
+        for (int iPar = 1; iPar <= _params.size(); iPar++) {
+          if (_params[iPar-1]->type == bncParam::AMB_L3 &&
+              _params[iPar-1]->prn  == prn) {
+            ll(iObs) -= _params[iPar-1]->x0;
+          } 
+          AA(iObs, iPar) = _params[iPar-1]->partial(satData, prn);
+        }
+      }
+    }
+    
+    // Compute Kalman Update
+    // ---------------------
+    if (false) {
+      SymmetricMatrix HH; HH << PP + AA * _QQ * AA.t();
+      SymmetricMatrix Hi = HH.i();
+      Matrix          KK  = _QQ * AA.t() * Hi;
+      ColumnVector    v1  = ll - AA * xx;
+                      xx = xx + KK * v1;
+      IdentityMatrix Id(nPar);
+      _QQ << (Id - KK * AA) * _QQ;
+    }
+    else {
+      Matrix ATP = AA.t() * PP;
+      SymmetricMatrix NN = _QQ.i();
+      ColumnVector    bb = NN * xx + ATP * ll;
+      NN << NN + ATP * AA;
+      _QQ = NN.i();
+      xx = _QQ * bb; 
+    }
+    
+    // Outlier Detection
+    // -----------------
+    ColumnVector vv = ll - AA * xx;
+
+    iObs = 0;
+    QMutableMapIterator<QString, t_satData*> it2Obs(epoData->satData);
+    while (it2Obs.hasNext()) {
+      ++iObs;
+      it2Obs.next();
+      QString    prn     = it2Obs.key();
+      t_satData* satData = it2Obs.value();
+      if (fabs(vv(iObs)) > MAXRES_CODE) {
+        delete satData;
+        it2Obs.remove();
+        _QQ = QQsav;
+        outlier = true;
+        cout << "Code " << prn.toAscii().data() << " " << vv(iObs) << endl;
+        break;
+      }
+      if (_usePhase) {
+        ++iObs;
+        if (fabs(vv(iObs)) > MAXRES_PHASE) {
+          delete satData;
+          it2Obs.remove();
+          _QQ = QQsav;
+          outlier = true;
+          cout << "Phase " << prn.toAscii().data() << " " << vv(iObs) << endl;
+          break;
+        }
+      }
+    }
+  
+  } while (outlier);
+
+  // Set Solution Vector back
+  // ------------------------
   QVectorIterator<bncParam*> itPar(_params);
   while (itPar.hasNext()) {
     bncParam* par = itPar.next();
-    par->xx = _xx(par->index);
+    par->xx = xx(par->index);
   }
 
Index: /trunk/BNC/bncmodel.h
===================================================================
--- /trunk/BNC/bncmodel.h	(revision 2107)
+++ /trunk/BNC/bncmodel.h	(revision 2108)
@@ -72,5 +72,4 @@
   QVector<bncParam*> _params;
   SymmetricMatrix    _QQ;
-  ColumnVector       _xx;
   ColumnVector       _xcBanc;
   ColumnVector       _ellBanc;
Index: /trunk/BNC/bncpppclient.cpp
===================================================================
--- /trunk/BNC/bncpppclient.cpp	(revision 2107)
+++ /trunk/BNC/bncpppclient.cpp	(revision 2108)
@@ -328,10 +328,4 @@
   }
 
-  // Bancroft Solution
-  // -----------------
-  if (_model->cmpBancroft(_epoData) != success) {
-    return;
-  }
-
   // Filter Solution
   // ---------------