diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation6.java @ 5379:61bf64b102bc mapgenfix

Merge with default branch
author Christian Lins <christian.lins@intevation.de>
date Fri, 22 Mar 2013 11:25:54 +0100
parents 1b73b731f7bd
children
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation6.java	Wed Mar 06 14:14:15 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation6.java	Fri Mar 22 11:25:54 2013 +0100
@@ -13,6 +13,7 @@
 
 
 /**
+ * Historical Discharge Calculation.
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
 public class Calculation6 extends Calculation {
@@ -101,6 +102,7 @@
         return relevant;
     }
 
+    /** True if timerange of given discharge table overlaps with timerange. */
     protected boolean isDischargeTableRelevant(DischargeTable dt) {
         TimeInterval ti = dt.getTimeInterval();
 
@@ -173,6 +175,7 @@
             String.valueOf(km), dt.getTimeInterval());
     }
 
+    /** Without reference. */
     protected WQTimerange[] prepareSimpleData(List<DischargeTable> dts) {
         List<WQTimerange> wqts = new ArrayList<WQTimerange>(values.length);
 
@@ -220,6 +223,7 @@
         return wqts.toArray(new WQTimerange[wqts.size()]);
     }
 
+    /** With reference. */
     protected HistoricalWQTimerange[] prepareData(DischargeTable refTable,
         List<DischargeTable> dts) {
         List<HistoricalWQTimerange> wqts = new ArrayList<HistoricalWQTimerange>(
@@ -295,6 +299,7 @@
             .toArray(new HistoricalWQTimerange[wqts.size()]);
     }
 
+    /** Returns discharge table interval as Date[]. */
     protected Date[] prepareTimeInterval(DischargeTable dt) {
         TimeInterval ti = dt.getTimeInterval();
 

http://dive4elements.wald.intevation.org