# HG changeset patch # User Sascha L. Teichmann # Date 1342711008 0 # Node ID e3c7a3228bc2007429ae0f83093854b9a3ec0a5d # Parent 1bb6fb621167fc3f8e79e31e9a18f2606d7f6c16 FixA: Renamed FixResult to FixAnalysisResult. flys-artifacts/trunk@5068 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Thu Jul 19 14:59:16 2012 +0000 +++ b/flys-artifacts/ChangeLog Thu Jul 19 15:16:48 2012 +0000 @@ -1,3 +1,28 @@ +2012-07-19 Sascha L. Teichmann + + * src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java: + Removed. + + * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisResult.java: + Re-added here. + + * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalDeviationFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalReferenceFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java, + src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java, + src/main/java/de/intevation/flys/exports/fixings/ParametersExporter.java, + src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java: + Adjusted. + 2012-07-19 Sascha L. Teichmann * src/main/java/de/intevation/flys/artifacts/model/fixings/FixRealizingCalculation.java: diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java Thu Jul 19 14:59:16 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisCalculation.java Thu Jul 19 15:16:48 2012 +0000 @@ -270,7 +270,7 @@ referenced.sort(); analysisPeriods.sort(); - FixResult fr = new FixResult( + FixAnalysisResult fr = new FixAnalysisResult( results, referenced, outliers, analysisPeriods); diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java Thu Jul 19 14:59:16 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java Thu Jul 19 15:16:48 2012 +0000 @@ -68,7 +68,7 @@ ComputeType.ADVANCE, false); - FixResult result = (FixResult) res.getData(); + FixAnalysisResult result = (FixAnalysisResult) res.getData(); double currentKm = ((Double)context.getContextValue("currentKm")).doubleValue(); diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java Thu Jul 19 14:59:16 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java Thu Jul 19 15:16:48 2012 +0000 @@ -69,7 +69,7 @@ ComputeType.ADVANCE, false); - FixResult result = (FixResult) res.getData(); + FixAnalysisResult result = (FixAnalysisResult) res.getData(); double currentKm = ((Double)context.getContextValue("currentKm")).doubleValue(); diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisResult.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisResult.java Thu Jul 19 15:16:48 2012 +0000 @@ -0,0 +1,79 @@ +package de.intevation.flys.artifacts.model.fixings; + +import de.intevation.flys.artifacts.model.Parameters; + +import de.intevation.flys.utils.KMIndex; + +import java.io.Serializable; + +public class FixAnalysisResult +implements Serializable +{ + protected Parameters parameters; + protected KMIndex referenced; + protected KMIndex outliers; + protected KMIndex analysisPeriods; + + public FixAnalysisResult() { + } + + public FixAnalysisResult( + Parameters parameters, + KMIndex referenced, + KMIndex outliers, + KMIndex analysisPeriods + ) { + this.parameters = parameters; + this.referenced = referenced; + this.outliers = outliers; + this.analysisPeriods = analysisPeriods; + } + + public int getUsedSectorsInAnalysisPeriods() { + int result = 0; + for (KMIndex.Entry entry: analysisPeriods) { + for (AnalysisPeriod period: entry.getValue()) { + for (int i = 0; i < 4; ++i) { + result |= period.getQSectorAverage(i) != null + ? (1 << i) + : 0; + } + // XXX: Stop early on result == ~(~0 << 4)) ? + } + } + return result; + } + + public Parameters getParameters() { + return parameters; + } + + public void setParameters(Parameters parameters) { + this.parameters = parameters; + } + + public KMIndex getAnalysisPeriods() { + return analysisPeriods; + } + + public void setAnalysisPeriods(KMIndex analysisPeriods) { + this.analysisPeriods = analysisPeriods; + } + + public KMIndex getReferenced() { + return referenced; + } + + public void setReferenced(KMIndex referenced) { + this.referenced = referenced; + } + + public KMIndex getOutliers() { + return outliers; + } + + public void setOutliers(KMIndex outliers) { + this.outliers = outliers; + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java Thu Jul 19 14:59:16 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java Thu Jul 19 15:16:48 2012 +0000 @@ -67,7 +67,7 @@ ComputeType.ADVANCE, false); - FixResult result = (FixResult) res.getData(); + FixAnalysisResult result = (FixAnalysisResult) res.getData(); double currentKm = ((Double)context.getContextValue("currentKm")).doubleValue(); diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java Thu Jul 19 14:59:16 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java Thu Jul 19 15:16:48 2012 +0000 @@ -75,7 +75,7 @@ ComputeType.ADVANCE, false); - FixResult result = (FixResult) res.getData(); + FixAnalysisResult result = (FixAnalysisResult) res.getData(); double currentKm = ((Double)context.getContextValue("currentKm")).doubleValue(); diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java Thu Jul 19 14:59:16 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java Thu Jul 19 15:16:48 2012 +0000 @@ -28,6 +28,7 @@ /** House logger. */ private static Logger logger = Logger.getLogger(FixDeviationFacet.class); + public static final String [] STD_DEV_COLUMN = { "std-dev" }; /** Trivial Constructor. */ public FixDeviationFacet() { @@ -66,16 +67,16 @@ ComputeType.ADVANCE, false); - FixResult result = (FixResult) res.getData(); + FixAnalysisResult result = (FixAnalysisResult) res.getData(); double currentKm = ((Double)context.getContextValue("currentKm")).doubleValue(); Parameters params = result.getParameters(); double[] stdDev = - params.interpolate("km", currentKm, new String[] {"std-dev"}); + params.interpolate("km", currentKm, STD_DEV_COLUMN); - if(stdDev == null) { + if (stdDev == null) { logger.warn("getData: stdDev == null at km " + currentKm); return null; } diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java Thu Jul 19 14:59:16 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java Thu Jul 19 15:16:48 2012 +0000 @@ -70,7 +70,7 @@ ComputeType.ADVANCE, false); - FixResult result = (FixResult) res.getData(); + FixAnalysisResult result = (FixAnalysisResult) res.getData(); KMIndex kmPeriods = result.getAnalysisPeriods(); diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalDeviationFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalDeviationFacet.java Thu Jul 19 14:59:16 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalDeviationFacet.java Thu Jul 19 15:16:48 2012 +0000 @@ -71,7 +71,7 @@ ComputeType.ADVANCE, false); - FixResult result = (FixResult) res.getData(); + FixAnalysisResult result = (FixAnalysisResult) res.getData(); KMIndex kmPeriods = result.getAnalysisPeriods(); diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalReferenceFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalReferenceFacet.java Thu Jul 19 14:59:16 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalReferenceFacet.java Thu Jul 19 15:16:48 2012 +0000 @@ -71,7 +71,7 @@ ComputeType.ADVANCE, false); - FixResult result = (FixResult) res.getData(); + FixAnalysisResult result = (FixAnalysisResult) res.getData(); KMIndex kmReference = result.getReferenced(); diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java Thu Jul 19 14:59:16 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java Thu Jul 19 15:16:48 2012 +0000 @@ -67,7 +67,7 @@ ComputeType.ADVANCE, false); - FixResult result = (FixResult) res.getData(); + FixAnalysisResult result = (FixAnalysisResult) res.getData(); double currentKm = ((Double)context.getContextValue("currentKm")).doubleValue(); diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java Thu Jul 19 14:59:16 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java Thu Jul 19 15:16:48 2012 +0000 @@ -69,7 +69,7 @@ ComputeType.ADVANCE, false); - FixResult result = (FixResult) res.getData(); + FixAnalysisResult result = (FixAnalysisResult) res.getData(); double currentKm = ((Double)context.getContextValue("currentKm")).doubleValue(); diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixResult.java Thu Jul 19 14:59:16 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -package de.intevation.flys.artifacts.model.fixings; - -import de.intevation.flys.artifacts.model.Parameters; - -import de.intevation.flys.utils.KMIndex; - -import java.io.Serializable; - -public class FixResult -implements Serializable -{ - protected Parameters parameters; - protected KMIndex referenced; - protected KMIndex outliers; - protected KMIndex analysisPeriods; - - public FixResult() { - } - - public FixResult( - Parameters parameters, - KMIndex referenced, - KMIndex outliers, - KMIndex analysisPeriods - ) { - this.parameters = parameters; - this.referenced = referenced; - this.outliers = outliers; - this.analysisPeriods = analysisPeriods; - } - - public int getUsedSectorsInAnalysisPeriods() { - int result = 0; - for (KMIndex.Entry entry: analysisPeriods) { - for (AnalysisPeriod period: entry.getValue()) { - for (int i = 0; i < 4; ++i) { - result |= period.getQSectorAverage(i) != null - ? (1 << i) - : 0; - } - // XXX: Stop early on result == ~(~0 << 4)) ? - } - } - return result; - } - - public Parameters getParameters() { - return parameters; - } - - public void setParameters(Parameters parameters) { - this.parameters = parameters; - } - - public KMIndex getAnalysisPeriods() { - return analysisPeriods; - } - - public void setAnalysisPeriods(KMIndex analysisPeriods) { - this.analysisPeriods = analysisPeriods; - } - - public KMIndex getReferenced() { - return referenced; - } - - public void setReferenced(KMIndex referenced) { - this.referenced = referenced; - } - - public KMIndex getOutliers() { - return outliers; - } - - public void setOutliers(KMIndex outliers) { - this.outliers = outliers; - } -} -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java Thu Jul 19 14:59:16 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java Thu Jul 19 15:16:48 2012 +0000 @@ -68,7 +68,7 @@ ComputeType.ADVANCE, false); - FixResult result = (FixResult) res.getData(); + FixAnalysisResult result = (FixAnalysisResult) res.getData(); double currentKm = ((Double)context.getContextValue("currentKm")).doubleValue(); diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java Thu Jul 19 14:59:16 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java Thu Jul 19 15:16:48 2012 +0000 @@ -25,7 +25,7 @@ import de.intevation.flys.artifacts.model.fixings.FixLongitudinalReferenceFacet; import de.intevation.flys.artifacts.model.fixings.FixOutlierFacet; import de.intevation.flys.artifacts.model.fixings.FixReferenceEventsFacet; -import de.intevation.flys.artifacts.model.fixings.FixResult; +import de.intevation.flys.artifacts.model.fixings.FixAnalysisResult; import de.intevation.flys.artifacts.model.fixings.FixWQCurveFacet; import de.intevation.flys.artifacts.resources.Resources; @@ -108,7 +108,7 @@ facets.add(new ReportFacet(ComputeType.ADVANCE, hash, id)); } - FixResult fr = (FixResult)res.getData(); + FixAnalysisResult fr = (FixAnalysisResult)res.getData(); if (fr == null) { return res; diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java Thu Jul 19 14:59:16 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/DeltaWtExporter.java Thu Jul 19 15:16:48 2012 +0000 @@ -8,7 +8,7 @@ import de.intevation.flys.artifacts.model.CalculationResult; import de.intevation.flys.artifacts.model.fixings.AnalysisPeriod; -import de.intevation.flys.artifacts.model.fixings.FixResult; +import de.intevation.flys.artifacts.model.fixings.FixAnalysisResult; import de.intevation.flys.artifacts.model.fixings.QWD; import de.intevation.flys.artifacts.resources.Resources; @@ -107,10 +107,10 @@ } Object data = ((CalculationResult)d).getData(); - if (!(data instanceof FixResult)) { + if (!(data instanceof FixAnalysisResult)) { log.warn("Invalid data stored in result."); } - FixResult result = (FixResult)data; + FixAnalysisResult result = (FixAnalysisResult)data; analysisPeriods.add(result.getAnalysisPeriods()); referenceEvents.add(result.getReferenced()); } diff -r 1bb6fb621167 -r e3c7a3228bc2 flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/ParametersExporter.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/ParametersExporter.java Thu Jul 19 14:59:16 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/ParametersExporter.java Thu Jul 19 15:16:48 2012 +0000 @@ -7,7 +7,7 @@ import de.intevation.flys.artifacts.model.CalculationResult; import de.intevation.flys.artifacts.model.Parameters; -import de.intevation.flys.artifacts.model.fixings.FixResult; +import de.intevation.flys.artifacts.model.fixings.FixAnalysisResult; import de.intevation.flys.artifacts.resources.Resources; @@ -48,10 +48,10 @@ } Object data = ((CalculationResult)d).getData(); - if (!(data instanceof FixResult)) { + if (!(data instanceof FixAnalysisResult)) { log.warn("Invalid data stored in result."); } - FixResult result = (FixResult)data; + FixAnalysisResult result = (FixAnalysisResult)data; parametersList.add(result.getParameters()); }