# HG changeset patch # User gernotbelger # Date 1533053830 -7200 # Node ID 202fd59b4f21431a1c2972704d8df8c6c1cb9e61 # Parent 7c74ee8d6767a482dd35b2cbf649557bd137f7b3 Fixed: missing commit diff -r 7c74ee8d6767 -r 202fd59b4f21 artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixCalculation.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixCalculation.java Tue Jul 31 18:12:36 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixCalculation.java Tue Jul 31 18:17:10 2018 +0200 @@ -44,12 +44,12 @@ protected Parameters parameters; protected KMIndex referenced; - protected KMIndex outliers; + protected KMIndex outliers; public FitResult() { } - public FitResult(final Parameters parameters, final KMIndex referenced, final KMIndex outliers) { + public FitResult(final Parameters parameters, final KMIndex referenced, final KMIndex outliers) { this.parameters = parameters; this.referenced = referenced; this.outliers = outliers; @@ -63,7 +63,7 @@ return this.referenced; } - public KMIndex getOutliers() { + public KMIndex getOutliers() { return this.outliers; } } // class FitResult @@ -234,8 +234,6 @@ } protected List getEventColumns(final FixingsOverview overview, final ColumnCache cc) { - final FixingsColumnFactory fcf = FixingsColumnFactory.getInstance(); - final Filter filter = createFilter(); final List metas = overview.filter(null, filter); @@ -272,17 +270,17 @@ final Fitting.QWDFactory qwdFactory = new Fitting.QWDFactory() { @Override - public QWD create(final double q, final double w) { + public QWD create(final double q, final double w, boolean isOutlier) { // Check all the event columns for close match // and take the description and the date from meta. for (int i = 0; i < qs.length; ++i) { if (Math.abs(qs[i] - q) < EPSILON && Math.abs(ws[i] - w) < EPSILON) { final Column column = eventColumns.get(i); - return new QWD(qs[i], ws[i], column.getDescription(), column.getDate(), interpolated[i], 0d, column.getId()); // Use database id here + return new QWD(qs[i], ws[i], column.getDescription(), column.getDate(), interpolated[i], 0d, column.getId(), isOutlier); // Use database id here } } log.warn("cannot find column for (" + q + ", " + w + ")"); - return new QWD(q, w); + return new QWD(q, w, isOutlier); } }; @@ -300,7 +298,7 @@ log.debug("number of kms: " + kms.length); } - final KMIndex outliers = new KMIndex<>(); + final KMIndex outliers = new KMIndex<>(); final KMIndex referenced = new KMIndex<>(kms.length); final int kmIndex = results.columnIndex("km");