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

cleanup

Browse Source
This commit is contained in:
Andreas Huber
2019-11-23 19:12:23 +01:00
parent 4879c6cdc7
commit 3048f67e9a
4 changed files with 119 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,6 +122,7 @@ public class AxisSettings {
return ticsLabels; return ticsLabels;
} }
public String toGnuplotDefinition(boolean renderLabels) { public String toGnuplotDefinition(boolean renderLabels) {
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
if (type == Type.Time) { if (type == Type.Time) {

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

@@ -3,7 +3,10 @@ package org.lucares.recommind.logs;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.util.Collection; import java.util.Collection;
import java.util.concurrent.TimeUnit;
import org.lucares.collections.LongList;
import org.lucares.pdb.api.DateTimeRange;
import org.lucares.pdb.plot.api.AxisScale; import org.lucares.pdb.plot.api.AxisScale;
import org.lucares.recommind.logs.AxisSettings.Type; import org.lucares.recommind.logs.AxisSettings.Type;
@@ -30,7 +33,7 @@ public class AxisTime {
result.setFormat(formatX); result.setFormat(formatX);
result.setFrom(formattedMinDate); result.setFrom(formattedMinDate);
result.setTo(formattedMaxDate); result.setTo(formattedMaxDate);
result.setTicIncrement(XAxisTimeTics.computeTimeTicIncrement(settings.getWidth(), settings.getDateTimeRange())); result.setTicIncrement(computeTimeTicIncrement(settings.getWidth(), settings.getDateTimeRange()));
return result; return result;
} }
@@ -57,4 +60,66 @@ public class AxisTime {
return result; return result;
} }
public static double computeTimeTicIncrement(int width, DateTimeRange dateTimeRange) {
final long startEpochMilli = dateTimeRange.getStartEpochMilli();
final long endEpochMilli = dateTimeRange.getEndEpochMilli();
final long rangeInMs = endEpochMilli - startEpochMilli + 1;
int widthInPx = width - GnuplotSettings.GNUPLOT_LEFT_RIGHT_MARGIN;
final long maxLabels = Math.max(1, widthInPx / (GnuplotSettings.TICKS_FONT_SIZE * 8));
final long tickIncrement = roundToTickIncrement(rangeInMs / maxLabels);
return tickIncrement/1000.0;
}
private static long roundToTickIncrement(long milliseconds) {
LongList increments = LongList.of(
100,
200,
500,
TimeUnit.SECONDS.toMillis(1),
TimeUnit.SECONDS.toMillis(2),
TimeUnit.SECONDS.toMillis(5),
TimeUnit.SECONDS.toMillis(10),
TimeUnit.SECONDS.toMillis(15),
TimeUnit.SECONDS.toMillis(30),
TimeUnit.MINUTES.toMillis(1),
TimeUnit.MINUTES.toMillis(2),
TimeUnit.MINUTES.toMillis(5),
TimeUnit.MINUTES.toMillis(10),
TimeUnit.MINUTES.toMillis(15),
TimeUnit.MINUTES.toMillis(30),
TimeUnit.HOURS.toMillis(1),
TimeUnit.HOURS.toMillis(2),
TimeUnit.HOURS.toMillis(3),
TimeUnit.HOURS.toMillis(6),
TimeUnit.HOURS.toMillis(12),
TimeUnit.HOURS.toMillis(18),
TimeUnit.DAYS.toMillis(1),
TimeUnit.DAYS.toMillis(2),
TimeUnit.DAYS.toMillis(3),
TimeUnit.DAYS.toMillis(4),
TimeUnit.DAYS.toMillis(5),
TimeUnit.DAYS.toMillis(6),
TimeUnit.DAYS.toMillis(7),
TimeUnit.DAYS.toMillis(14),
TimeUnit.DAYS.toMillis(30),
TimeUnit.DAYS.toMillis(90),
TimeUnit.DAYS.toMillis(180),
TimeUnit.DAYS.toMillis(365),
TimeUnit.DAYS.toMillis(365*2),
TimeUnit.DAYS.toMillis(365*5),
TimeUnit.DAYS.toMillis(365*10),
TimeUnit.DAYS.toMillis(365*20)
);
for ( int i = 0; i < increments.size(); i++) {
if (increments.get(i) > milliseconds) {
return increments.get(i);
}
}
return TimeUnit.DAYS.toMillis(365*10);
}
} }

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

@@ -7,7 +7,7 @@ import org.lucares.pdb.plot.api.Appender;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class GnuplotFileGenerator implements Appender{ public class GnuplotFileGenerator implements Appender {
private static final Logger LOGGER = LoggerFactory.getLogger(GnuplotFileGenerator.class); private static final Logger LOGGER = LoggerFactory.getLogger(GnuplotFileGenerator.class);
@@ -23,20 +23,17 @@ public class GnuplotFileGenerator implements Appender{
appendfln(result, "set datafile separator \"%s\"", settings.getDatafileSeparator()); appendfln(result, "set datafile separator \"%s\"", settings.getDatafileSeparator());
appendfln(result, "set timefmt '%s'", settings.getTimefmt()); appendfln(result, "set timefmt '%s'", settings.getTimefmt());
//settings.getAggregates().addGnuplotDefinitions(result, dataSeries);
final List<AxisSettings> xAxisDefinitions = settings.getAggregates().getXAxisDefinitions(settings, dataSeries); final List<AxisSettings> xAxisDefinitions = settings.getAggregates().getXAxisDefinitions(settings, dataSeries);
for (AxisSettings axisSettings : xAxisDefinitions) { for (AxisSettings axisSettings : xAxisDefinitions) {
appendln(result, axisSettings.toGnuplotDefinition(settings.isRenderLabels())); appendln(result, axisSettings.toGnuplotDefinition(settings.isRenderLabels()));
} }
final List<AxisSettings> yAxisDefinitions = settings.getAggregates().getYAxisDefinitions(settings, dataSeries); final List<AxisSettings> yAxisDefinitions = settings.getAggregates().getYAxisDefinitions(settings, dataSeries);
if(dataSeries.isEmpty()) { if (dataSeries.isEmpty()) {
// If there is no data, then Gnuplot won't generate an image. // If there is no data, then Gnuplot won't generate an image.
// Workaround is to explicitly specify the y-axis range. // Workaround is to explicitly specify the y-axis range.
// We choose a range for which no ticks are defined. This creates an empty y-axis. // We choose a range for which no ticks are defined. This creates an empty
// y-axis.
yAxisDefinitions.forEach(s -> s.setFrom("0")); yAxisDefinitions.forEach(s -> s.setFrom("0"));
yAxisDefinitions.forEach(s -> s.setFrom("-1")); yAxisDefinitions.forEach(s -> s.setFrom("-1"));
} }
@@ -44,60 +41,20 @@ public class GnuplotFileGenerator implements Appender{
appendln(result, axisSettings.toGnuplotDefinition(settings.isRenderLabels())); appendln(result, axisSettings.toGnuplotDefinition(settings.isRenderLabels()));
} }
// final XAxisSettings xAxis = settings.getxAxisSettings();
// if (xAxis.getType() == Type.Time) {
// appendfln(result, "set xdata time");
// appendln(result, XAxisTimeTics.computeXTimeIncrements(settings));
// appendfln(result, "set format x \"%s\"", xAxis.getFormat());
// }
// appendfln(result, "set xtics nomirror rotate by %d", xAxis.getRotateXAxisLabel());
// appendfln(result, "set xlabel \"%s\"", xAxis.getLabel());
// appendfln(result, "set xrange [\"%s\":\"%s\"]", xAxis.getFrom(), xAxis.getTo());
// final int graphOffset = settings.getYAxisScale() == AxisScale.LINEAR ? 0 : 1;
// if (settings.hasYRange()) {
// final int min = Math.max(settings.getYRangeMin(), graphOffset);
// final int max = settings.getYRangeMax();
// appendfln(result, String.format("set yrange [\"%d\":\"%d\"]", min, max));
// } else if(dataSeries.isEmpty()) {
// // If there is no data, then Gnuplot won't generate an image.
// // Workaround is to explicitly specify the y-axis range.
// // We choose a range for which no ticks are defined. This creates an empty y-axis.
// appendfln(result, "set yrange [\"%d\":\"%d\"]", 0, -1);
// }else {
// appendfln(result, "set yrange [\"" + graphOffset + "\":]");
// }
//
// switch (settings.getYAxisScale()) {
// case LINEAR:
// break;
// case LOG10:
// appendfln(result, "set logscale y");
// break;
// }
appendfln(result, "set grid"); appendfln(result, "set grid");
appendfln(result, "set output \"%s\"", settings.getOutput().toAbsolutePath().toString().replace("\\", "/")); appendfln(result, "set output \"%s\"", settings.getOutput().toAbsolutePath().toString().replace("\\", "/"));
if (settings.isKeyOutside()) {
appendfln(result, "set key outside");
}
appendfln(result, "set key font \",%d\"", KEY_FONT_SIZE); appendfln(result, "set key font \",%d\"", KEY_FONT_SIZE);
appendfln(result, "set tics font \",%d\"", GnuplotSettings.TICKS_FONT_SIZE);
if (!settings.isRenderLabels()) { if (!settings.isRenderLabels()) {
// appendfln(result, "set format x \"\"");
// appendfln(result, "set xlabel \"\"");
// appendfln(result, "set x2label \"\"");
// appendln(result, "set format x2 \"\"");
//
// appendfln(result, "set ylabel \"\"");
// appendln(result, "set format y \"\"");
// appendln(result, "set y2label \"\"");
// appendln(result, "set format y2 \"\"");
appendln(result, "set nokey"); appendln(result, "set nokey");
} else if (!settings.isKeyOutside()) { } else {
if (settings.isKeyOutside()) {
appendfln(result, "set key outside");
} else {
// make sure left and right margins are always the same // make sure left and right margins are always the same
// this is need to be able to zoom in by selecting a region // this is need to be able to zoom in by selecting a region
// (horizontal: 1 unit = 10px; vertical: 1 unit = 19px) // (horizontal: 1 unit = 10px; vertical: 1 unit = 19px)
@@ -105,12 +62,7 @@ public class GnuplotFileGenerator implements Appender{
appendln(result, "set rmargin 11"); // margin 11 -> 110px appendln(result, "set rmargin 11"); // margin 11 -> 110px
appendln(result, "set tmargin 3"); // margin 3 -> 57px - marker (1) appendln(result, "set tmargin 3"); // margin 3 -> 57px - marker (1)
appendln(result, "set bmargin 4"); // margin 4 -> 76 appendln(result, "set bmargin 4"); // margin 4 -> 76
}
appendfln(result, "set tics font \",%d\"", GnuplotSettings.TICKS_FONT_SIZE);
//appendln(result, YAxisTicks.computeYTicks(settings, dataSeries));
} else {
appendfln(result, "set tics font \",%d\"", GnuplotSettings.TICKS_FONT_SIZE);
//appendln(result, YAxisTicks.computeYTicks(settings, dataSeries));
} }
appendf(result, "plot "); appendf(result, "plot ");
@@ -125,8 +77,4 @@ public class GnuplotFileGenerator implements Appender{
return result.toString(); return result.toString();
} }
} }

84
pdb-plotting/src/main/java/org/lucares/recommind/logs/XAxisTimeTics.java
View File

@@ -1,84 +0,0 @@
package org.lucares.recommind.logs;
import java.util.concurrent.TimeUnit;
import org.lucares.collections.LongList;
import org.lucares.pdb.api.DateTimeRange;
public class XAxisTimeTics {
public static String computeXTimeIncrements(GnuplotSettings settings) {
DateTimeRange dateTimeRange = settings.getDateTimeRange();
return computeXTimeIncrements(settings.getWidth(), dateTimeRange);
}
public static String computeXTimeIncrements(int width, DateTimeRange dateTimeRange) {
final double ticIncrement = computeTimeTicIncrement(width, dateTimeRange);
return "set xtics "+ ticIncrement;
}
public static double computeTimeTicIncrement(int width, DateTimeRange dateTimeRange) {
final long startEpochMilli = dateTimeRange.getStartEpochMilli();
final long endEpochMilli = dateTimeRange.getEndEpochMilli();
final long rangeInMs = endEpochMilli - startEpochMilli + 1;
int widthInPx = width - GnuplotSettings.GNUPLOT_LEFT_RIGHT_MARGIN;
final long maxLabels = Math.max(1, widthInPx / (GnuplotSettings.TICKS_FONT_SIZE * 8));
final long tickIncrement = roundToTickIncrement(rangeInMs / maxLabels);
return tickIncrement/1000.0;
}
private static long roundToTickIncrement(long milliseconds) {
LongList increments = LongList.of(
100,
200,
500,
TimeUnit.SECONDS.toMillis(1),
TimeUnit.SECONDS.toMillis(2),
TimeUnit.SECONDS.toMillis(5),
TimeUnit.SECONDS.toMillis(10),
TimeUnit.SECONDS.toMillis(15),
TimeUnit.SECONDS.toMillis(30),
TimeUnit.MINUTES.toMillis(1),
TimeUnit.MINUTES.toMillis(2),
TimeUnit.MINUTES.toMillis(5),
TimeUnit.MINUTES.toMillis(10),
TimeUnit.MINUTES.toMillis(15),
TimeUnit.MINUTES.toMillis(30),
TimeUnit.HOURS.toMillis(1),
TimeUnit.HOURS.toMillis(2),
TimeUnit.HOURS.toMillis(3),
TimeUnit.HOURS.toMillis(6),
TimeUnit.HOURS.toMillis(12),
TimeUnit.HOURS.toMillis(18),
TimeUnit.DAYS.toMillis(1),
TimeUnit.DAYS.toMillis(2),
TimeUnit.DAYS.toMillis(3),
TimeUnit.DAYS.toMillis(4),
TimeUnit.DAYS.toMillis(5),
TimeUnit.DAYS.toMillis(6),
TimeUnit.DAYS.toMillis(7),
TimeUnit.DAYS.toMillis(14),
TimeUnit.DAYS.toMillis(30),
TimeUnit.DAYS.toMillis(90),
TimeUnit.DAYS.toMillis(180),
TimeUnit.DAYS.toMillis(365),
TimeUnit.DAYS.toMillis(365*2),
TimeUnit.DAYS.toMillis(365*5),
TimeUnit.DAYS.toMillis(365*10),
TimeUnit.DAYS.toMillis(365*20)
);
for ( int i = 0; i < increments.size(); i++) {
if (increments.get(i) > milliseconds) {
return increments.get(i);
}
}
return TimeUnit.DAYS.toMillis(365*10);
}
}