Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhcalculation/BedQualityD50KmValueFinder.java @ 9532:8e6b9cb9486a
Fixed BedQuality finder
| author | gernotbelger |
|---|---|
| date | Tue, 02 Oct 2018 18:19:44 +0200 |
| parents | 23d97d60b889 |
| children | 8a84c9fef8ec |
comparison
equal
deleted
inserted
replaced
| 9531:267ac3012150 | 9532:8e6b9cb9486a |
|---|---|
| 21 import org.apache.log4j.Logger; | 21 import org.apache.log4j.Logger; |
| 22 import org.dive4elements.river.artifacts.math.Utils; | 22 import org.dive4elements.river.artifacts.math.Utils; |
| 23 import org.dive4elements.river.artifacts.model.Calculation; | 23 import org.dive4elements.river.artifacts.model.Calculation; |
| 24 import org.dive4elements.river.artifacts.model.DateRange; | 24 import org.dive4elements.river.artifacts.model.DateRange; |
| 25 import org.dive4elements.river.artifacts.sinfo.tkhstate.BedQualityD50TimeRangeConfig; | 25 import org.dive4elements.river.artifacts.sinfo.tkhstate.BedQualityD50TimeRangeConfig; |
| 26 import org.dive4elements.river.artifacts.sinfo.tkhstate.BedQualityD50TimeRangeConfig.BedQualityParseException; | |
| 27 import org.dive4elements.river.artifacts.sinfo.tkhstate.TsvHelper.TsvReaderException; | 26 import org.dive4elements.river.artifacts.sinfo.tkhstate.TsvHelper.TsvReaderException; |
| 28 import org.dive4elements.river.backend.SedDBSessionHolder; | 27 import org.dive4elements.river.backend.SedDBSessionHolder; |
| 29 import org.dive4elements.river.model.River; | 28 import org.dive4elements.river.model.River; |
| 30 import org.hibernate.SQLQuery; | 29 import org.hibernate.SQLQuery; |
| 31 import org.hibernate.Session; | 30 import org.hibernate.Session; |
| 95 /** | 94 /** |
| 96 * Sohlbeschaffenheit (D50 Korndurchmesser aus Seddb) | 95 * Sohlbeschaffenheit (D50 Korndurchmesser aus Seddb) |
| 97 * Abhängig von Peiljahr | 96 * Abhängig von Peiljahr |
| 98 * | 97 * |
| 99 * @param problems | 98 * @param problems |
| 100 * @throws BedQualityParseException | |
| 101 * @throws TsvReaderException | 99 * @throws TsvReaderException |
| 102 * @throws IOException | 100 * @throws IOException |
| 103 */ | 101 */ |
| 104 public static BedQualityD50KmValueFinder loadBedMeasurements(final Calculation problems, final River river, final DoubleRange kmRange, | 102 public static BedQualityD50KmValueFinder loadBedMeasurements(final Calculation problems, final River river, final DoubleRange kmRange, |
| 105 final int soundingYear) throws BedQualityParseException, IOException, TsvReaderException { | 103 final int soundingYear) { |
| 106 | 104 |
| 107 final DateRange rangeFromConfigFile = BedQualityD50TimeRangeConfig.getDefaults(river, soundingYear, problems); | 105 final DateRange dateRange = BedQualityD50TimeRangeConfig.getDefaults(river, soundingYear, problems); |
| 108 final DateRange dateRange = rangeFromConfigFile != null ? rangeFromConfigFile : new DateRange(MIN_DATE, MAX_DATE); | 106 if (dateRange == null) |
| 107 return null; | |
| 108 | |
| 109 return loadBedMeasurements(problems, river, kmRange, dateRange, soundingYear); | 109 return loadBedMeasurements(problems, river, kmRange, dateRange, soundingYear); |
| 110 } | 110 } |
| 111 | 111 |
| 112 private static BedQualityD50KmValueFinder loadBedMeasurements(final Calculation problems, final River river, final DoubleRange kmRange, | 112 private static BedQualityD50KmValueFinder loadBedMeasurements(final Calculation problems, final River river, final DoubleRange kmRange, |
| 113 final DateRange dateRange, final int soundingYear) { | 113 final DateRange dateRange, final int soundingYear) { |