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

handle multi series bar chart better by reducing distance between bars

Browse Source
This commit is contained in:
Andreas Huber
2020-04-05 08:44:49 +02:00
parent 50f555d23c
commit 16d2c334fa
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/BarChartAggregatorForIntervals.java
View File

@@ -17,6 +17,8 @@ import org.lucares.recommind.logs.GnuplotAxis;
public class BarChartAggregatorForIntervals implements CustomAggregator, IndexedAggregator, BarChart { public class BarChartAggregatorForIntervals implements CustomAggregator, IndexedAggregator, BarChart {
private static final double SPACE_BETWEEN_BARS = 0.6;
private final Path tmpDir; private final Path tmpDir;
private Long index = null; private Long index = null;
@@ -77,13 +79,14 @@ public class BarChartAggregatorForIntervals implements CustomAggregator, Indexed
@Override @Override
public String asCsv() { public String asCsv() {
final StringBuilder csv = new StringBuilder(); final StringBuilder csv = new StringBuilder();
final boolean isMiddleSeries = getIndex() == numberOfDataSeries / 2;
int offset = 0; int offset = 0;
for (final String bucketId : bucketIds()) { for (final String bucketId : bucketIds()) {
final long count = buckets.get(bucketId).get(); final long count = buckets.get(bucketId).get();
csv.append(getIndex() + 0.5 + offset); csv.append(offset + getIndex() * SPACE_BETWEEN_BARS + 0.5);
csv.append(","); csv.append(",");
csv.append(bucketId); csv.append(isMiddleSeries ? bucketId : "");
csv.append(","); csv.append(",");
csv.append(count); csv.append(count);
csv.append("\n"); csv.append("\n");
@@ -131,8 +134,8 @@ public class BarChartAggregatorForIntervals implements CustomAggregator, Indexed
final long count = buckets.get(bucketId).get(); final long count = buckets.get(bucketId).get();
final String label = String.format("set label at %s %f, %d '%s' center front offset 0,0.3\n", // front final String label = String.format("set label at %s %f, %d '%s' center front offset 0,0.3\n", // front
xAxis == GnuplotAxis.X1 ? "first" : "second", // xAxis == GnuplotAxis.X1 ? "first" : "second", //
getIndex() + 0.5 + offset, // offset + getIndex() * SPACE_BETWEEN_BARS + 0.5, // x-axis position of the label
count, // count, // y axis position of the label
String.format(Locale.US, "%,d", count)); String.format(Locale.US, "%,d", count));
result.append(label); result.append(label);

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

@@ -42,7 +42,6 @@ public class BarChartHandler extends AggregateHandler {
result.setType(Type.Group); result.setType(Type.Group);
result.setAxis(getxAxis()); result.setAxis(getxAxis());
result.setTicsEnabled(false); result.setTicsEnabled(false);
// TODO revert next two lines
result.setFrom("0"); result.setFrom("0");
// result.setTo(String.valueOf(dataSeries.size())); // result.setTo(String.valueOf(dataSeries.size()));

10
pdb-plotting/src/main/java/org/lucares/pdb/plot/api/Interval.java
View File

@@ -62,15 +62,15 @@ public class Interval {
private String toDateFormatForBucketer(final IntervalTimeUnit intervalTimeUnit) { private String toDateFormatForBucketer(final IntervalTimeUnit intervalTimeUnit) {
switch (intervalTimeUnit) { switch (intervalTimeUnit) {
case MINUTE: case MINUTE:
return "yyyyMMddHHmm"; return "yyyy-MM-dd HH:mm";
case HOUR: case HOUR:
return "yyyyMMddHH"; return "yyyy-MM-dd HH";
case DAY: case DAY:
return "yyyyMMdd"; return "yyyy-MM-dd";
case WEEK: case WEEK:
return "YYYYww"; // use week based year! Otherwise intervals over the year boundary will be wrong return "YYYY-ww"; // use week based year! Otherwise intervals over the year boundary will be wrong
case MONTH: case MONTH:
return "yyyyMM"; return "yyyy-MM";
case YEAR: case YEAR:
return "yyyy"; return "yyyy";
default: default: