--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java	Fri May 25 13:40:22 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java	Fri May 25 13:49:27 2012 +0000
@@ -223,22 +223,20 @@
         }
 
         // Calculate Delta W/t
-        List<DeltaWT> deltaWTs = calculateDeltaWTs(
+        DeltaWTsKM deltaWTsKM = calculateDeltaWTs(
             func,
             overview,
             results);
 
-        // TODO: Add km indexed structure for deltaWTs
-
-        return new CalculationResult(deltaWTs, this);
+        return new CalculationResult(deltaWTsKM, this);
     }
 
-    public List<DeltaWT> calculateDeltaWTs(
+    public DeltaWTsKM calculateDeltaWTs(
         Function        function,
         FixingsOverview overview,
         Parameters      results
     ) {
-        List<DeltaWT> deltaWTs = new ArrayList<DeltaWT>();
+        DeltaWTsKM deltaWTsKM = new DeltaWTsKM(results.size());
 
         Column [][] analysisColumns = getAnalysisColumns(overview);
 
@@ -254,6 +252,9 @@
             double km = results.get(i, "km");
             results.get(i, parameterIndices, parameterValues);
 
+            DeltaWTsKM.KM dwtkm = new DeltaWTsKM.KM(km);
+            deltaWTsKM.add(dwtkm);
+
             // This is the paraterized function for a given km.
             de.intevation.flys.artifacts.math.Function instance =
                 function.instantiate(parameterValues);
@@ -291,12 +292,12 @@
                         pc.meta.getStartTime(),
                         pc.meta.getDescription());
 
-                    deltaWTs.add(deltaWT);
+                    dwtkm.add(deltaWT);
                 }
             }
         }
 
-        return deltaWTs;
+        return deltaWTsKM;
     }
 
     /** Helper class to bundle the meta information of a column