Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java @ 5914:1058b3436dad
D4E river artifacts: Removed historical discharge calculation from WINFO artifact and use access instead.
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Tue, 07 May 2013 17:32:33 +0200 |
parents | 59ff03ff48f1 |
children | c35323148b98 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java Tue May 07 12:47:05 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java Tue May 07 17:32:33 2013 +0200 @@ -28,7 +28,6 @@ import org.dive4elements.river.artifacts.model.Calculation3; import org.dive4elements.river.artifacts.model.Calculation4; import org.dive4elements.river.artifacts.model.Calculation5; -import org.dive4elements.river.artifacts.model.Calculation6; import org.dive4elements.river.artifacts.model.Calculation; import org.dive4elements.river.artifacts.model.CalculationResult; import org.dive4elements.river.artifacts.model.DischargeTables; @@ -536,29 +535,6 @@ } - public CalculationResult getHistoricalDischargeData() { - Gauge gauge = RiverUtils.getReferenceGauge(this); - String rawTimerange = getDataAsString("year_range"); - String rawValues = getDataAsString("historical_values"); - int mode = getDataAsInteger("historical_mode"); - - long[] timerange = RiverUtils.longArrayFromString(rawTimerange); - double[] values = RiverUtils.doubleArrayFromString(rawValues); - - Calendar start = new GregorianCalendar(); - start.setTimeInMillis(timerange[0]); - Calendar end = new GregorianCalendar(); - end.setTimeInMillis(timerange[1]); - - Calculation6 calc = new Calculation6( - mode, - new long[] { start.getTimeInMillis(), end.getTimeInMillis() }, - values); - - return calc.calculate(gauge); - } - - /** * Get corrected waterline against surface/profile. */ @@ -574,8 +550,6 @@ // Find W/C at km, linear naive approach. WQCKms triple = (WQCKms) wqckms[idx-1]; - int old_idx = 0; - if (triple.size() == 0) { logger.warn("Calculation of c/waterline is empty."); return Lines.createWaterLines(points, 0.0f);