--- a/flys-artifacts/src/main/java/de/intevation/flys/utils/DataUtil.java	Wed Oct 05 11:23:18 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/DataUtil.java	Wed Oct 05 13:16:44 2011 +0000
@@ -2,18 +2,16 @@
 
 import java.util.Random;
 
-import de.intevation.flys.artifacts.model.WKms;
+import gnu.trove.TDoubleArrayList;
 
 public class DataUtil
 {
-    // TODO: resolve duplicate in WQKms
-    public static boolean guessWaterIncreasing(WKms wkms) {
-        return guessWaterIncreasing(wkms, 0.05f);
+    public static boolean guessWaterIncreasing(TDoubleArrayList data) {
+        return guessWaterIncreasing(data, 0.05f);
     }
 
-    // TODO: resolve duplicate in WQKms
-    public static boolean guessWaterIncreasing(WKms wkms, float factor) {
-        int N = wkms.size();
+    public static boolean guessWaterIncreasing(TDoubleArrayList data, float factor) {
+        int N = data.size();
         if (N < 2) return false;
     
         int samples = (int)(factor*N) + 1;
@@ -24,10 +22,9 @@
     
         for (int i = 0; i < samples; ++i) {
             int    pos2 = rand.nextInt(N-1) + 1;
-            if (pos2 == 0) continue;
             int    pos1 = rand.nextInt(pos2);
-            double w1   = wkms.getW(pos1);
-            double w2   = wkms.getW(pos2);
+            double w1   = data.getQuick(pos1);
+            double w2   = data.getQuick(pos2);
             if (w2 > w1) ++up;
         }