--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/MiddleBedHeightCalculation.java	Fri Jun 06 16:47:48 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/MiddleBedHeightCalculation.java	Fri Jun 06 16:59:16 2014 +0200
@@ -16,8 +16,6 @@
 import org.dive4elements.artifacts.Artifact;
 import org.dive4elements.artifacts.common.utils.DateUtils;
 
-import org.dive4elements.river.model.BedHeightEpoch;
-import org.dive4elements.river.model.BedHeightEpochValue;
 import org.dive4elements.river.model.BedHeightSingle;
 import org.dive4elements.river.model.BedHeightSingleValue;
 import org.dive4elements.river.model.TimeInterval;
@@ -35,7 +33,6 @@
         logger.info("MiddleBedHeightCalculation.calculate");
 
         int[] singleIds = access.getBedHeightSingleIDs();
-        int[] epochIds  = access.getBedHeightEpochIDs();
 
 
         if (logger.isDebugEnabled()) {
@@ -45,16 +42,11 @@
             if (singleIds != null) {
                 logger.debug("   " + singleIds.length + " single bedheight ids");
             }
-
-            if (epochIds != null) {
-                logger.debug("   " + epochIds.length + " epoch bedheight ids");
-            }
         }
 
         List<BedHeightSingle> singles = getSingles(access, singleIds);
-        List<BedHeightEpoch>  epochs  = getEpochs(access, epochIds);
 
-        return buildCalculationResult(access, singles, epochs);
+        return buildCalculationResult(access, singles);
     }
 
 
@@ -80,32 +72,9 @@
     }
 
 
-    protected List<BedHeightEpoch> getEpochs(
-        BedHeightAccess access,
-        int[] ids
-    ) {
-        List<BedHeightEpoch> epochs = new ArrayList<BedHeightEpoch>();
-
-        for (int id: ids) {
-            BedHeightEpoch e = BedHeightEpoch.getBedHeightEpochById(id);
-
-            if (e != null) {
-                epochs.add(e);
-            }
-            else {
-                logger.warn("Cannot find Epoch by id: " + id);
-                // TODO ADD WARNING
-            }
-        }
-
-        return epochs;
-    }
-
-
     protected CalculationResult buildCalculationResult(
         BedHeightAccess       access,
-        List<BedHeightSingle> singles,
-        List<BedHeightEpoch>  epochs
+        List<BedHeightSingle> singles
     ) {
         logger.info("MiddleBedHeightCalculation.buildCalculationResult");
 
@@ -122,14 +91,6 @@
             }
         }
 
-        for (BedHeightEpoch epoch: epochs) {
-            MiddleBedHeightData d = prepareEpochData(epoch, kmLo, kmHi);
-
-            if (d != null) {
-                data.add(d);
-            }
-        }
-
         logger.debug("Calculation results in " + data.size() + " data objects.");
 
         return new CalculationResult((MiddleBedHeightData[])
@@ -186,43 +147,5 @@
 
         return data;
     }
-
-
-    /** Create MiddleBedHeightData to return. */
-    protected MiddleBedHeightData prepareEpochData(
-        BedHeightEpoch epoch,
-        double kmLo,
-        double kmHi
-    ) {
-        logger.debug("Prepare data for epoch: " + epoch.getDescription());
-
-        TimeInterval ti = epoch.getTimeInterval();
-
-        List<BedHeightEpochValue> values =
-            BedHeightEpochValue.getBedHeightEpochValues(epoch, kmLo, kmHi);
-
-        MiddleBedHeightData data = new MiddleBedHeightData(
-            DateUtils.getYearFromDate(ti.getStartTime()),
-            DateUtils.getYearFromDate(ti.getStopTime()),
-            epoch.getEvaluationBy(),
-            epoch.getDescription()
-        );
-
-        for (BedHeightEpochValue value: values) {
-            data.addKM(value.getStation().doubleValue());
-            if (value.getHeight() != null) {
-                data.addMiddleHeight(value.getHeight().doubleValue());
-                data.addIsEmpty(false);
-            }
-            else {
-                data.addMiddleHeight(Double.NaN);
-                data.addIsEmpty(true);
-            }
-        }
-
-        logger.debug("Epoch contains " + values.size() + " values");
-
-        return data;
-    }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :