--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/AnalysisPeriod.java	Thu Aug 16 15:47:10 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/AnalysisPeriod.java	Thu Aug 16 16:27:53 2018 +0200
@@ -8,99 +8,49 @@
 
 package org.dive4elements.river.artifacts.model.fixings;
 
-import org.dive4elements.river.artifacts.model.DateRange;
-
 import java.io.Serializable;
 
-public class AnalysisPeriod
-implements   Serializable
-{
-    protected DateRange dateRange;
-    protected QWD []    qwds;
-    protected QWD []    qSectorAverages;
-    protected double [] qSectorStdDevs;
+import org.dive4elements.river.artifacts.model.DateRange;
+
+public class AnalysisPeriod implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private DateRange dateRange;
+
+    private QWD[] qSectorAverages;
+
+    private double[] qSectorStdDevs;
+
+    private double maxQ;
 
     public AnalysisPeriod() {
     }
 
-    public AnalysisPeriod(DateRange dateRange) {
-        this.dateRange = dateRange;
-    }
-
-    public AnalysisPeriod(DateRange dateRange, QWD [] qwds) {
-        this(dateRange);
+    public AnalysisPeriod(final DateRange dateRange, final QWD[] qSectorAverages, final double[] qSectorStdDevs, final double maxQ) {
         this.dateRange = dateRange;
-        this.qwds      = qwds;
-    }
-
-    public AnalysisPeriod(
-        DateRange dateRange,
-        QWD []    qwds,
-        QWD []    qSectorAverages,
-        double [] qSectorStdDevs
-    ) {
-        this(dateRange, qwds);
         this.qSectorAverages = qSectorAverages;
-        this.qSectorStdDevs  = qSectorStdDevs;
+        this.qSectorStdDevs = qSectorStdDevs;
+        this.maxQ = maxQ;
     }
 
     public DateRange getDateRange() {
-        return dateRange;
-    }
-
-    public void setDateRange(DateRange dateRange) {
-        this.dateRange = dateRange;
-    }
-
-    public QWD [] getQWDs() {
-        return qwds;
-    }
-
-    public void setQWDs(QWD [] qwds) {
-        this.qwds = qwds;
+        return this.dateRange;
     }
 
-    public QWD [] getQSectorAverages() {
-        return qSectorAverages;
-    }
-
-    public void setQSectorAverages(QWD [] qSectorAverages) {
-        this.qSectorAverages = qSectorAverages;
+    public QWD[] getQSectorAverages() {
+        return this.qSectorAverages;
     }
 
-    public QWD getQSectorAverage(int i) {
-        return qSectorAverages[i];
+    public QWD getQSectorAverage(final int i) {
+        return this.qSectorAverages[i];
     }
 
-    public double [] getQSectorStdDevs() {
-        return qSectorStdDevs;
-    }
-
-    public void setQSectorStdDevs(double [] qSectorStdDevs) {
-        this.qSectorStdDevs = qSectorStdDevs;
-    }
-
-    public double getQSectorStdDev(int i) {
-        return qSectorStdDevs[i];
+    public double getQSectorStdDev(final int i) {
+        return this.qSectorStdDevs[i];
     }
 
     public double getMaxQ() {
-        double maxQ = -Double.MAX_VALUE;
-        if (qwds != null) {
-            for (QWD qwd: qwds) {
-                if (qwd.getQ() > maxQ) {
-                    maxQ = qwd.getQ();
-                }
-            }
-        }
-        if (qSectorAverages != null) {
-            for (QWD qwd: qSectorAverages) {
-                if (qwd != null && qwd.getQ() > maxQ) {
-                    maxQ = qwd.getQ();
-                }
-            }
-        }
-        return maxQ;
+        return this.maxQ;
     }
-}
-// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
+}
\ No newline at end of file