dive4elements/river: artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java comparison

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java @ 9130:f61bc0c63188

WQSelect can now handle distance-only data

author	gernotbelger
date	Wed, 06 Jun 2018 14:16:28 +0200
parents	e3519c3e7a0a
children	3f49835a00c3

comparison

equal deleted inserted replaced

-:28eec75415d8
+:f61bc0c63188
 import org.dive4elements.artifacts.common.utils.StringUtils;
 import org.dive4elements.river.artifacts.access.Calculation4Access;
 import org.dive4elements.river.artifacts.access.RangeAccess;
+import org.dive4elements.river.artifacts.access.RiverAccess;
 import org.dive4elements.river.artifacts.access.ComputationRangeAccess;
 import org.dive4elements.river.artifacts.geom.Lines;
 import org.dive4elements.river.artifacts.model.Calculation1;
 import org.dive4elements.river.artifacts.model.Calculation2;
 import org.dive4elements.river.artifacts.model.WstValueTableFactory;
 import org.dive4elements.river.artifacts.model.extreme.ExtremeResult;
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
-import org.dive4elements.river.artifacts.states.LocationDistanceSelect;
 import org.dive4elements.river.model.DischargeTable;
 import org.dive4elements.river.model.FastCrossSectionLine;
 import org.dive4elements.river.model.Gauge;
 import org.dive4elements.river.model.River;
 */
 public CalculationResult getWaterlevelData() {
 return this.getWaterlevelData(null);
 }
-protected CalculationResult getDischargeLongitudinalSectionData() {
+private CalculationResult getDischargeLongitudinalSectionData() {
 // TODO: This caluclation should be cached as it is quite expensive.
 return new Calculation4(new Calculation4Access(this)).calculate();
 }
 /**
 log.debug("WINFOArtifact.getWaterlevelData");
 String calculationMode = getDataAsString("calculation_mode");
 // If this WINFO-Artifact has a calculation trait.
-if (calculationMode != null) {
+if (calculationMode != null)
-if (calculationMode.equals("calc.discharge.longitudinal.section")
+{
-) {
+if (calculationMode.equals("calc.discharge.longitudinal.section"))
 return getDischargeLongitudinalSectionData();
-}
-else if (calculationMode.equals("calc.extreme.curve")) {
+if (calculationMode.equals("calc.extreme.curve"))
-return (CalculationResult)
+return (CalculationResult)this.compute(context, ComputeType.ADVANCE, false);
-this.compute(context, ComputeType.ADVANCE, false);
-}
+if (calculationMode.equals("calc.w.differences"))
-else if (calculationMode.equals("calc.w.differences")) {
+return (CalculationResult)this.compute(context, ComputeType.ADVANCE, true);
-return (CalculationResult)
-this.compute(context, ComputeType.ADVANCE, true);
+log.warn("Unhandled calculation_mode " + calculationMode);
 }
-else {
-log.warn("Unhandled calculation_mode " + calculationMode);
-}
-}
 // Otherwise get it from parameterization.
-River river = RiverUtils.getRiver(this);
+// TODO: wrong comment: now always a waterlevle computation is executed; actually there is a calc_mode for that, why dont check?
-if (river == null) {
+return computeWaterlevelData();
+}
+/** Execu5tes the calculation of 'waterlevel', fetches all input data from this artifact */
+private CalculationResult computeWaterlevelData() {
+final double[] kms = new ComputationRangeAccess(this).getKms();
+if (kms == null)
+return error(new WQKms[0], "no.kms.selected");
+return computeWaterlevelData(kms);
+}
+/**
+* Execu5tes the calculation of 'waterlevel'.
+* Allows to override the stations for which the calculation is done. All other inputs are fetched from this artifact.
+*/
+public final CalculationResult computeWaterlevelData(final double kms[]) {
+final River river = new RiverAccess(this).getRiver();
+if (river == null)
 return error(new WQKms[0], "no.river.selected");
-}
-double[] kms = getKms();
-if (kms == null) {
-return error(new WQKms[0], "no.kms.selected");
-}
 double[] qs   = getQs();
 double[] ws   = null;
-boolean  qSel = true;
 Calculation report = new Calculation();
 if (qs == null) {
 log.debug("Determine Q values based on a set of W values.");
-qSel = false;
 ws   = getWs();
 double [][] qws = getQsForWs(ws, report);
 if (qws == null || qws.length == 0) {
 return error(new WQKms[0], "converting.ws.to.qs.failed");
 }
 log.debug(
 "reference gauge: " + gauge.getName() + " (km " + refKm + ")");
 }
 return computeWaterlevelData(kms, qs, ws, wst, refKm, report);
 }
 /**
 * Computes the data of a waterlevel computation based on the interpolation
 * in WstValueTable.
 *
 * @param qs The discharge values.
 * @param wst The WstValueTable used for the interpolation.
 *
 * @return an array of data triples that consist of W, Q and Kms.
 */
-public static CalculationResult computeWaterlevelData(
+private static CalculationResult computeWaterlevelData(
 double []     kms,
 double []     qs,
 double []     ws,
 WstValueTable wst,
 double        refKm,
 * @param gauge The selected gauge.
 * @param location The selected location.
 *
 * @return the computed data.
 */
-public static CalculationResult computeDurationCurveData(
+private static CalculationResult computeDurationCurveData(
 Gauge         gauge,
 WstValueTable wst,
 double        location)
 {
 log.info("WINFOArtifact.computeDurationCurveData");
 * @param location The location where the computation should be based on.
 *
 * @return an object that contains tuples of W/Q values at the specified
 * location.
 */
-public static CalculationResult computeDischargeCurveData(
+private static CalculationResult computeDischargeCurveData(
 WstValueTable wst,
 double location)
 {
 log.info("WINFOArtifact.computeDischargeCurveData");
 /**
 * Get corrected waterline against surface/profile.
 */
-public Lines.LineData waterLineC(int idx, FastCrossSectionLine csl) {
+private Lines.LineData waterLineC(int idx, FastCrossSectionLine csl) {
 List<Point2D> points = csl.getPoints();
 WQKms[] wqckms = (WQKms[])
 getDischargeLongitudinalSectionData().getData();
 *
 * @param ws An array of W values.
 *
 * @return an array of Q values.
 */
-public double [][] getQsForWs(double[] ws, Calculation report) {
+private double [][] getQsForWs(double[] ws, Calculation report) {
 if (ws == null) {
 log.error("getQsForWs: ws == null");
 return null;
 }
 return new double[] { from, to };
 }
 /**
-* Returns the selected Kms.
-*
-* @return the selected kms.
-*/
-public double[] getKms() {
-return new ComputationRangeAccess(this).getKms();
-}
-public double [] getFromToStep() {
-return new ComputationRangeAccess(this).getFromToStep();
-}
-/**
 * This method returns the Q values.
 *
 * @return the selected Q values or null, if no Q values are selected.
 */
 public double[] getQs() {

Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java @ 9130:f61bc0c63188