dive4elements/river: flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java comparison

comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java @ 686:3dc61e00385e facets-slt

Merged with trunk and introduced hashing of computed values. flys-artifacts/branches/facets-slt@2126 c6561f87-3c4e-4783-a992-168aeb5c3f6f

author	Ingo Weinzierl <ingo.weinzierl@intevation.de>
date	Wed, 15 Jun 2011 15:28:54 +0000
parents	fdc898a134a7
children	06689035024c

comparison

equal deleted inserted replaced

-:434146596838
+:3dc61e00385e
 package de.intevation.flys.artifacts;
 import java.util.List;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.ArrayList;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import de.intevation.artifacts.common.utils.XMLUtils;
 import de.intevation.flys.model.Gauge;
 import de.intevation.flys.model.River;
+import de.intevation.flys.artifacts.states.CalculationSelect;
 import de.intevation.flys.artifacts.states.DefaultState;
 import de.intevation.flys.artifacts.context.FLYSContext;
+import de.intevation.flys.artifacts.model.ComputeCallback;
 import de.intevation.flys.artifacts.model.MainValuesFactory;
 import de.intevation.flys.artifacts.model.WQDay;
 import de.intevation.flys.artifacts.model.WQKms;
 import de.intevation.flys.artifacts.model.WstValueTable;
-import de.intevation.flys.artifacts.model.WstValueTable.QPosition;
 import de.intevation.flys.artifacts.model.WstValueTableFactory;
+import de.intevation.flys.artifacts.model.Calculation1;
+import de.intevation.flys.artifacts.model.Calculation2;
+import de.intevation.flys.artifacts.model.Calculation3;
 import de.intevation.flys.artifacts.model.Calculation4;
 import de.intevation.flys.artifacts.model.Segment;
 import gnu.trove.TDoubleArrayList;
 //
 // METHODS FOR RETRIEVING COMPUTED DATA FOR DIFFERENT CHART TYPES
 //
+public Object compute() {
+return compute(hash());
+}
+public Object compute(String hash) {
+String calc = (String) getData(CalculationSelect.FIELD_MODE).getValue();
+ComputeCallback callback = null;
+if (calc.equals(CalculationSelect.CALCULATION_SURFACE_CURVE)) {
+callback = createSurfaceCurveCallback();
+}
+else if (calc.equals(CalculationSelect.CALCULATION_DURATION_CURVE)) {
+callback = createDurationCurveCallback();
+}
+else if (
+calc.equals(
+CalculationSelect.CALCULATION_DISCHARGE_LONGITUDINAL_CURVE))
+{
+callback = createDischargeLongitudinalCurveCallback();
+}
+else if (calc.equals(CalculationSelect.CALCULATION_DISCHARGE_CURVE)) {
+callback = createDischargeCurveCallback();
+}
+else {
+return null;
+}
+return compute(hash, callback);
+}
+protected ComputeCallback createSurfaceCurveCallback() {
+return new ComputeCallback() {
+public Object compute() {
+return getWaterlevelData();
+}
+};
+}
+protected ComputeCallback createDurationCurveCallback() {
+return new ComputeCallback() {
+public Object compute() {
+return getDurationCurveData();
+}
+};
+}
+protected ComputeCallback createDischargeLongitudinalCurveCallback() {
+return new ComputeCallback() {
+public Object compute() {
+return getDischargeLongitudinalSectionData();
+}
+};
+}
+protected ComputeCallback createDischargeCurveCallback() {
+return new ComputeCallback() {
+public Object compute() {
+return getComputedDischargeCurveData();
+}
+};
+}
 /**
 * Returns the data that is computed by a waterlevel computation.
 *
 * @return an array of data triples that consist of W, Q and Kms.
 */
 WstValueTable wst = WstValueTableFactory.getTable(river);
 if (wst == null) {
 throw new NullPointerException("No Wst found for selected river.");
 }
-HashSet<Integer> failed = new HashSet<Integer>();
 WQKms[] results = computeWaterlevelData(
-kms, qs, wst, river.getKmUp(), failed);
+kms, qs, ws, wst, river.getKmUp());
-// TODO Introduce a caching mechanism here!
-setWaterlevelNames(
-results, qSel ? qs : ws, qSel ? "Q" : "W", failed);
 return results;
 }
-/**
-* Sets the name for waterlevels where each WQKms in <i>r</i> represents a
-* column.
-*
-* @param r The waterlevel columns.
-* @param v The input values of the computations.
-* @param wq The WQ mode - can be one of "W" or "Q".
-*/
-public static void setWaterlevelNames(
-WQKms[]  r,
-double[] v,
-String   wq,
-Set      failed
-) {
-int pos = 0;
-for (int i = 0; i < v.length; i++) {
-if (!failed.contains(i)) {
-r[pos++].setName(wq + "=" + v[i]);
-}
-}
-}
 /**
 * Computes the data of a waterlevel computation based on the interpolation
 * in WstValueTable.
 *
 * @param wst The WstValueTable used for the interpolation.
 *
 * @return an array of data triples that consist of W, Q and Kms.
 */
 public static WQKms[] computeWaterlevelData(
-double[]      kms,
+double []     kms,
-double[]      qs,
+double []     qs,
+double []     ws,
 WstValueTable wst,
-boolean       up,
+boolean       up
-Set<Integer>  failed
 ) {
 logger.info("WINFOArtifact.computeWaterlevelData");
-WQKms[] wqkms = new WQKms[qs.length];
+Calculation1 calculation = new Calculation1(kms, qs, ws, up);
-ArrayList<WQKms> results = new ArrayList<WQKms>();
+WQKms[] wqkms = calculation.calculate(wst);
-int referenceIndex = up ? 0 : kms.length-1;
+return wqkms;
-for (int i = 0; i < qs.length; i++) {
-double [] oqs = new double[kms.length];
-double [] ows = new double[kms.length];
-WstValueTable.QPosition qPosition =
-wst.interpolate(qs[i], kms[referenceIndex], kms, ows, oqs);
-if (qPosition != null) {
-results.add(new WQKms(kms, oqs, ows));
-}
-else {
-logger.warn("interpolation failed for q = " + qs[i]);
-failed.add(i);
-}
-}
-return results.toArray(new WQKms[results.size()]);
 }
 /**
 * Returns the data that is computed by a duration curve computation.
 WstValueTable wst = WstValueTableFactory.getTable(r);
 if (wst == null) {
 throw new NullPointerException("No Wst found for selected river.");
 }
-// TODO Introduce a caching mechanism here!
 return computeDurationCurveData(g, wst, locations[0]);
 }
 Object[] obj = MainValuesFactory.getDurationCurveData(gauge);
 int[]    days = (int[]) obj[0];
 double[] qs   = (double[]) obj[1];
-double[] interpolatedW = new double[qs.length];
+Calculation3 calculation = new Calculation3(location, days, qs);
-interpolatedW          = wst.interpolateW(location, qs, interpolatedW);
+// TODO: report the errors to the user.
-WQDay wqday = new WQDay(qs.length);
+return calculation.calculate(wst);
-for (int i = 0; i < days.length; i++) {
-wqday.add(days[i], interpolatedW[i], qs[i]);
-}
-return wqday;
 }
 /**
 * Returns the data that is computed by a discharge curve computation.
 throw new NullPointerException("No Wst found for selected river.");
 }
 WQKms wqkms = computeDischargeCurveData(wst, locations[0]);
-// TODO Introduce a caching mechanism here!
-setComputedDischargeCurveNames(wqkms, locations[0]);
 return wqkms;
-}
-/**
-* Sets the name of the computed discharge curve data.
-*
-* @param wqkms The computed WQKms object.
-* @param l The location used for the computation.
-*/
-public static void setComputedDischargeCurveNames(WQKms wqkms, double l) {
-wqkms.setName(Double.toString(l));
 }
 /**
 * Computes the data used to create computed discharge curves.
 WstValueTable wst,
 double location)
 {
 logger.info("WINFOArtifact.computeDischargeCurveData");
-double[][] wqs = wst.interpolateWQ(location);
+Calculation2 calculation = new Calculation2(location);
-if (wqs == null) {
+WQKms wqkms = calculation.calculate(wst);
-logger.error("Cannot compute discharge curve data.");
-return null;
+// TODO: Report errors to the user
-}
-double[] ws = wqs[0];
-double[] qs = wqs[1];
-WQKms wqkms = new WQKms(ws.length);
-for (int i = 0; i < ws.length; i++) {
-wqkms.add(ws[i], qs[i], location);
-}
 return wqkms;
 }
 private static final double [] getBounds(double [][] segments) {

Mercurial > dive4elements > river

comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java @ 686:3dc61e00385e facets-slt