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

use y1/y2 axis definitions

Browse Source
This commit is contained in:
Andreas Huber
2020-02-09 20:14:13 +01:00
parent 859491e99e
commit 57d016245c
20 changed files with 178 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,11 +5,11 @@ import java.util.Collection;
import java.util.Optional;
import org.lucares.recommind.logs.AxisSettings;
import org.lucares.recommind.logs.AxisSettings.Type;
import org.lucares.recommind.logs.DataSeries;
import org.lucares.recommind.logs.GnuplotAxis;
import org.lucares.recommind.logs.GnuplotSettings;
import org.lucares.recommind.logs.LineStyle;
import org.lucares.recommind.logs.Type;
public abstract class AggregateHandler implements Appender {

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

@@ -9,10 +9,10 @@ import java.util.List;
import java.util.Optional;
import org.lucares.recommind.logs.AxisSettings;
import org.lucares.recommind.logs.AxisSettings.Type;
import org.lucares.recommind.logs.DataSeries;
import org.lucares.recommind.logs.GnuplotAxis;
import org.lucares.recommind.logs.GnuplotSettings;
import org.lucares.recommind.logs.Type;
import org.lucares.utils.CollectionUtils;
import org.lucares.utils.Preconditions;

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

@@ -8,12 +8,12 @@ import java.util.Locale;
import java.util.Optional;
import org.lucares.recommind.logs.AxisSettings;
import org.lucares.recommind.logs.AxisSettings.Type;
import org.lucares.recommind.logs.DataSeries;
import org.lucares.recommind.logs.GnuplotAxis;
import org.lucares.recommind.logs.GnuplotLineType;
import org.lucares.recommind.logs.GnuplotSettings;
import org.lucares.recommind.logs.LineStyle;
import org.lucares.recommind.logs.Type;
public class BarChartHandler extends AggregateHandler {

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

@@ -5,12 +5,12 @@ import java.util.Collection;
import java.util.Optional;
import org.lucares.recommind.logs.AxisSettings;
import org.lucares.recommind.logs.AxisSettings.Type;
import org.lucares.recommind.logs.AxisTime;
import org.lucares.recommind.logs.DataSeries;
import org.lucares.recommind.logs.GnuplotAxis;
import org.lucares.recommind.logs.GnuplotSettings;
import org.lucares.recommind.logs.LineStyle;
import org.lucares.recommind.logs.Type;
public class CumulativeDistributionHandler extends AggregateHandler {
@@ -39,7 +39,7 @@ public class CumulativeDistributionHandler extends AggregateHandler {
@Override
public AxisSettings createYAxisSettings(final GnuplotSettings settings, final Collection<DataSeries> dataSeries) {
final AxisSettings result = AxisTime.createYAxis(settings, dataSeries);
final AxisSettings result = AxisTime.createYAxis(settings, getyAxis(), dataSeries);
result.setAxis(getyAxis());
return result;
}

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

@@ -5,11 +5,11 @@ import java.util.Collection;
import java.util.Optional;
import org.lucares.recommind.logs.AxisSettings;
import org.lucares.recommind.logs.AxisSettings.Type;
import org.lucares.recommind.logs.DataSeries;
import org.lucares.recommind.logs.GnuplotAxis;
import org.lucares.recommind.logs.GnuplotSettings;
import org.lucares.recommind.logs.LineStyle;
import org.lucares.recommind.logs.Type;
public class HistogramHandler extends AggregateHandler {

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

@@ -6,12 +6,12 @@ import java.util.Optional;
import java.util.concurrent.TimeUnit;
import org.lucares.recommind.logs.AxisSettings;
import org.lucares.recommind.logs.AxisSettings.Type;
import org.lucares.recommind.logs.AxisTime;
import org.lucares.recommind.logs.DataSeries;
import org.lucares.recommind.logs.GnuplotAxis;
import org.lucares.recommind.logs.GnuplotSettings;
import org.lucares.recommind.logs.LineStyle;
import org.lucares.recommind.logs.Type;
public class ParallelRequestsAggregate extends AggregateHandler {
@@ -31,13 +31,25 @@ public class ParallelRequestsAggregate extends AggregateHandler {
@Override
public AxisSettings createYAxisSettings(final GnuplotSettings settings, final Collection<DataSeries> dataSeries) {
final AxisSettings result = new AxisSettings();
result.setLabel("Parallel Requests");
result.setType(Type.Number);
result.setAxis(getyAxis());
result.setTicsEnabled(true);
result.setFrom("0");
final AxisSettings result = AxisTime.createYAxis(settings, getyAxis(), dataSeries);
return result;
// final YAxisDefinition yAxisDefinition = settings.getYAxisDefinition(getyAxis());
//
// final AxisSettings result = new AxisSettings();
// result.setLabel("Parallel Requests");
// result.setType(Type.Number);
// result.setAxis(getyAxis());
// result.setTicsEnabled(true);
// if (yAxisDefinition.hasRange()) {
// result.setFrom(String.valueOf(yAxisDefinition.getRangeMinForUnit()));
// result.setTo(String.valueOf(yAxisDefinition.getRangeMaxForUnit()));
// } else {
// result.setFrom("0");
// }
// result.setLogscale(yAxisDefinition.isLogscale());
// return result;
}
@Override

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

@@ -0,0 +1,78 @@
package org.lucares.pdb.plot.api;
import org.lucares.recommind.logs.Type;
public enum RangeUnit {
AUTOMATIC_NUMBER(true, Type.Number, "Value"),
NO_UNIT(false, Type.Number, "Value"),
BYTES(false, Type.Number, "Value"),
AUTOMATIC_TIME(true, Type.Duration, "Duration"),
MILLISECONDS(false, Type.Duration, "Duration"),
SECONDS(false, Type.Duration, "Duration"),
MINUTES(false, Type.Duration, "Duration"),
HOURS(false, Type.Duration, "Duration"),
DAYS(false, Type.Duration, "Duration");
private final boolean isAutomatic;
private final String axisLabel;
private final Type type;
private RangeUnit(final boolean isAutomatic, final Type type, final String axisLabel) {
this.isAutomatic = isAutomatic;
this.type = type;
this.axisLabel = axisLabel;
}
public boolean isAutomatic() {
return isAutomatic;
}
public boolean isTime() {
return type == Type.Duration;
}
public boolean isNumber() {
return type == Type.Number || type == Type.HistogramCount;
}
public String getLabel() {
return axisLabel;
}
public Type getType() {
return type;
}
public int valueForUnit(final int value) {
switch (this) {
case AUTOMATIC_NUMBER:
return Integer.MAX_VALUE;
case NO_UNIT:
case BYTES:
return value;
case MILLISECONDS:
return value;
case SECONDS:
return value * 1000;
case MINUTES:
return value * 60 * 1000;
case HOURS:
return value * 60 * 60 * 1000;
case DAYS:
return value * 24 * 60 * 60 * 1000;
case AUTOMATIC_TIME:
return Integer.MAX_VALUE;
}
return Integer.MAX_VALUE;
}
}

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

@@ -5,13 +5,13 @@ import java.util.Collection;
import java.util.Optional;
import org.lucares.recommind.logs.AxisSettings;
import org.lucares.recommind.logs.AxisSettings.Type;
import org.lucares.recommind.logs.AxisTime;
import org.lucares.recommind.logs.DataSeries;
import org.lucares.recommind.logs.GnuplotAxis;
import org.lucares.recommind.logs.GnuplotLineType;
import org.lucares.recommind.logs.GnuplotSettings;
import org.lucares.recommind.logs.LineStyle;
import org.lucares.recommind.logs.Type;
public class ScatterAggregateHandler extends AggregateHandler {
@@ -31,8 +31,8 @@ public class ScatterAggregateHandler extends AggregateHandler {
@Override
public AxisSettings createYAxisSettings(final GnuplotSettings settings, final Collection<DataSeries> dataSeries) {
final AxisSettings result = AxisTime.createYAxis(settings, dataSeries);
result.setAxis(getyAxis());
final AxisSettings result = AxisTime.createYAxis(settings, getyAxis(), dataSeries);
return result;
}

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

@@ -29,7 +29,7 @@ public class ScatterAggregator implements CustomAggregator {
private final long minValue;
private final long maxValue;
private final long durationMillisPerPixel;
private final long valuesPerPixel;
private final Path tmpDir;
@@ -44,10 +44,10 @@ public class ScatterAggregator implements CustomAggregator {
final YAxisDefinition yAxisDefinition = plotSettings.getyAxisDefinition(yAxis);
minValue = yAxisDefinition.getRangeUnit() == TimeRangeUnit.AUTOMATIC ? 0 : yAxisDefinition.getRangeMinInMs();
maxValue = yAxisDefinition.getRangeUnit() == TimeRangeUnit.AUTOMATIC ? Long.MAX_VALUE
: yAxisDefinition.getRangeMaxInMs();
durationMillisPerPixel = yAxisDefinition.getAxisScale() == AxisScale.LINEAR
final boolean automaticRange = yAxisDefinition.getRangeUnit().isAutomatic();
minValue = automaticRange ? 0 : yAxisDefinition.getRangeMinForUnit();
maxValue = automaticRange ? Long.MAX_VALUE : yAxisDefinition.getRangeMaxForUnit();
valuesPerPixel = yAxisDefinition.getAxisScale() == AxisScale.LINEAR && !automaticRange
? Math.max(1, (maxValue - minValue) / plotAreaHeightInPx)
: 1;
}
@@ -55,7 +55,7 @@ public class ScatterAggregator implements CustomAggregator {
@Override
public void addValue(final long epochMilli, final long value) {
final long roundedEpochMilli = epochMilli - epochMilli % epochMillisPerPixel;
final long roundedValue = value - value % durationMillisPerPixel;
final long roundedValue = value - value % valuesPerPixel;
matrix2d.put(roundedEpochMilli, roundedValue, 1);
}

24
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/TimeRangeUnit.java
View File

@@ -1,24 +0,0 @@
package org.lucares.pdb.plot.api;
public enum TimeRangeUnit {
AUTOMATIC, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS;
public int toMilliSeconds(final int value) {
switch (this) {
case MILLISECONDS:
return value;
case SECONDS:
return value * 1000;
case MINUTES:
return value * 60 * 1000;
case HOURS:
return value * 60 * 60 * 1000;
case DAYS:
return value * 24 * 60 * 60 * 1000;
case AUTOMATIC:
return Integer.MAX_VALUE;
}
return Integer.MAX_VALUE;
}
}

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

@@ -5,7 +5,7 @@ public class YAxisDefinition {
private int rangeMin = 0;
private int rangeMax = 300;
private TimeRangeUnit rangeUnit = TimeRangeUnit.AUTOMATIC;
private RangeUnit rangeUnit = RangeUnit.AUTOMATIC_TIME;
public AxisScale getAxisScale() {
return axisScale;
@@ -15,12 +15,12 @@ public class YAxisDefinition {
this.axisScale = axisScale;
}
public long getRangeMinInMs() {
return rangeUnit.toMilliSeconds(rangeMin);
public long getRangeMinForUnit() {
return rangeUnit.valueForUnit(rangeMin);
}
public long getRangeMaxInMs() {
return rangeUnit.toMilliSeconds(rangeMax);
public long getRangeMaxForUnit() {
return rangeUnit.valueForUnit(rangeMax);
}
public int getRangeMin() {
@@ -28,7 +28,7 @@ public class YAxisDefinition {
}
public boolean hasRange() {
return rangeUnit != TimeRangeUnit.AUTOMATIC && rangeMin >= 0 && rangeMax >= 0 && rangeMin < rangeMax;
return !rangeUnit.isAutomatic() && rangeMin >= 0 && rangeMax >= 0 && rangeMin < rangeMax;
}
public void setRangeMin(final int rangeMin) {
@@ -43,11 +43,11 @@ public class YAxisDefinition {
this.rangeMax = rangeMax;
}
public TimeRangeUnit getRangeUnit() {
public RangeUnit getRangeUnit() {
return rangeUnit;
}
public void setRangeUnit(final TimeRangeUnit rangeUnit) {
public void setRangeUnit(final RangeUnit rangeUnit) {
this.rangeUnit = rangeUnit;
}

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

@@ -9,10 +9,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
public class AxisSettings {
public enum Type {
Number, Time, Duration, Percent, HistogramBin, HistogramCount, Group
}
private String format = "";
private String label = "";

22
pdb-plotting/src/main/java/org/lucares/recommind/logs/AxisTime.java
View File

@@ -9,7 +9,6 @@ import org.lucares.collections.LongList;
import org.lucares.pdb.api.DateTimeRange;
import org.lucares.pdb.plot.api.AxisScale;
import org.lucares.pdb.plot.api.YAxisDefinition;
import org.lucares.recommind.logs.AxisSettings.Type;
public class AxisTime {
public static AxisSettings createXAxis(final GnuplotSettings settings) {
@@ -40,22 +39,21 @@ public class AxisTime {
return result;
}
public static AxisSettings createYAxis(final GnuplotSettings settings, final Collection<DataSeries> dataSeries) {
final GnuplotAxis yAxis = GnuplotAxis.Y1; // TODO get yAxis as parameter
final AxisSettings result = new AxisSettings();
result.setLabel("Duration");
result.setType(Type.Duration);
result.setAxis(yAxis);
result.setTicsEnabled(true);
public static AxisSettings createYAxis(final GnuplotSettings settings, final GnuplotAxis yAxis,
final Collection<DataSeries> dataSeries) {
final YAxisDefinition yAxisDefinition = settings.getYAxisDefinition(yAxis);
final AxisSettings result = new AxisSettings();
result.setLabel(yAxisDefinition.getRangeUnit().getLabel());
result.setType(yAxisDefinition.getRangeUnit().getType());
result.setAxis(yAxis);
result.setTicsEnabled(true);
final int graphOffset = yAxisDefinition.getAxisScale() == AxisScale.LINEAR ? 0 : 1;
if (yAxisDefinition.hasRange()) {
final long min = Math.max(yAxisDefinition.getRangeMinInMs(), graphOffset);
final long max = yAxisDefinition.getRangeMaxInMs();
final long min = Math.max(yAxisDefinition.getRangeMinForUnit(), graphOffset);
final long max = yAxisDefinition.getRangeMaxForUnit();
result.setFrom(String.valueOf(min));
result.setTo(String.valueOf(max));
} else {

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

@@ -203,7 +203,7 @@ public class Plotter {
}
static String title(final Tags tags, final CsvSummary csvSummary) {
// FIXME title must be computed by the AggregateHandler, because it is the only
// TODO title must be computed by the AggregateHandler, because it is the only
// one knowing how many values are plotted
final StringBuilder result = new StringBuilder(tags.asValueString());

5
pdb-plotting/src/main/java/org/lucares/recommind/logs/Type.java Normal file
View File

@@ -0,0 +1,5 @@
package org.lucares.recommind.logs;
public enum Type {
Number, Time, Duration, Percent, HistogramBin, HistogramCount, Group
}

29
pdb-plotting/src/main/java/org/lucares/recommind/logs/YAxisTicks.java
View File

@@ -25,28 +25,31 @@ class YAxisTicks {
final long yRangeMax;
final long yRangeMin;
if (yAxisDefinition.hasRange()) {
yRangeMin = yAxisDefinition.getRangeMinInMs();
yRangeMax = yAxisDefinition.getRangeMaxInMs();
yRangeMin = yAxisDefinition.getRangeMinForUnit();
yRangeMax = yAxisDefinition.getRangeMaxForUnit();
} else {
yRangeMin = 0;
yRangeMax = DataSeries.maxValue(dataSeries);
}
final int height = settings.getHeight();
switch (yAxisDefinition.getAxisScale()) {
case LINEAR:
result = computeLinearYTicks(height, yRangeMin, yRangeMax);
break;
case LOG10:
result = computeLog10YTicks(height, yRangeMin, yRangeMax);
break;
default:
// use the default
if (yAxisDefinition.getRangeUnit().isTime()) {
switch (yAxisDefinition.getAxisScale()) {
case LINEAR:
result = computeLinearYTicksTime(height, yRangeMin, yRangeMax);
break;
case LOG10:
result = computeLog10YTicksTime(height, yRangeMin, yRangeMax);
break;
default:
throw new IllegalStateException("unhandled value: " + yAxisDefinition.getRangeUnit());
}
}
return result;
}
private static List<String> computeLog10YTicks(final int height, final long yRangeMin, final long yRangeMax) {
private static List<String> computeLog10YTicksTime(final int height, final long yRangeMin, final long yRangeMax) {
final List<String> ticsLabels = Arrays.asList(//
"\"1ms\" 1", //
@@ -86,7 +89,7 @@ class YAxisTicks {
return ticsLabels;
}
private static List<String> computeLinearYTicks(final long height, final long yRangeMinInMs,
private static List<String> computeLinearYTicksTime(final long height, final long yRangeMinInMs,
final long yRangeMaxInMs) {
final long plotHeight = height - GnuplotSettings.GNUPLOT_TOP_BOTTOM_MARGIN;