Mercurial > dive4elements > river
changeset 2786:f9e62e76ee1f
FixA: Return correct data structure from calculation.
flys-artifacts/trunk@4525 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Sat, 26 May 2012 20:13:00 +0000 |
| parents | f87fcedbfa82 |
| children | e63969c173e9 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FitResult.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java |
| diffstat | 4 files changed, 54 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Sat May 26 19:20:59 2012 +0000 +++ b/flys-artifacts/ChangeLog Sat May 26 20:13:00 2012 +0000 @@ -1,3 +1,14 @@ +2012-05-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/model/fixings/FitResult.java: + Removed. Obsolete. + + * src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java: + New. Stores the result of the fixing analysis. + + * src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java: + Return the right structure (FixResult) from the calculation. + 2012-05-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/main/java/de/intevation/flys/artifacts/model/Parameters.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FitResult.java Sat May 26 19:20:59 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -package de.intevation.flys.artifacts.model.fixings; - -import de.intevation.flys.artifacts.model.Parameters; - -import java.io.Serializable; - -import java.util.List; - -public class FitResult -implements Serializable -{ - protected Parameters parameters; - protected List<DeltaWT> deltaWTs; - - public FitResult() { - } - - public FitResult(Parameters parameters, List<DeltaWT> deltaWTs) { - this.parameters = parameters; - this.deltaWTs = deltaWTs; - } - - public Parameters getParameters() { - return parameters; - } - - public void setParameters(Parameters parameters) { - this.parameters = parameters; - } - - public List<DeltaWT> getDeltaWTs() { - return deltaWTs; - } - - public void setDeltaWTs(List<DeltaWT> deltaWTs) { - this.deltaWTs = deltaWTs; - } -} -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java Sat May 26 19:20:59 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java Sat May 26 20:13:00 2012 +0000 @@ -38,7 +38,7 @@ public class FixCalculation extends Calculation { - private static Logger logger = Logger.getLogger(FixCalculation.class); + private static Logger log = Logger.getLogger(FixCalculation.class); protected String river; protected double from; @@ -228,7 +228,9 @@ overview, results); - return new CalculationResult(deltaWTsKM, this); + FixResult fr = new FixResult(results, deltaWTsKM); + + return new CalculationResult(fr, this); } public DeltaWTsKM calculateDeltaWTs(
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java Sat May 26 20:13:00 2012 +0000 @@ -0,0 +1,39 @@ +package de.intevation.flys.artifacts.model.fixings; + +import de.intevation.flys.artifacts.model.Parameters; + +import java.io.Serializable; + +import java.util.List; + +public class FixResult +implements Serializable +{ + protected Parameters parameters; + protected DeltaWTsKM deltaWTsKM; + + public FixResult() { + } + + public FixResult(Parameters parameters, DeltaWTsKM deltaWTsKM) { + this.parameters = parameters; + this.deltaWTsKM = deltaWTsKM; + } + + public Parameters getParameters() { + return parameters; + } + + public void setParameters(Parameters parameters) { + this.parameters = parameters; + } + + public DeltaWTsKM getDeltaWTsKM() { + return deltaWTsKM; + } + + public void setDeltaWTsKM(DeltaWTsKM deltaWTsKM) { + this.deltaWTsKM = deltaWTsKM; + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :