diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataCalculation.java @ 8713:6b68777aaeab

(issue1448) Remove obsolete code for OfficalEpoch "Calculation" This is handled through datacage recommendations as this was never an actual calculation.
author Andre Heinecke <andre.heinecke@intevation.de>
date Fri, 24 Apr 2015 17:54:12 +0200
parents 73a4c3c202e5
children 8dbb969091c5
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataCalculation.java	Fri Apr 24 17:18:48 2015 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataCalculation.java	Fri Apr 24 17:54:12 2015 +0200
@@ -22,7 +22,6 @@
 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadData.Station;
 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadDataValueFilter.And;
 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadDataValueFilter.IsEpoch;
-import org.dive4elements.river.artifacts.model.minfo.SedimentLoadDataValueFilter.IsOfficial;
 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadDataValueFilter.Not;
 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadDataValueFilter.SQTimeInterval;
 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadDataValueFilter.TimeRangeIntersects;
@@ -178,7 +177,7 @@
         if (yearEpoch.equals("year")) {
             years = access.getYears();
         }
-        else if (yearEpoch.equals("epoch") || yearEpoch.equals("off_epoch")) {
+        else if (yearEpoch.equals("epoch")) {
             epochs = access.getEpochs();
         }
         else {
@@ -217,7 +216,6 @@
     private CalculationResult internalCalculate() {
         if ("year".equals(yearEpoch))      return calculateYears();
         if ("epoch".equals(yearEpoch))     return calculateEpochs();
-        if ("off_epoch".equals(yearEpoch)) return calculateOffEpochs();
 
         // TODO: i18n
         return error("minfo.sedimentload.unknown.calc.mode");
@@ -339,51 +337,6 @@
         return new CalculationResult(sldr, this);
     }
 
-    private CalculationResult calculateOffEpochs() {
-        SedimentLoadData sld =
-            SedimentLoadDataFactory.INSTANCE.getSedimentLoadData(river);
-        if (sld == null) {
-            return error("minfo.sedimentload.no.data");
-        }
-
-        SedimentLoadDataResult sldr = new SedimentLoadDataResult();
-
-        SedimentDensity sd = getSedimentDensity();
-
-        Set<Integer> missingFractions = new TreeSet<Integer>();
-
-        for (int [] epoch: epochs) {
-            Value.Filter filter = new And(IsOfficial.INSTANCE)
-                .add(new TimeRangeIntersects(epoch[0], epoch[1]));
-
-            int year = Math.min(epoch[0], epoch[1]);
-
-            String period = Integer.toString(epoch[0]) + " - " +
-                Integer.toString(epoch[1]);
-
-            Sum sum = new Sum();
-
-            for (LoadSum ls: LOAD_SUMS) {
-                double [][] result = sum(
-                    sld, ls.getGrainFractions(), ls.getStationType(),
-                    filter, sum);
-
-                if (result[0].length == 0 || DoubleUtil.isNaN(result[1])) {
-                    addProblem("sedimentload.missing.fraction." +
-                               ls.getDescription(), period);
-                    continue;
-                }
-
-                transformT2M3(sd, year, result);
-                SedimentLoadDataResult.Fraction sldrf =
-                    new SedimentLoadDataResult.Fraction(ls.getDescription(), result, period);
-                sldr.addFraction(sldrf);
-            }
-        }
-        // TODO: Generate messages for missing fractions.
-        return new CalculationResult(sldr, this);
-    }
-
     private final boolean inM3() {
         return unit.equals("m3_per_a");
     }

http://dive4elements.wald.intevation.org