diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisPeriodsFacet.java @ 9415:9744ce3c3853

Rework of fixanalysis computation and dWt and WQ facets. Got rid of strange remapping and bitshifting code by explicitely saving the column information and using it in the facets. The facets also put the valid station range into their xml-metadata
author gernotbelger
date Thu, 16 Aug 2018 16:27:53 +0200
parents e4606eae8ea5
children
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisPeriodsFacet.java	Thu Aug 16 15:47:10 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisPeriodsFacet.java	Thu Aug 16 16:27:53 2018 +0200
@@ -8,29 +8,24 @@
 
 package org.dive4elements.river.artifacts.model.fixings;
 
+import org.apache.log4j.Logger;
 import org.dive4elements.artifacts.Artifact;
 import org.dive4elements.artifacts.CallContext;
-
 import org.dive4elements.river.artifacts.D4EArtifact;
-
 import org.dive4elements.river.artifacts.model.CalculationResult;
 import org.dive4elements.river.artifacts.model.DateRange;
 import org.dive4elements.river.artifacts.model.FacetTypes;
-
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
-
 import org.dive4elements.river.utils.KMIndex;
 
-import org.apache.log4j.Logger;
-
 /**
  * Facet to show W values for Q values at km for a date.
  *
  * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a>
  */
-public class FixAnalysisPeriodsFacet
-extends      FixingsFacet
-implements   FacetTypes {
+public class FixAnalysisPeriodsFacet extends FixingsFacet implements FacetTypes {
+
+    private static final long serialVersionUID = 1L;
 
     /** House log. */
     private static Logger log = Logger.getLogger(FixAnalysisPeriodsFacet.class);
@@ -39,78 +34,62 @@
     public FixAnalysisPeriodsFacet() {
     }
 
-
-    /**
-     * @param name
-     */
-    public FixAnalysisPeriodsFacet(int index, String name, String description) {
-        super(index,
-            name,
-            description,
-            ComputeType.ADVANCE,
-            null,
-            null);
+    public FixAnalysisPeriodsFacet(final int index, final String name, final String description) {
+        super(index, name, description, ComputeType.ADVANCE, null, null);
     }
 
-
     /**
      * Returns the data this facet requires.
      *
-     * @param artifact the owner artifact.
-     * @param context  the CallContext (ignored).
+     * @param artifact
+     *            the owner artifact.
+     * @param context
+     *            the CallContext (ignored).
      *
      * @return the data.
      */
     @Override
-    public Object getData(Artifact artifact, CallContext context) {
+    public Object getData(final Artifact artifact, final CallContext context) {
         log.debug("FixAnalysisPeriodsFacet.getData");
 
         if (artifact instanceof D4EArtifact) {
-            D4EArtifact flys = (D4EArtifact)artifact;
-
-            CalculationResult res =
-                (CalculationResult) flys.compute(context,
-                                                 ComputeType.ADVANCE,
-                                                 false);
-
-            FixAnalysisResult result = (FixAnalysisResult) res.getData();
-            double currentKm = getCurrentKm(context);
+            final D4EArtifact flys = (D4EArtifact) artifact;
 
-            KMIndex<AnalysisPeriod []> kmPeriods = result.getAnalysisPeriods();
-            KMIndex.Entry<AnalysisPeriod []> kmPeriodsEntry =
-                kmPeriods.binarySearch(currentKm);
+            final CalculationResult res = (CalculationResult) flys.compute(context, ComputeType.ADVANCE, false);
 
-            if (kmPeriodsEntry == null) {
+            final FixAnalysisResult result = (FixAnalysisResult) res.getData();
+            final double currentKm = getCurrentKm(context);
+
+            final KMIndex<AnalysisPeriod[]> kmPeriods = result.getAnalysisPeriods();
+            final KMIndex.Entry<AnalysisPeriod[]> kmPeriodsEntry = kmPeriods.binarySearch(currentKm);
+            if (kmPeriodsEntry == null)
                 return null;
-            }
-
-            AnalysisPeriod[] periods = kmPeriodsEntry.getValue();
 
-            if (periods == null) {
+            final AnalysisPeriod[] periods = kmPeriodsEntry.getValue();
+            if (periods == null)
                 return null;
-            }
-            DateRange[] dates = new DateRange[periods.length];
+
+            final DateRange[] dates = new DateRange[periods.length];
             for (int i = 0; i < periods.length; i++) {
                 dates[i] = periods[i].getDateRange();
             }
+
             return dates;
         }
-        else {
-            log.debug("Not an instance of FixationArtifact.");
-            return null;
-        }
+
+        log.debug("Not an instance of FixationArtifact.");
+        return null;
     }
 
-
     /**
      * Create a deep copy of this Facet.
+     *
      * @return a deep copy.
      */
     @Override
     public FixAnalysisPeriodsFacet deepCopy() {
-        FixAnalysisPeriodsFacet copy = new FixAnalysisPeriodsFacet();
+        final FixAnalysisPeriodsFacet copy = new FixAnalysisPeriodsFacet();
         copy.set(this);
         return copy;
     }
-}
-// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
+}
\ No newline at end of file

http://dive4elements.wald.intevation.org