From b5bed567b3e761a475c95181591475985484128a Mon Sep 17 00:00:00 2001 From: Johannes Mey <johannes.mey@tu-dresden.de> Date: Sat, 23 Mar 2019 13:35:24 +0100 Subject: [PATCH] improve diagrams for journal paper --- .../trainbenchmark-reporting/combined.R | 16 ++++++++-------- .../trainbenchmark-reporting/individual.R | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/trainbenchmark/trainbenchmark-reporting/combined.R b/trainbenchmark/trainbenchmark-reporting/combined.R index bd8fceaec..985cc3265 100644 --- a/trainbenchmark/trainbenchmark-reporting/combined.R +++ b/trainbenchmark/trainbenchmark-reporting/combined.R @@ -29,8 +29,6 @@ for (scenario in c("inject", "repair")) { # load the data tsvs = list.files(paste("../results/merged/benchmark", sep="/"), pattern = paste("times-.*", scenario, ".*\\.csv", sep=""), full.names = T, recursive = T) - print("TESTTEST") - l = lapply(tsvs, read.csv) times = rbindlist(l) @@ -122,7 +120,9 @@ for (scenario in c("inject", "repair")) { p = ggplot(df) + #na.omit(df)) + aes(x = as.factor(Model), y = Time) + - labs(title = paste("Individual query execution time,", phase, "phase"), x = "Model size\n#Elements", y = "Execution times [ms]") + + # labs(title = paste("Individual query execution time,", phase, "phase"), x = "Model size\n#Elements", y = "Execution times [ms]") + + labs(title = element_blank(), x = element_blank(), y = element_blank()) + + geom_point(aes(col = Tool, shape = Tool), size = 2.0) + scale_shape_manual(values = c(1,16, 0,15, 2,17, 5,18, 8,10)) + # scale_shape_manual(values = c(1,21, 0,22, 2,24, 5,23, 6,25)) + @@ -138,7 +138,7 @@ for (scenario in c("inject", "repair")) { geom_line(aes(col = Tool, group = Tool), size = 0.5) + # scale_linetype_manual(values=c(0,1,2,3,4,5,6,7,8,9), na.value="blank") + scale_x_discrete(breaks = xbreaks, labels = xlabels) + - scale_y_log10(breaks = ybreaks, minor_breaks=yminor_breaks, labels = ylabels, limits = c(2e-3,8e4), expand = c(0, 0)) + + scale_y_log10(breaks = ybreaks, minor_breaks=yminor_breaks, labels = ylabels, limits = c(2e-3,2e4), expand = c(0, 0)) + guides(color = guide_legend(ncol = 5)) + theme_bw() + theme( @@ -147,8 +147,8 @@ for (scenario in c("inject", "repair")) { # legend.key = element_blank(), legend.title = element_blank(), strip.text.x = element_blank(), - legend.position = "bottom", # "none", # - axis.text = element_text(size = 16) + legend.position = "none", # "none", # + axis.text = element_text(size = 12) #, panel.grid.minor = element_blank() ) fnTmp <- paste("../diagrams/recent/benchmark/", scenario, "/", phase.filename, "-", scenario, "-tmp.pdf", sep="") @@ -156,8 +156,8 @@ for (scenario in c("inject", "repair")) { ggsave( plot = p, filename = fnTmp, - width = 250, - height = 150, + width = 80, + height = 100, units = "mm" ) embed_fonts(fnTmp, outfile=fn) diff --git a/trainbenchmark/trainbenchmark-reporting/individual.R b/trainbenchmark/trainbenchmark-reporting/individual.R index 3897760c9..b43b5f2c9 100644 --- a/trainbenchmark/trainbenchmark-reporting/individual.R +++ b/trainbenchmark/trainbenchmark-reporting/individual.R @@ -144,7 +144,7 @@ for (scenario in c("inject", "repair")) { geom_line(aes(col = Tool, group = Tool), size = 0.5) + # scale_linetype_manual(values=c(0,1,2,3,4,5,6,7,8,9), na.value="blank") + scale_x_discrete(breaks = xbreaks, labels = xlabels) + - scale_y_log10(breaks = ybreaks, minor_breaks=yminor_breaks, labels = ylabels, limits = c(2e-3,8e4), expand = c(0, 0)) + + scale_y_log10(breaks = ybreaks, minor_breaks=yminor_breaks, labels = ylabels, limits = c(2e-3,2e4), expand = c(0, 0)) + facet_grid_paginate(~ Workload, nrow=1, ncol = 1, page=cpage, scale = "free") + guides(color = guide_legend(ncol = 5)) + theme_bw() + @@ -154,8 +154,8 @@ for (scenario in c("inject", "repair")) { # legend.key = element_blank(), legend.title = element_blank(), strip.text.x = element_blank(), - legend.position = "bottom", # "none", # - axis.text = element_text(size = 16) + legend.position = "none", # "none", # + axis.text = element_text(size = 11) #, panel.grid.minor = element_blank() ) fnTmp <- paste("../diagrams/recent/", scenario, "/", phase.filename, "-", workloads[cpage], "-", scenario, "-tmp.pdf", sep="") @@ -163,8 +163,8 @@ for (scenario in c("inject", "repair")) { ggsave( plot = p, filename = fnTmp, - width = 250, - height = 150, + width = 100, + height = 130, units = "mm" ) embed_fonts(fnTmp, outfile=fn) -- GitLab