Mercurial > dive4elements > river
diff 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 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityResult.java Tue Mar 17 18:52:00 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityResult.java Wed Mar 18 18:42:08 2015 +0100 @@ -18,53 +18,44 @@ implements Serializable { - protected List<BedDiameterResult> bedResults; - protected List<BedloadDiameterResult> bedloadResults; - protected List<BedParametersResult> bedParameters; + protected LinkedList<BedQualityResultValue> values; protected DateRange dateRange; public BedQualityResult () { - bedResults = new LinkedList<BedDiameterResult>(); - bedloadResults = new LinkedList<BedloadDiameterResult>(); - bedParameters = new LinkedList<BedParametersResult>(); + values = new LinkedList<BedQualityResultValue>(); }; public BedQualityResult ( - List<BedDiameterResult> bedResults, - List<BedloadDiameterResult> bedloadResults, - List<BedParametersResult> bedParameters, + LinkedList<BedQualityResultValue> values, DateRange range ) { this.dateRange = range; - this.bedResults = bedResults; - this.bedloadResults = bedloadResults; - this.bedParameters = bedParameters; - } - - public BedParametersResult[] getParameters() { - return bedParameters.toArray( - new BedParametersResult[bedParameters.size()]); - } - - public BedDiameterResult[] getBedResults() { - return bedResults.toArray(new BedDiameterResult[bedResults.size()]); + this.values = values; } - public BedloadDiameterResult[] getBedloadResults() { - return bedloadResults.toArray( - new BedloadDiameterResult[bedloadResults.size()]); + public void add(BedQualityResultValue[] values) { + for (BedQualityResultValue value: values) { + add(value); + } } - public void add(BedloadDiameterResult result) { - bedloadResults.add(result); + public void add(BedQualityResultValue value) { + /* Add first is here to mimic the result sorting before + * a refactorization.*/ + values.addFirst(value); } - public void add(BedDiameterResult result) { - bedResults.add(result); + public List<BedQualityResultValue> getValues() { + return values; } - public void add(BedParametersResult result) { - bedParameters.add(result); + public BedQualityResultValue getValue(String name, String type) { + for (BedQualityResultValue value: values) { + if (name.equals(value.getName()) && type.equals(value.getType())) { + return value; + } + } + return null; } public DateRange getDateRange() {