Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalculation.java @ 9582:8b457ca70512
Punkt 8.1 Grundberührungen Header
author | gernotbelger |
---|---|
date | Wed, 09 Jan 2019 14:47:21 +0100 |
parents | 0c114309d2a0 |
children | f2473dc34535 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalculation.java Tue Jan 08 17:34:53 2019 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionCalculation.java Wed Jan 09 14:47:21 2019 +0100 @@ -114,8 +114,7 @@ final int toYear, final boolean isEpoch) { for (final CollisionAggregateValue aggregate : CollisionAggregateValue.getValuesByKm(river, fromKm, toKm, fromYear, toYear)) { rows.add(ResultRow.create().putValue(GeneralResultType.station, aggregate.getStation()) - .putValue(SInfoResultType.years, yearsToString(isEpoch, fromYear, toYear)) - .putValue(SInfoResultType.collisionCount, aggregate.getCount())); + .putValue(SInfoResultType.years, yearsToString(isEpoch, fromYear, toYear)).putValue(SInfoResultType.collisionCount, aggregate.getCount())); } } @@ -136,9 +135,8 @@ /** * Calculates the collision details for a km range of a river and a year, and adds them to a ResultRow collection */ - private void calculateDetails(final Collection<ResultRow> rows, final River river, final double fromKm, final double toKm, - final int year, final Map<String, GaugeDischargeValuesFinder> qFinders, final Map<String, GaugeMainValueFinder> zoneFinders, - final Calculation problems) { + private void calculateDetails(final Collection<ResultRow> rows, final River river, final double fromKm, final double toKm, final int year, + final Map<String, GaugeDischargeValuesFinder> qFinders, final Map<String, GaugeMainValueFinder> zoneFinders, final Calculation problems) { for (final CollisionValue collision : CollisionValue.getValues(river, fromKm, toKm, DateUtil.getStartDateFromYear(year), DateUtil.getEndDateFromYear(year))) { @@ -147,10 +145,8 @@ final double qOut = Double.isInfinite(q) ? Double.NaN : q; final String zone = getZone(zoneFinders, gaugeName, q, river, problems); rows.add(ResultRow.create().putValue(GeneralResultType.station, collision.getStation()) - .putValue(GeneralResultType.dateShort, collision.getEventDate()) - .putValue(SInfoResultType.collisionGaugeW, collision.getGaugeW()) - .putValue(GeneralResultType.gaugeLabelCm, gaugeName) - .putValue(SInfoResultType.dischargeLong, qOut) + .putValue(GeneralResultType.dateShort, collision.getEventDate()).putValue(SInfoResultType.collisionGaugeW, collision.getGaugeW()) + .putValue(GeneralResultType.gaugeLabel, gaugeName).putValue(SInfoResultType.dischargeLong, qOut) .putValue(SInfoResultType.dischargeZone, zone)); } } @@ -158,8 +154,8 @@ /** * Gets the discharge of a gauge and a W */ - private double getQ(final Map<String, GaugeDischargeValuesFinder> qFinders, final String gaugeName, final double w, - final River river, final Calculation problems) { + private double getQ(final Map<String, GaugeDischargeValuesFinder> qFinders, final String gaugeName, final double w, final River river, + final Calculation problems) { // Find the gauge and load its discharge table, if not already in the map final String gnKey = gaugeName.toLowerCase(); if (!qFinders.containsKey(gnKey)) @@ -173,8 +169,8 @@ /** * Gets the main value zone name of a gauge and a Q */ - private String getZone(final Map<String, GaugeMainValueFinder> zoneFinders, final String gaugeName, final double q, - final River river, final Calculation problems) { + private String getZone(final Map<String, GaugeMainValueFinder> zoneFinders, final String gaugeName, final double q, final River river, + final Calculation problems) { // Find the gauge and load its main value list, if not already in the map final String gnKey = gaugeName.toLowerCase(); if (!zoneFinders.containsKey(gnKey))