--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java	Tue Jul 31 16:14:17 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/Fitting.java	Tue Jul 31 16:46:36 2012 +0000
@@ -1,8 +1,5 @@
 package de.intevation.flys.artifacts.model.fixings;
 
-import de.intevation.flys.artifacts.math.Outlier.IndexedValue;
-import de.intevation.flys.artifacts.math.Outlier.Outliers;
-
 import de.intevation.flys.artifacts.math.Outlier;
 
 import de.intevation.flys.artifacts.math.fitting.Function;
@@ -157,7 +154,7 @@
             return false;
         }
 
-        List<IndexedValue> inputs = new ArrayList<IndexedValue>(xs.size());
+        List<Double> inputs = new ArrayList<Double>(xs.size());
 
         de.intevation.flys.artifacts.math.Function instance = null;
 
@@ -204,27 +201,23 @@
             for (int i = 0, N = xs.size(); i < N; ++i) {
                 double y = instance.value(xs.getQuick(i));
                 if (Double.isNaN(y)) {
-                    continue;
+                    y = Double.MAX_VALUE;
                 }
-                inputs.add(new IndexedValue(i, ys.getQuick(i) - y));
+                inputs.add(Double.valueOf(ys.getQuick(i) - y));
             }
 
-            Outliers outliers = Outlier.findOutliers(inputs);
+            Integer outlier = Outlier.findOutlier(inputs);
 
-            if (!outliers.hasOutliers()) {
+            if (outlier == null) {
                 break;
             }
 
-            List<IndexedValue> rem = outliers.getRemoved();
-
-            for (int i = rem.size()-1; i >= 0; --i) {
-                int idx = rem.get(i).getIndex();
-                removed.add(
-                    qwdFactory.create(
-                        xs.getQuick(idx), ys.getQuick(idx)));
-                xs.remove(idx);
-                ys.remove(idx);
-            }
+            int idx = outlier.intValue();
+            removed.add(
+                qwdFactory.create(
+                    xs.getQuick(idx), ys.getQuick(idx)));
+            xs.remove(idx);
+            ys.remove(idx);
         }
 
         StandardDeviation stdDev = new StandardDeviation();