andi/perfdb
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Activity

make it possible to render any combination of plots

Browse Source
This commit is contained in:
Andreas Huber
2019-10-20 10:16:25 +02:00
parent b7c4fe4c1f
commit f28a67a5c1
26 changed files with 321 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/AggreateInternal.java
View File

@@ -1,5 +0,0 @@
package org.lucares.pdb.plot.api;
public enum AggreateInternal {
NONE, MEAN, PERCENTILE95, PERCENTILE99, PERCENTILE999
}

4
pdb-ui/src/main/java/org/lucares/pdbui/domain/Aggregate.java → pdb-plotting/src/main/java/org/lucares/pdb/plot/api/Aggregate.java
View File

@@ -1,11 +1,9 @@
package org.lucares.pdbui.domain;
package org.lucares.pdb.plot.api;
/**
* Note: The order in this enum defines the order in which the aggregates are drawn.
*/
public enum Aggregate {
NONE,
PARALLEL,
SCATTER,

15
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/AggregateHandler.java
View File

@@ -2,12 +2,14 @@ package org.lucares.pdb.plot.api;
import java.nio.file.Path;
import java.util.Collection;
import java.util.Optional;
import org.lucares.recommind.logs.DataSeries;
import org.lucares.recommind.logs.LineStyle;
public interface AggregateHandler {
// TODO handle aggregates as normal DataSeries
Aggregate getAggregateType();
void addGnuplotDefinitions(StringBuilder result, String separator, Collection<DataSeries> dataSeries);
@@ -19,9 +21,16 @@ public interface AggregateHandler {
builder.append(String.format(format + "\n", args));
}
void addPlotsBeforeScatter(StringBuilder result, Collection<DataSeries> dataSeries);
default String gnuplotTitle(Optional<String> title) {
void addPlotsAfterScatter(StringBuilder result, Collection<DataSeries> dataSeries);
return title.isPresent() ? "title '"+title.get()+"'": "notitle";
}
// void addPlotsBeforeScatter(StringBuilder result, Collection<DataSeries> dataSeries);
//
// void addPlotsAfterScatter(StringBuilder result, Collection<DataSeries> dataSeries);
void addPlot(StringBuilder result, AggregatedData aggregatedData, LineStyle lineStyle, Optional<String> title);
CustomAggregator createCustomAggregator(Path tmpDir, PlotSettings plotSettings, long fromEpochMilli, long toEpochMilli);

64
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/AggregateHandlerCollection.java Normal file
View File

@@ -0,0 +1,64 @@
package org.lucares.pdb.plot.api;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Optional;
import org.lucares.recommind.logs.DataSeries;
public class AggregateHandlerCollection {
private static final Comparator<AggregateHandler> COMPARATOR = Comparator.comparing(AggregateHandler::getAggregateType);
private final List<AggregateHandler> aggregateHandlers = new ArrayList<>();
public void add(AggregateHandler aggregateHandler) {
aggregateHandlers.add(aggregateHandler);
Collections.sort(aggregateHandlers, COMPARATOR);
}
public void addGnuplotDefinitions(StringBuilder result, String datafileSeparator, Collection<DataSeries> dataSeries) {
for (AggregateHandler handler : aggregateHandlers) {
handler.addGnuplotDefinitions(result, datafileSeparator, dataSeries);
}
}
public AggregatorCollection createCustomAggregator(Path tmpDir, PlotSettings plotSettings, long fromEpochMilli,
long toEpochMilli) {
final List<CustomAggregator> aggregators = new ArrayList<>();
for (AggregateHandler handler : aggregateHandlers) {
CustomAggregator aggregator = handler.createCustomAggregator(tmpDir, plotSettings, fromEpochMilli, toEpochMilli);
if (aggregator != null) {
aggregators.add(aggregator);
}
}
return new AggregatorCollection(aggregators);
}
public void addPlots(StringBuilder result, Collection<DataSeries> dataSeries) {
boolean first = true;
for (AggregateHandler handler : aggregateHandlers) {
for (DataSeries dataSerie : dataSeries) {
final Optional<String> title = first ? Optional.of(dataSerie.getTitle()) : Optional.empty();
Optional<AggregatedData> aggregatedData = dataSerie.getAggregatedData().get(handler.getAggregateType());
if(aggregatedData.isPresent()) {
handler.addPlot(result, aggregatedData.get(), dataSerie.getStyle(), title);
}
}
first = false;
}
}
}

22
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/AggregatedDataCollection.java Normal file
View File

@@ -0,0 +1,22 @@
package org.lucares.pdb.plot.api;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Optional;
public class AggregatedDataCollection implements Iterable<AggregatedData>{
private final LinkedHashMap<Aggregate, AggregatedData> aggregatedDatas = new LinkedHashMap<>();
public void put(Aggregate aggregate, AggregatedData aggregatedData) {
aggregatedDatas.put(aggregate, aggregatedData);
}
@Override
public Iterator<AggregatedData> iterator() {
return aggregatedDatas.values().iterator();
}
public Optional<AggregatedData> get(Aggregate aggregateType) {
return Optional.ofNullable(aggregatedDatas.get(aggregateType));
}
}

29
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/AggregatorCollection.java Normal file
View File

@@ -0,0 +1,29 @@
package org.lucares.pdb.plot.api;
import java.io.IOException;
import java.util.List;
public class AggregatorCollection {
private final List<CustomAggregator> aggregators;
public AggregatorCollection(List<CustomAggregator> aggregators) {
this.aggregators = aggregators;
}
public void addValue(boolean valueIsInYRange, long epochMilli, long value) {
for (CustomAggregator aggregator : aggregators) {
aggregator.addValue(valueIsInYRange, epochMilli, value);
}
}
public AggregatedDataCollection getAggregatedData() throws IOException {
AggregatedDataCollection result = new AggregatedDataCollection();
for (CustomAggregator aggregator : aggregators) {
result.put(aggregator.getType(), aggregator.getAggregatedData());
}
return result;
}
}

5
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/CumulativeDistributionCustomAggregator.java
View File

@@ -120,4 +120,9 @@ public class CumulativeDistributionCustomAggregator implements CustomAggregator
return new AggregatedData(title, dataFile);
}
@Override
public Aggregate getType() {
return Aggregate.CUM_DISTRIBUTION;
}
}

25
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/CumulativeDistributionHandler.java
View File

@@ -2,6 +2,7 @@ package org.lucares.pdb.plot.api;
import java.nio.file.Path;
import java.util.Collection;
import java.util.Optional;
import org.lucares.recommind.logs.DataSeries;
import org.lucares.recommind.logs.LineStyle;
@@ -9,8 +10,8 @@ import org.lucares.recommind.logs.LineStyle;
public class CumulativeDistributionHandler implements AggregateHandler {
@Override
public CustomAggregator createCustomAggregator(final Path tmpDir, PlotSettings plotSettings, final long fromEpochMilli,
final long toEpochMilli) {
public CustomAggregator createCustomAggregator(final Path tmpDir, PlotSettings plotSettings,
final long fromEpochMilli, final long toEpochMilli) {
return new CumulativeDistributionCustomAggregator(tmpDir);
}
@@ -28,23 +29,17 @@ public class CumulativeDistributionHandler implements AggregateHandler {
}
@Override
public void addPlotsBeforeScatter(final StringBuilder result, final Collection<DataSeries> dataSeries) {
// nothing to do: the percentile line should be drawn on the scatter plots and
// must therefore be rendered after the scatter
}
@Override
public void addPlotsAfterScatter(final StringBuilder result, final Collection<DataSeries> dataSeries) {
for (final DataSeries dataSerie : dataSeries) {
final AggregatedData aggregatedData = dataSerie.getAggregatedData();
if (aggregatedData != null) {
final LineStyle lineStyle = dataSerie.getStyle();
appendfln(result, "'%s' using 1:2 notitle with lines axes x2y1 lw 2 %s, \\", //
public void addPlot(StringBuilder result, AggregatedData aggregatedData, LineStyle lineStyle, Optional<String> title) {
appendfln(result, "'%s' using 1:2 %s with lines axes x2y1 lw 2 %s, \\", //
aggregatedData.getDataFile().getAbsolutePath(), //
gnuplotTitle(title),//
lineStyle.darker()//
);
}
}
@Override
public Aggregate getAggregateType() {
return Aggregate.CUM_DISTRIBUTION;
}
}

2
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/CustomAggregator.java
View File

@@ -7,4 +7,6 @@ public interface CustomAggregator {
void addValue(boolean valueIsInYRange, long epochMilli, long value);
AggregatedData getAggregatedData() throws IOException;
Aggregate getType();
}

32
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/NullAggregate.java
View File

@@ -1,32 +0,0 @@
package org.lucares.pdb.plot.api;
import java.nio.file.Path;
import java.util.Collection;
import org.lucares.recommind.logs.DataSeries;
public class NullAggregate implements AggregateHandler {
@Override
public void addGnuplotDefinitions(final StringBuilder result, final String separator,
final Collection<DataSeries> dataSeries) {
// nothing to do; this is a Null-Object
}
@Override
public void addPlotsBeforeScatter(final StringBuilder result, final Collection<DataSeries> dataSeries) {
// nothing to do; this is a Null-Object
}
@Override
public void addPlotsAfterScatter(final StringBuilder result, final Collection<DataSeries> dataSeries) {
// nothing to do; this is a Null-Object
}
@Override
public CustomAggregator createCustomAggregator(final Path tmpDir, PlotSettings plotSettings, final long fromEpochMilli,
final long toEpochMilli) {
return new NullCustomAggregator();
}
}

16
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/NullCustomAggregator.java
View File

@@ -1,16 +0,0 @@
package org.lucares.pdb.plot.api;
public class NullCustomAggregator implements CustomAggregator {
@Override
public void addValue(boolean valueIsInYRange,final long epochMilli, final long value) {
// nothing to do; this is a null-object
}
@Override
public AggregatedData getAggregatedData() {
return null;
}
}

34
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ParallelRequestsAggregate.java
View File

@@ -2,9 +2,11 @@ package org.lucares.pdb.plot.api;
import java.nio.file.Path;
import java.util.Collection;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import org.lucares.recommind.logs.DataSeries;
import org.lucares.recommind.logs.LineStyle;
public class ParallelRequestsAggregate implements AggregateHandler {
@@ -16,31 +18,27 @@ public class ParallelRequestsAggregate implements AggregateHandler {
}
@Override
public void addPlotsBeforeScatter(final StringBuilder result, final Collection<DataSeries> dataSeries) {
for (final DataSeries dataSerie : dataSeries) {
final AggregatedData aggregatedData = dataSerie.getAggregatedData();
if (aggregatedData != null) {
appendfln(result, "'%s' using 1:2 notitle with filledcurve axes x1y2 lw 1 %s, \\", //
public void addPlot(StringBuilder result, AggregatedData aggregatedData, LineStyle lineStyle,
Optional<String> title) {
appendfln(result, "'%s' using 1:2 %s with filledcurve axes x1y2 lw 1 %s, \\", //
aggregatedData.getDataFile().getAbsolutePath(), //
dataSerie.getStyle().brighter().asGnuplotLineStyle()//
gnuplotTitle(title), //
lineStyle.brighter().asGnuplotLineStyle()//
);
}
}
}
@Override
public void addPlotsAfterScatter(final StringBuilder result, final Collection<DataSeries> dataSeries) {
// nothing to do: the parallel line plots shall be drawn below the scatter plot,
// so that you can see both. Therefore it must be drawn first.
}
@Override
public CustomAggregator createCustomAggregator(final Path tmpDir, PlotSettings plotSettings, final long fromEpochMilli,
final long toEpochMilli) {
if ((toEpochMilli - fromEpochMilli) <= TimeUnit.HOURS.toMillis(5)) {
public CustomAggregator createCustomAggregator(final Path tmpDir, PlotSettings plotSettings,
final long fromEpochMilli, final long toEpochMilli) {
if ((toEpochMilli - fromEpochMilli) <= TimeUnit.HOURS.toMillis(50)) {
return new ParallelRequestsAggregator(tmpDir, fromEpochMilli, toEpochMilli);
} else {
return new NullCustomAggregator();
return null;
}
}
@Override
public Aggregate getAggregateType() {
return Aggregate.PARALLEL;
}
}

5
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ParallelRequestsAggregator.java
View File

@@ -93,4 +93,9 @@ public class ParallelRequestsAggregator implements CustomAggregator {
builder.append(NEWLINE);
}
@Override
public Aggregate getType() {
return Aggregate.PARALLEL;
}
}

12
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/PlotSettings.java
View File

@@ -34,7 +34,7 @@ public class PlotSettings {
private AxisScale yAxisScale;
private AggregateHandler aggregate;
private AggregateHandlerCollection aggregates;
private int yRangeMin;
private int yRangeMax;
@@ -141,17 +141,17 @@ public class PlotSettings {
return "PlotSettings [query=" + query + ", height=" + height + ", width=" + width + ", thumbnailMaxWidth="
+ thumbnailMaxWidth + ", thumbnailMaxHeight=" + thumbnailMaxHeight + ", groupBy=" + groupBy
+ ", limitBy=" + limitBy + ", limit=" + limit + ", dateRangeAsString=" + dateRangeAsString
+ ", yAxisScale=" + yAxisScale + ", aggregate=" + aggregate + ", yRangeMin=" + yRangeMin
+ ", yAxisScale=" + yAxisScale + ", aggregates=" + aggregates + ", yRangeMin=" + yRangeMin
+ ", yRangeMax=" + yRangeMax + ", yRangeUnit=" + yRangeUnit + ", keyOutside=" + keyOutside
+ ", generateThumbnail=" + generateThumbnail + "]";
}
public void setAggregate(final AggregateHandler aggregate) {
this.aggregate = aggregate;
public void setAggregates(final AggregateHandlerCollection aggregates) {
this.aggregates = aggregates;
}
public AggregateHandler getAggregate() {
return aggregate;
public AggregateHandlerCollection getAggregates() {
return aggregates;
}
public void setKeyOutside(final boolean keyOutside) {

30
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ScatterAggregateHandler.java
View File

@@ -2,9 +2,11 @@ package org.lucares.pdb.plot.api;
import java.nio.file.Path;
import java.util.Collection;
import java.util.Optional;
import org.lucares.recommind.logs.DataSeries;
import org.lucares.recommind.logs.GnuplotLineType;
import org.lucares.recommind.logs.LineStyle;
public class ScatterAggregateHandler implements AggregateHandler {
@@ -15,28 +17,15 @@ public class ScatterAggregateHandler implements AggregateHandler {
}
@Override
public void addPlotsBeforeScatter(StringBuilder result, Collection<DataSeries> dataSeries) {
public void addPlot(StringBuilder result, AggregatedData aggregatedData, LineStyle lineStyle, Optional<String> title) {
for (final DataSeries dataSerie : dataSeries) {
final AggregatedData aggregatedData = dataSerie.getAggregatedData();
if (aggregatedData != null) {
appendfln(result, "'%s' using 1:2 title '%s' with %s %s, \\", //
appendfln(result, "'%s' using 1:2 %s with %s %s, \\", //
aggregatedData.getDataFile(), //
dataSerie.getTitle(), //
GnuplotLineType.Points,
dataSerie.getStyle()//
gnuplotTitle(title), //
GnuplotLineType.Points, //
lineStyle//
);
}
}
}
@Override
public void addPlotsAfterScatter(StringBuilder result, Collection<DataSeries> dataSeries) {
// TODO Auto-generated method stub
}
@Override
public CustomAggregator createCustomAggregator(Path tmpDir, PlotSettings plotSettings, long fromEpochMilli,
@@ -44,4 +33,9 @@ public class ScatterAggregateHandler implements AggregateHandler {
return new ScatterAggregator(tmpDir, plotSettings, fromEpochMilli, toEpochMilli);
}
@Override
public Aggregate getAggregateType() {
return Aggregate.SCATTER;
}
}

5
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/ScatterAggregator.java
View File

@@ -91,4 +91,9 @@ public class ScatterAggregator implements CustomAggregator {
return new AggregatedData("scatter", dataFile);
}
@Override
public Aggregate getType() {
return Aggregate.SCATTER;
}
}

8
pdb-plotting/src/main/java/org/lucares/recommind/logs/CsvSummary.java
View File

@@ -1,16 +1,16 @@
package org.lucares.recommind.logs;
import org.lucares.pdb.plot.api.AggregatedData;
import org.lucares.pdb.plot.api.AggregatedDataCollection;
class CsvSummary {
private final int values;
private final long maxValue;
private final AggregatedData aggregatedData;
private final AggregatedDataCollection aggregatedData;
private final double statsAverage;
private final int plottedValues;
public CsvSummary(final int values, final int plottedValues, final long maxValue,
final double statsAverage, final AggregatedData aggregatedData) {
final double statsAverage, final AggregatedDataCollection aggregatedData) {
super();
this.values = values;
this.plottedValues = plottedValues;
@@ -48,7 +48,7 @@ class CsvSummary {
return statsAverage;
}
public AggregatedData getAggregatedData() {
public AggregatedDataCollection getAggregatedData() {
return aggregatedData;
}
}

4
pdb-plotting/src/main/java/org/lucares/recommind/logs/DataSeries.java
View File

@@ -6,7 +6,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.lucares.pdb.plot.api.AggregatedData;
import org.lucares.pdb.plot.api.AggregatedDataCollection;
import org.lucares.pdb.plot.api.Limit;
public interface DataSeries {
@@ -41,7 +41,7 @@ public interface DataSeries {
public LineStyle getStyle();
public AggregatedData getAggregatedData();
public AggregatedDataCollection getAggregatedData();
public static Map<String, Integer> toMap(final List<DataSeries> dataSeries) {
final Map<String, Integer> result = new LinkedHashMap<>();

4
pdb-plotting/src/main/java/org/lucares/recommind/logs/FileBackedDataSeries.java
View File

@@ -1,6 +1,6 @@
package org.lucares.recommind.logs;
import org.lucares.pdb.plot.api.AggregatedData;
import org.lucares.pdb.plot.api.AggregatedDataCollection;
public class FileBackedDataSeries implements DataSeries {
@@ -66,7 +66,7 @@ public class FileBackedDataSeries implements DataSeries {
}
@Override
public AggregatedData getAggregatedData() {
public AggregatedDataCollection getAggregatedData() {
return csvSummary.getAggregatedData();
}
}

6
pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotFileGenerator.java
View File

@@ -27,7 +27,7 @@ public class GnuplotFileGenerator {
appendfln(result, "set datafile separator \"%s\"", settings.getDatafileSeparator());
settings.getAggregate().addGnuplotDefinitions(result, settings.getDatafileSeparator(), dataSeries);
settings.getAggregates().addGnuplotDefinitions(result, settings.getDatafileSeparator(), dataSeries);
appendfln(result, "set timefmt '%s'", settings.getTimefmt());
@@ -103,9 +103,7 @@ public class GnuplotFileGenerator {
appendf(result, "plot ");
settings.getAggregate().addPlotsBeforeScatter(result, dataSeries);
settings.getAggregate().addPlotsAfterScatter(result, dataSeries);
settings.getAggregates().addPlots(result, dataSeries);
return result.toString();
}

12
pdb-plotting/src/main/java/org/lucares/recommind/logs/GnuplotSettings.java
View File

@@ -2,7 +2,7 @@ package org.lucares.recommind.logs;
import java.nio.file.Path;
import org.lucares.pdb.plot.api.AggregateHandler;
import org.lucares.pdb.plot.api.AggregateHandlerCollection;
import org.lucares.pdb.plot.api.AxisScale;
public class GnuplotSettings {
@@ -26,7 +26,7 @@ public class GnuplotSettings {
private final Path output;
private AxisScale yAxisScale;
private AggregateHandler aggregate;
private AggregateHandlerCollection aggregates;
private boolean keyOutside = false;
private XAxisSettings xAxisSettings = new XAxisSettings();
@@ -98,12 +98,12 @@ public class GnuplotSettings {
return yAxisScale;
}
public void setAggregate(final AggregateHandler aggregate) {
this.aggregate = aggregate;
public void setAggregates(final AggregateHandlerCollection aggregates) {
this.aggregates = aggregates;
}
public AggregateHandler getAggregate() {
return aggregate;
public AggregateHandlerCollection getAggregates() {
return aggregates;
}
public void setKeyOutside(final boolean keyOutside) {

12
pdb-plotting/src/main/java/org/lucares/recommind/logs/Plotter.java
View File

@@ -22,7 +22,7 @@ import org.lucares.pdb.api.GroupResult;
import org.lucares.pdb.api.Query;
import org.lucares.pdb.api.Result;
import org.lucares.pdb.api.Tags;
import org.lucares.pdb.plot.api.CustomAggregator;
import org.lucares.pdb.plot.api.AggregatorCollection;
import org.lucares.pdb.plot.api.Limit;
import org.lucares.pdb.plot.api.PlotSettings;
import org.lucares.pdb.plot.api.TimeRangeUnitInternal;
@@ -115,7 +115,7 @@ public class Plotter {
defineXAxis(gnuplotSettings, plotSettings.dateRange());
gnuplotSettings.setYAxisScale(plotSettings.getYAxisScale());
gnuplotSettings.setAggregate(plotSettings.getAggregate());
gnuplotSettings.setAggregates(plotSettings.getAggregates());
defineYRange(gnuplotSettings, plotSettings.getYRangeMin(), plotSettings.getYRangeMax(),
plotSettings.getYRangeUnit());
gnuplotSettings.setKeyOutside(plotSettings.isKeyOutside());
@@ -132,7 +132,7 @@ public class Plotter {
defineXAxis(gnuplotSettings, plotSettings.dateRange());
gnuplotSettings.setYAxisScale(plotSettings.getYAxisScale());
gnuplotSettings.setAggregate(plotSettings.getAggregate());
gnuplotSettings.setAggregates(plotSettings.getAggregates());
defineYRange(gnuplotSettings, plotSettings.getYRangeMin(), plotSettings.getYRangeMax(),
plotSettings.getYRangeUnit());
gnuplotSettings.setKeyOutside(false);
@@ -205,7 +205,7 @@ public class Plotter {
final long maxValue = plotSettings.getYRangeUnit() == TimeRangeUnitInternal.AUTOMATIC ? Long.MAX_VALUE
: plotSettings.getYRangeUnit().toMilliSeconds(plotSettings.getYRangeMax());
final CustomAggregator aggregator = plotSettings.getAggregate().createCustomAggregator(tmpDir, plotSettings, fromEpochMilli,
final AggregatorCollection aggregator = plotSettings.getAggregates().createCustomAggregator(tmpDir, plotSettings, fromEpochMilli,
toEpochMilli);
int count = 0; // number of values in the x-axis range (used to compute stats)
@@ -228,8 +228,6 @@ public class Plotter {
final long value = entry.get(i + 1);
// compute stats
count++;
statsMaxValue = Math.max(statsMaxValue, value);
@@ -293,7 +291,5 @@ public class Plotter {
result.append(")");
return result.toString();
}
}

7
pdb-ui/src/main/java/org/lucares/pdbui/PdbController.java
View File

@@ -6,6 +6,7 @@ import java.io.OutputStream;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
@@ -20,10 +21,10 @@ import org.lucares.pdb.api.DateTimeRange;
import org.lucares.pdb.api.QueryWithCaretMarker;
import org.lucares.pdb.api.QueryWithCaretMarker.ResultMode;
import org.lucares.pdb.datastore.Proposal;
import org.lucares.pdb.plot.api.Aggregate;
import org.lucares.pdb.plot.api.AxisScale;
import org.lucares.pdb.plot.api.Limit;
import org.lucares.pdb.plot.api.PlotSettings;
import org.lucares.pdbui.domain.Aggregate;
import org.lucares.pdbui.domain.AutocompleteProposal;
import org.lucares.pdbui.domain.AutocompleteProposalByValue;
import org.lucares.pdbui.domain.AutocompleteResponse;
@@ -158,7 +159,7 @@ public class PdbController implements HardcodedValues, PropertyKeys {
@RequestParam(name = "limitBy.selected", defaultValue = "NO_LIMIT") final Limit limitBy,
@RequestParam(name = "dateRange") final String dateRange,
@RequestParam(name = "axisScale", defaultValue = "LINEAR") final AxisScale axisScale,
@RequestParam(name = "aggregate", defaultValue = "NONE") final Aggregate aggregate,
@RequestParam(name = "aggregates") final EnumSet<Aggregate>aggregate,
@RequestParam(name = "keyOutside", defaultValue = "false") final boolean keyOutside,
@RequestParam(name = "width", defaultValue = "1920") final int hidth,
@RequestParam(name = "height", defaultValue = "1080") final int height) {
@@ -181,7 +182,7 @@ public class PdbController implements HardcodedValues, PropertyKeys {
plotSettings.setLimitBy(limitBy);
plotSettings.setDateRange(dateRange);
plotSettings.setYAxisScale(axisScale);
plotSettings.setAggregate(PlotSettingsTransformer.toAggregateInternal(aggregate));
plotSettings.setAggregates(PlotSettingsTransformer.toAggregateInternal(aggregate));
plotSettings.setKeyOutside(keyOutside);
plotSettings.setGenerateThumbnail(false);

32
pdb-ui/src/main/java/org/lucares/pdbui/PlotSettingsTransformer.java
View File

@@ -1,13 +1,12 @@
package org.lucares.pdbui;
import org.lucares.pdb.plot.api.AggregateHandler;
import org.lucares.pdb.plot.api.NullAggregate;
import org.lucares.pdb.plot.api.ParallelRequestsAggregate;
import org.lucares.pdb.plot.api.Aggregate;
import org.lucares.pdb.plot.api.AggregateHandlerCollection;
import org.lucares.pdb.plot.api.CumulativeDistributionHandler;
import org.lucares.pdb.plot.api.ParallelRequestsAggregate;
import org.lucares.pdb.plot.api.PlotSettings;
import org.lucares.pdb.plot.api.ScatterAggregateHandler;
import org.lucares.pdb.plot.api.TimeRangeUnitInternal;
import org.lucares.pdbui.domain.Aggregate;
import org.lucares.pdbui.domain.PlotRequest;
import org.lucares.pdbui.domain.TimeRangeUnit;
@@ -24,7 +23,7 @@ class PlotSettingsTransformer {
result.setLimitBy(request.getLimitBy());
result.setDateRange(request.getDateRange());
result.setYAxisScale(request.getAxisScale());
result.setAggregate(toAggregateInternal(request.getAggregate()));
result.setAggregates(toAggregateInternal(request.getAggregates()));
result.setKeyOutside(request.isKeyOutside());
result.setThumbnailMaxWidth(request.getThumbnailMaxWidth());
result.setThumbnailMaxHeight(request.getThumbnailMaxHeight());
@@ -54,17 +53,26 @@ class PlotSettingsTransformer {
throw new IllegalStateException("unhandled enum value: " + yRangeUnit);
}
static AggregateHandler toAggregateInternal(final Aggregate aggregate) {
static AggregateHandlerCollection toAggregateInternal(final Iterable<Aggregate> aggregates) {
final AggregateHandlerCollection aggregateHandlerCollection = new AggregateHandlerCollection();
for (Aggregate aggregate : aggregates) {
switch (aggregate) {
case NONE:
return new NullAggregate();
case CUM_DISTRIBUTION:
return new CumulativeDistributionHandler();
aggregateHandlerCollection.add(new CumulativeDistributionHandler());
break;
case PARALLEL:
return new ParallelRequestsAggregate();
aggregateHandlerCollection.add(new ParallelRequestsAggregate());
break;
case SCATTER:
return new ScatterAggregateHandler();
}
aggregateHandlerCollection.add(new ScatterAggregateHandler());
break;
default:
throw new IllegalStateException("unhandled enum: " + aggregate);
}
}
return aggregateHandlerCollection;
}
}

12
pdb-ui/src/main/java/org/lucares/pdbui/domain/PlotRequest.java
View File

@@ -1,7 +1,9 @@
package org.lucares.pdbui.domain;
import java.util.ArrayList;
import java.util.List;
import org.lucares.pdb.plot.api.Aggregate;
import org.lucares.pdb.plot.api.AxisScale;
import org.lucares.pdb.plot.api.Limit;
@@ -26,7 +28,7 @@ public class PlotRequest {
private String dateRange;
private Aggregate aggregate = Aggregate.NONE;
private List<Aggregate> aggregates = new ArrayList<>();
private int yRangeMin;
private int yRangeMax;
@@ -121,12 +123,12 @@ public class PlotRequest {
this.yAxis = yAxis;
}
public void setAggregate(final Aggregate aggregate) {
this.aggregate = aggregate;
public void setAggregate(final List<Aggregate> aggregates) {
this.aggregates = aggregates;
}
public Aggregate getAggregate() {
return aggregate;
public List<Aggregate> getAggregates() {
return aggregates;
}
public void setKeyOutside(final boolean keyOutside) {

2
pdb-ui/src/main/resources/resources/js/ui.js
View File

@@ -780,7 +780,7 @@ Vue.component('search-bar', {
<div class="group" id="group-show-aggregate">
<label for="show-aggregate">X2-Axis:</label>
<select id="show-aggregate" v-model="searchBar.aggregate">
<select id="show-aggregate" v-model="searchBar.aggregate" multiple>
<option value="NONE">-</option>
<option value="CUM_DISTRIBUTION" title="cumulative distribution, see https://serialmentor.com/dataviz/ecdf-qq.html">cum. distribution</option>
<option value="PARALLEL">parallel requests</option>