Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthminmax/FlowDepthMinMaxCalculation.java @ 9617:1d4262a68f1f
#12 Minuend/Subtrahend + MergeConflict #19 CollisionCalculation
| author | dnt_bjoernsen <d.tironi@bjoernsen.de> |
|---|---|
| date | Thu, 10 Oct 2019 15:29:02 +0200 |
| parents | 853f2dafc16e |
| children |
comparison
equal
deleted
inserted
replaced
| 9616:cedcee24a21a | 9617:1d4262a68f1f |
|---|---|
| 153 putValue(SInfoResultType.flowdepthmax, maxFlowDepth). // | 153 putValue(SInfoResultType.flowdepthmax, maxFlowDepth). // |
| 154 putValue(SInfoResultType.waterlevel, wst). // | 154 putValue(SInfoResultType.waterlevel, wst). // |
| 155 putValue(SInfoResultType.discharge, discharge). // | 155 putValue(SInfoResultType.discharge, discharge). // |
| 156 putValue(GeneralResultType.waterlevelLabel, waterlevelLabel). // | 156 putValue(GeneralResultType.waterlevelLabel, waterlevelLabel). // |
| 157 putValue(GeneralResultType.gaugeLabel, gaugeLabel). // | 157 putValue(GeneralResultType.gaugeLabel, gaugeLabel). // |
| 158 putValue(SInfoResultType.minBedHeight, minBedHeightValue). // | |
| 159 putValue(SInfoResultType.maxBedHeight, maxBedHeightValue). // | |
| 158 putValue(SInfoResultType.meanBedHeight, meanBedHeight). // | 160 putValue(SInfoResultType.meanBedHeight, meanBedHeight). // |
| 159 putValue(SInfoResultType.soundingLabel, soundingLabel). // | 161 putValue(SInfoResultType.soundingLabel, soundingLabel). // |
| 160 putValue(GeneralResultType.location, location); | 162 putValue(GeneralResultType.location, location); |
| 161 rows.add(row); | 163 rows.add(row); |
| 162 } | 164 } |