Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityResult.java @ 8587:07c9ac22f611
(issue1755) Generalise BedQuality result handling
The bedquality calculation now produces a result for each time period
which has BedQualityResultValues for each specific result type.
Formally this was split up in density, porosity and diameter classes
with some bedload diameter classes mixed in for extra fun.
The intent of this commit is to allow more shared code and generic
access patterns to the BedQuality results.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Wed, 18 Mar 2015 18:42:08 +0100 |
| parents | af13ceeba52a |
| children | 3c78fc83fc6d |
comparison
equal
deleted
inserted
replaced
| 8586:19fde13e2db4 | 8587:07c9ac22f611 |
|---|---|
| 16 | 16 |
| 17 public class BedQualityResult | 17 public class BedQualityResult |
| 18 implements Serializable | 18 implements Serializable |
| 19 { | 19 { |
| 20 | 20 |
| 21 protected List<BedDiameterResult> bedResults; | 21 protected LinkedList<BedQualityResultValue> values; |
| 22 protected List<BedloadDiameterResult> bedloadResults; | |
| 23 protected List<BedParametersResult> bedParameters; | |
| 24 protected DateRange dateRange; | 22 protected DateRange dateRange; |
| 25 | 23 |
| 26 public BedQualityResult () { | 24 public BedQualityResult () { |
| 27 bedResults = new LinkedList<BedDiameterResult>(); | 25 values = new LinkedList<BedQualityResultValue>(); |
| 28 bedloadResults = new LinkedList<BedloadDiameterResult>(); | |
| 29 bedParameters = new LinkedList<BedParametersResult>(); | |
| 30 }; | 26 }; |
| 31 | 27 |
| 32 public BedQualityResult ( | 28 public BedQualityResult ( |
| 33 List<BedDiameterResult> bedResults, | 29 LinkedList<BedQualityResultValue> values, |
| 34 List<BedloadDiameterResult> bedloadResults, | |
| 35 List<BedParametersResult> bedParameters, | |
| 36 DateRange range | 30 DateRange range |
| 37 ) { | 31 ) { |
| 38 this.dateRange = range; | 32 this.dateRange = range; |
| 39 this.bedResults = bedResults; | 33 this.values = values; |
| 40 this.bedloadResults = bedloadResults; | |
| 41 this.bedParameters = bedParameters; | |
| 42 } | 34 } |
| 43 | 35 |
| 44 public BedParametersResult[] getParameters() { | 36 public void add(BedQualityResultValue[] values) { |
| 45 return bedParameters.toArray( | 37 for (BedQualityResultValue value: values) { |
| 46 new BedParametersResult[bedParameters.size()]); | 38 add(value); |
| 39 } | |
| 47 } | 40 } |
| 48 | 41 |
| 49 public BedDiameterResult[] getBedResults() { | 42 public void add(BedQualityResultValue value) { |
| 50 return bedResults.toArray(new BedDiameterResult[bedResults.size()]); | 43 /* Add first is here to mimic the result sorting before |
| 44 * a refactorization.*/ | |
| 45 values.addFirst(value); | |
| 51 } | 46 } |
| 52 | 47 |
| 53 public BedloadDiameterResult[] getBedloadResults() { | 48 public List<BedQualityResultValue> getValues() { |
| 54 return bedloadResults.toArray( | 49 return values; |
| 55 new BedloadDiameterResult[bedloadResults.size()]); | |
| 56 } | 50 } |
| 57 | 51 |
| 58 public void add(BedloadDiameterResult result) { | 52 public BedQualityResultValue getValue(String name, String type) { |
| 59 bedloadResults.add(result); | 53 for (BedQualityResultValue value: values) { |
| 60 } | 54 if (name.equals(value.getName()) && type.equals(value.getType())) { |
| 61 | 55 return value; |
| 62 public void add(BedDiameterResult result) { | 56 } |
| 63 bedResults.add(result); | 57 } |
| 64 } | 58 return null; |
| 65 | |
| 66 public void add(BedParametersResult result) { | |
| 67 bedParameters.add(result); | |
| 68 } | 59 } |
| 69 | 60 |
| 70 public DateRange getDateRange() { | 61 public DateRange getDateRange() { |
| 71 return dateRange; | 62 return dateRange; |
| 72 } | 63 } |