Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java @ 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 | cbb513a8f548 |
| children | 063b784b60b4 |
comparison
equal
deleted
inserted
replaced
| 2785:f87fcedbfa82 | 2786:f9e62e76ee1f |
|---|---|
| 36 import org.apache.log4j.Logger; | 36 import org.apache.log4j.Logger; |
| 37 | 37 |
| 38 public class FixCalculation | 38 public class FixCalculation |
| 39 extends Calculation | 39 extends Calculation |
| 40 { | 40 { |
| 41 private static Logger logger = Logger.getLogger(FixCalculation.class); | 41 private static Logger log = Logger.getLogger(FixCalculation.class); |
| 42 | 42 |
| 43 protected String river; | 43 protected String river; |
| 44 protected double from; | 44 protected double from; |
| 45 protected double to; | 45 protected double to; |
| 46 protected double step; | 46 protected double step; |
| 226 DeltaWTsKM deltaWTsKM = calculateDeltaWTs( | 226 DeltaWTsKM deltaWTsKM = calculateDeltaWTs( |
| 227 func, | 227 func, |
| 228 overview, | 228 overview, |
| 229 results); | 229 results); |
| 230 | 230 |
| 231 return new CalculationResult(deltaWTsKM, this); | 231 FixResult fr = new FixResult(results, deltaWTsKM); |
| 232 | |
| 233 return new CalculationResult(fr, this); | |
| 232 } | 234 } |
| 233 | 235 |
| 234 public DeltaWTsKM calculateDeltaWTs( | 236 public DeltaWTsKM calculateDeltaWTs( |
| 235 Function function, | 237 Function function, |
| 236 FixingsOverview overview, | 238 FixingsOverview overview, |