Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/SQRelation.java @ 3079:8ad8a227d983
Added model classes for SQ calculation; generate fake results and improved the SQRelationGenerator which now draws the outliers.
flys-artifacts/trunk@4675 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Fri, 15 Jun 2012 12:23:08 +0000 |
parents | 0d3dd8230064 |
children | 4a76da133144 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/SQRelation.java Fri Jun 15 12:16:49 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/SQRelation.java Fri Jun 15 12:23:08 2012 +0000 @@ -18,6 +18,7 @@ import de.intevation.flys.artifacts.model.sq.SQMeasurementFacet; import de.intevation.flys.artifacts.model.sq.SQOutlierFacet; import de.intevation.flys.artifacts.model.sq.SQRelationCalculation; +import de.intevation.flys.artifacts.model.sq.SQResult; import de.intevation.flys.artifacts.states.DefaultState; /** @@ -52,12 +53,8 @@ return res; } - logger.error("Facet creation NOT IMPLEMENTED!"); - // TODO - //for (int idx = 0; idx < res.length; idx++) { - int idx = 0; - createFacets(newFacets, idx); - //} + SQResult[] sqr = (SQResult[]) res.getData(); + createFacets(newFacets, sqr, hash); Facet csv = new DataFacet( CSV, "CSV data", ComputeType.ADVANCE, hash, id); @@ -76,56 +73,25 @@ } - protected void createFacets(List<Facet> container, int idx) { + protected void createFacets( + List<Facet> container, + SQResult[] sqr, + String hash + ) { // TODO Create facets for each parameter type (A-F) - Facet measurements, outliers, curve; - measurements = new SQMeasurementFacet(idx, SQ_A_MEASUREMENT, "TODO"); - outliers = new SQOutlierFacet(idx, SQ_A_OUTLIER, "TODO"); - curve = new SQCurveFacet(idx, SQ_A_CURVE, "TODO"); - - container.add(measurements); - container.add(outliers); - container.add(curve); - - measurements = new SQMeasurementFacet(idx, SQ_B_MEASUREMENT, "TODO"); - outliers = new SQOutlierFacet(idx, SQ_B_OUTLIER, "TODO"); - curve = new SQCurveFacet(idx, SQ_B_CURVE, "TODO"); - - container.add(measurements); - container.add(outliers); - container.add(curve); - - measurements = new SQMeasurementFacet(idx, SQ_C_MEASUREMENT, "TODO"); - outliers = new SQOutlierFacet(idx, SQ_C_OUTLIER, "TODO"); - curve = new SQCurveFacet(idx, SQ_C_CURVE, "TODO"); + container.add(new SQMeasurementFacet(0, SQ_A_MEASUREMENT, "TODO")); + container.add(new SQCurveFacet(0, SQ_A_CURVE, "TODO")); - container.add(measurements); - container.add(outliers); - container.add(curve); - - measurements = new SQMeasurementFacet(idx, SQ_D_MEASUREMENT, "TODO"); - outliers = new SQOutlierFacet(idx, SQ_D_OUTLIER, "TODO"); - curve = new SQCurveFacet(idx, SQ_D_CURVE, "TODO"); - - container.add(measurements); - container.add(outliers); - container.add(curve); - - measurements = new SQMeasurementFacet(idx, SQ_E_MEASUREMENT, "TODO"); - outliers = new SQOutlierFacet(idx, SQ_E_OUTLIER, "TODO"); - curve = new SQCurveFacet(idx, SQ_E_CURVE, "TODO"); - - container.add(measurements); - container.add(outliers); - container.add(curve); - - measurements = new SQMeasurementFacet(idx, SQ_F_MEASUREMENT, "TODO"); - outliers = new SQOutlierFacet(idx, SQ_F_OUTLIER, "TODO"); - curve = new SQCurveFacet(idx, SQ_F_CURVE, "TODO"); - - container.add(measurements); - container.add(outliers); - container.add(curve); + for (int i = 0; i < sqr[0].getOutliersCount(); i++) { + container.add(new SQOutlierFacet( + 0, + i, + SQ_A_OUTLIER, + "OUTLIER AT" + i, + getID(), + hash + )); + } } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :