Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/SQCurveFacet.java @ 3552:1df6984628c3
S/Q: Extented the result data model of the S/Q calculation to
store the curve coefficients for each iteration step
of the outlier elimination.
flys-artifacts/trunk@5146 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Fri, 27 Jul 2012 12:36:09 +0000 |
| parents | 8af1111af180 |
| children |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/SQCurveFacet.java Fri Jul 27 08:36:24 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/SQCurveFacet.java Fri Jul 27 12:36:09 2012 +0000 @@ -53,41 +53,42 @@ public Object getData(Artifact artifact, CallContext context) { log.debug("SQCurveFacet.getData"); - if (artifact instanceof FLYSArtifact) { - FLYSArtifact flys = (FLYSArtifact) artifact; - - CalculationResult res = (CalculationResult) flys.compute( - context, ComputeType.ADVANCE, false); - - SQResult[] results = (SQResult[]) res.getData(); - SQFractionResult result = results[index].getFraction(fractionIdx); - - Function func = FunctionFactory.getInstance().getFunction(FUNCTION); - String[] paramNames = func.getParameterNames(); - - Parameters params = result.getParameters(); - - if (params == null) { - log.debug("no parameters found"); - return null; - } - - double[] coeffs = params.get(0, paramNames); - - if (log.isDebugEnabled()) { - for (int i = 0, N = paramNames.length; i < N; i++) { - log.debug("retrieved parameter " + paramNames[i] + - " = " + coeffs[i]); - } - } - - de.intevation.flys.artifacts.math.Function mf = - func.instantiate(coeffs); - - return new SQFunction(mf, result.getMinQ(), result.getMaxQ()); + if (!(artifact instanceof FLYSArtifact)) { + return null; } - return null; + FLYSArtifact flys = (FLYSArtifact) artifact; + + CalculationResult res = (CalculationResult) flys.compute( + context, ComputeType.ADVANCE, false); + + SQResult[] results = (SQResult[]) res.getData(); + SQFractionResult result = results[index].getFraction(fractionIdx); + + Parameters params = result.getParameters(); + + if (params == null) { + log.debug("no parameters found"); + return null; + } + + Function func = FunctionFactory.getInstance().getFunction(FUNCTION); + String[] paramNames = func.getParameterNames(); + + double [] coeffs = params.get(0, paramNames); + + if (log.isDebugEnabled()) { + for (int i = 0, N = paramNames.length; i < N; i++) { + log.debug("retrieved parameter " + paramNames[i] + + " = " + coeffs[i]); + } + } + + de.intevation.flys.artifacts.math.Function mf = + func.instantiate(coeffs); + + double [] extent = result.getQExtent(); + return new SQFunction(mf, extent[0], extent[1]); }