commit ea45da10fde9180f6a9093d3fcf927ec365941f4 Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Mon Jul 13 10:10:38 2015 +0200 Remove service addresses, add graph letters (#15513). --- task-15513/plot.R | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/task-15513/plot.R b/task-15513/plot.R index 4f83c6d..078c791 100644 --- a/task-15513/plot.R +++ b/task-15513/plot.R @@ -8,8 +8,8 @@ ggplot(l, aes(x = lifetime_millis / 3600000, colour = service)) + scale_x_continuous("\nLifetime in hours", limits = c(0, max(l$lifetime_millis) / 3600000)) + scale_y_continuous("Cumulative fraction\n", labels = percent) + - scale_colour_hue("Service") + - ggtitle("Lifetime of introduction points\n") + scale_colour_hue("Service", guide = FALSE) + + ggtitle("(a) Lifetime of introduction points\n") l <- read.csv("published-descs.csv") ggplot(l, aes(x = descs, colour = service)) + @@ -17,8 +17,8 @@ ggplot(l, aes(x = descs, colour = service)) + scale_x_continuous("\nNumber of descriptors", limits = c(0, max(l$descs))) + scale_y_continuous("Cumulative fraction\n", labels = percent) + - scale_colour_hue("Service") + - ggtitle(paste("Number of descriptors published per hour,\n", + scale_colour_hue("Service", guide = FALSE) + + ggtitle(paste("(b) Number of descriptors published per hour,\n", "including descriptor replicas\n", sep = "")) l <- read.csv("established-intros.csv") @@ -27,8 +27,8 @@ ggplot(l, aes(x = intros, colour = service)) + scale_x_continuous("\nNumber of introduction points", limits = c(0, max(l$intros))) + scale_y_continuous("Cumulative fraction\n", labels = percent) + - scale_colour_hue("Service") + - ggtitle("Number of distinct introduction points used per hour\n") + scale_colour_hue("Service", guide = FALSE) + + ggtitle("(c) Number of distinct introduction points used per hour\n") l <- read.csv("intros-per-desc.csv") ggplot(l, aes(x = introsperdesc, colour = service)) + @@ -37,8 +37,8 @@ ggplot(l, aes(x = introsperdesc, colour = service)) + limits = c(0, max(l$introsperdesc)), breaks = seq(0, max(l$introsperdesc), 2)) + scale_y_continuous("Cumulative fraction\n", labels = percent) + - scale_colour_hue("Service") + - ggtitle("Number of introduction points per descriptor\n") + scale_colour_hue("Service", guide = FALSE) + + ggtitle("(d) Number of introduction points per descriptor\n") l <- read.csv("intros-per-relay.csv") data <- rbind( @@ -64,9 +64,9 @@ ggplot(data) + limits = c(0, max(data$x))) + scale_y_continuous(paste("Cumulative number of relays used for", "introduction points\n")) + - scale_colour_hue("Service") + - ggtitle(paste("Number of introduction points established on\nthe same", - "relay (in the measurement period)\n")) + scale_colour_hue("Service", guide = FALSE) + + ggtitle(paste("(e) Number of introduction points established on\nthe", + "same relay (in the measurement period)\n")) data <- data[as.character(data$colour) != "agorahooawayyfoe", ] ggplot(data) + @@ -75,9 +75,9 @@ ggplot(data) + limits = c(0, max(data$x, na.rm = TRUE))) + scale_y_continuous(paste("Cumulative number of relays used for", "introduction points\n")) + - scale_colour_hue("Service") + - ggtitle(paste("Number of introduction points established on\nthe same", - "relay (in the measurement period)\n")) + scale_colour_hue("Service", guide = FALSE) + + ggtitle(paste("(f) Number of introduction points established on\nthe", + "same relay (in the measurement period)\n")) l <- read.csv("intros-per-desc.csv") l <- aggregate(list(introsperdesc = l$introsperdesc), by = list( @@ -90,7 +90,9 @@ ggplot(l, aes(x = as.POSIXct(publication, facet_grid(service ~ .) + scale_x_datetime("") + scale_y_continuous("") + - ggtitle("Number of introduction points over time\n") + ggtitle("(g) Number of introduction points over time\n") + + theme(strip.background = element_blank(), + strip.text.y = element_blank()) l <- read.csv("novel-introduction-points.csv") ggplot(l, aes( @@ -99,7 +101,7 @@ ggplot(l, aes( geom_line() + scale_x_datetime("") + scale_y_continuous("Cumulative number of relays\n") + - scale_colour_hue("Service") + - ggtitle(paste("Cumulative number of distinct relays\nused for", + scale_colour_hue("Service", guide = FALSE) + + ggtitle(paste("(h) Cumulative number of distinct relays\nused for", "establishing introduction points\n"))