Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation2.java @ 709:3b7e9ddf6bb1
New model to transport data and error reports of calculations.
flys-artifacts/trunk@2165 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Mon, 20 Jun 2011 12:32:32 +0000 |
| parents | a95f34f1f39a |
| children | 2898b1ff6013 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation2.java Sat Jun 18 20:20:34 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation2.java Mon Jun 20 12:32:32 2011 +0000 @@ -18,7 +18,7 @@ this.km = km; } - public WQKms calculate(WstValueTable wst) { + public CalculationResult calculate(WstValueTable wst) { logger.debug("Calculation2.calculate"); @@ -26,7 +26,8 @@ if (wqs == null || wqs[0].length == 0) { logger.debug("Cannot compute discharge curve data."); - return null; + addProblem("Cannot compute discharge curve data."); + return new CalculationResult(new WQKms[0], this); } double [] ws = wqs[0]; @@ -42,7 +43,7 @@ wqkms.removeNaNs(); } - return wqkms; + return new CalculationResult(new WQKms[] { wqkms }, this); } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :