Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java @ 9448:d32b11d585cd
CSV-Export bundu.wst fehlvolumen
author | gernotbelger |
---|---|
date | Wed, 22 Aug 2018 11:51:46 +0200 |
parents | e60584f2a531 |
children | 7e1fb8d0cb0d |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java Wed Aug 22 09:00:54 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java Wed Aug 22 11:51:46 2018 +0200 @@ -57,13 +57,11 @@ private final List<ResultRow> rows; - public BezugswstCalculation(final CallContext context) { this.context = context; this.rows = new ArrayList<>(); } - /** * Calculates the result rows of a bundu bzws workflow */ @@ -214,8 +212,7 @@ missFieldCnt++; fieldMissDepths.add(Double.valueOf(h - channelHeight)); fieldMissWidths.add(Double.valueOf(channelWidth / BedHeightValueType.FIELD_LAST_INDEX)); - } - else { + } else { fieldMissDepths.add(Double.valueOf(0.0)); fieldMissWidths.add(Double.valueOf(0.0)); } @@ -272,13 +269,14 @@ vTotal += volumes.get(j - 1); vExcav += volumes.get(j - 1) + areas.get(j - 1) * EXCAVATION_DEPTH; expenses += vExcav * EXPENSE_PER_CBM; - } - else { + } else { volumes.add(Double.valueOf(0.0)); areas.add(Double.valueOf(0.0)); } } this.rows.get(i).putValue(BunduResultType.missVolumeFields, volumes); + // TODO: berechnete masse hier einfügen! + this.rows.get(i).putValue(BunduResultType.missMassFields, volumes); this.rows.get(i).putValue(BunduResultType.missAreaFields, areas); this.rows.get(i).putValue(BunduResultType.missVolumeTotal, vTotal); this.rows.get(i).putValue(BunduResultType.excavationVolume, vExcav); @@ -301,8 +299,7 @@ if (Double.isNaN(kmPrev) || Double.isNaN(kmNext)) { volumes.add(Double.valueOf(0.0)); areas.add(Double.valueOf(0.0)); - } - else { + } else { final double area1 = 0.5 * (areaCurr + areaPrev); final double area2 = 0.5 * (areaCurr + areaNext); volumes.add(Double.valueOf((Math.abs(kmCurr - kmPrev) * 0.5 * area1) + (Math.abs(kmNext - kmCurr) * 0.5 * area2))); @@ -315,8 +312,7 @@ */ private double missingArea(final int rowIndex, final int first, final int last, final int fieldIndex) { if ((first <= rowIndex) && (rowIndex <= last)) - return getFieldValue(rowIndex, BunduResultType.missDepthFields, fieldIndex) - * getFieldValue(rowIndex, BunduResultType.missWidthFields, fieldIndex); + return getFieldValue(rowIndex, BunduResultType.missDepthFields, fieldIndex) * getFieldValue(rowIndex, BunduResultType.missWidthFields, fieldIndex); else return 0.0; }