From 0d1b9b59eebd21bd8d1c6529e83b938cc53f332a Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Sun, 20 Nov 2022 16:56:58 +0100 Subject: [PATCH] BoxAggregator is no longer an indexed aggregator --- .../lucares/pdb/plot/api/BoxAggregator.java | 28 +------------------ .../lucares/pdb/plot/api/BoxChartHandler.java | 19 +------------ 2 files changed, 2 insertions(+), 45 deletions(-) diff --git a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BoxAggregator.java b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BoxAggregator.java index 25dcf4a..7f7aede 100644 --- a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BoxAggregator.java +++ b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BoxAggregator.java @@ -6,11 +6,7 @@ import java.util.UUID; import org.lucares.collections.LongObjHashMap; import org.lucares.recommind.logs.GnuplotAxis; -public class BoxAggregator implements CustomAggregator, IndexedAggregator { - - private Long index = null; - private Long numberOfDataSeries; - +public class BoxAggregator implements CustomAggregator { private final String dataName = "$data" + UUID.randomUUID().toString().replace("-", ""); private final Interval interval; @@ -43,28 +39,6 @@ public class BoxAggregator implements CustomAggregator, IndexedAggregator { return Aggregate.BOX; } - @Override - public void setIndex(final long index, final long numberOfDataSeries) { - this.index = index; - this.numberOfDataSeries = numberOfDataSeries; - } - - @Override - public long getIndex() throws IllegalStateException { - if (this.index == null) { - throw new IllegalStateException("index was not set"); - } - return this.index; - } - - @Override - public long getNumberOfDataSeries() throws IllegalStateException { - if (this.numberOfDataSeries == null) { - throw new IllegalStateException("index was not set"); - } - return this.numberOfDataSeries; - } - public Object getDataName() { return dataName; } diff --git a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BoxChartHandler.java b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BoxChartHandler.java index 6e8d848..28ebea7 100644 --- a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BoxChartHandler.java +++ b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BoxChartHandler.java @@ -83,24 +83,7 @@ public class BoxChartHandler extends AggregateHandler { } private double width(final IntervalTimeUnit intervalTimeUnit) { - switch (intervalTimeUnit) { - case SECOND: - return 1; - case MINUTE: - return 60; - case HOUR: - return 3600; - case DAY: - return 86400; - case WEEK: - return 24 * 3600; - case MONTH: - return 30 * 24 * 3600; - case YEAR: - return 365 * 24 * 3600; - default: - throw new IllegalArgumentException("Unexpected value: " + this); - } + return intervalTimeUnit.toMillis() / 1000; } @Override