[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [metrics-web/master] Update to ggplot2 2.2.x.

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [metrics-web/master] Update to ggplot2 2.2.x.
From: karsten@xxxxxxxxxxxxxx
Date: Thu, 27 Jul 2017 09:12:21 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 27 Jul 2017 05:12:33 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Karsten Loesing <karsten.loesing@xxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>
commit e86a9a0a547eb4bfd0bc37049781e5b524e8b3a5
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Thu Jul 27 11:06:31 2017 +0200

    Update to ggplot2 2.2.x.
    
    This patch fixes a few issues from switching to the new ggplot2
    version 2.2.1 in Debian stretch:
    
     - Explicitly center the main plot title again, which was changed to
       left-aligned in 2.2.x.
     - Replace breaks and minor_breaks in scale_x_date with date_breaks
       and date_minor_breaks as required by 2.2.x.
     - Remove proto as dependency, because it's not required by ggplot2
       2.2.x anymore, and remove three other unused or automatically
       loaded dependencies while touching this code.
---
 website/rserve/graphs.R      | 94 ++++++++++++++++++++++----------------------
 website/rserve/rserve-init.R |  4 --
 2 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R
index aafb505..c18e228 100644
--- a/website/rserve/graphs.R
+++ b/website/rserve/graphs.R
@@ -273,6 +273,8 @@ formatter <- function(x, ...) {
   format(x, ..., scientific = FALSE, big.mark = ' ')
 }
 
+theme_update(plot.title = element_text(hjust = 0.5))
+
 plot_networksize <- function(start, end, path) {
   end <- min(end, as.character(Sys.Date() - 2))
   s <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/",
@@ -298,8 +300,8 @@ plot_networksize <- function(start, end, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = "", limits = c(0, max(networksize$value,
         na.rm = TRUE))) +
     scale_colour_hue("", breaks = c("relays", "bridges"),
@@ -335,8 +337,8 @@ plot_relaycountries <- function(start, end, country, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = "", limits = c(0, max(s$relays,
         na.rm = TRUE)), formatter = formatter) +
     ggtitle(title)
@@ -371,8 +373,8 @@ plot_versions <- function(start, end, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = "",
       limits = c(0, max(versions$relays, na.rm = TRUE))) +
     scale_colour_manual(name = "Tor version",
@@ -400,8 +402,8 @@ plot_platforms <- function(start, end, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = "",
       limits = c(0, max(platforms$value, na.rm = TRUE))) +
     scale_colour_manual(name = "Platform",
@@ -430,8 +432,8 @@ plot_bandwidth <- function(start, end, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = "Bandwidth (Gbit/s)",
         limits = c(0, max(bandwidth$value, na.rm = TRUE) * 8 / 1e9)) +
     scale_colour_hue(name = "", h.start = 90,
@@ -477,8 +479,8 @@ plot_bwhist_flags <- function(start, end, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name="Bandwidth (Gbit/s)",
         limits = c(0, max(bw$value, na.rm = TRUE) * 8 / 1e9)) +
     scale_colour_manual(name = "",
@@ -506,8 +508,8 @@ plot_dirbytes <- function(start, end, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name="Bandwidth (Gbit/s)",
         limits = c(0, max(dir$value, na.rm = TRUE) * 8 / 1e9)) +
     scale_colour_hue(name = "",
@@ -548,8 +550,8 @@ plot_relayflags <- function(start, end, flags, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor, limits = as.Date(c(start, end))) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor, limits = as.Date(c(start, end))) +
     scale_y_continuous(name = "", limits = c(0, max(networksize$value,
         na.rm = TRUE))) +
     scale_colour_manual(name = "Relay flags", values = c("#E69F00",
@@ -596,8 +598,8 @@ plot_torperf <- function(start, end, source, server, filesize, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = "") +
     expand_limits(y = 0) +
     scale_fill_manual(name = paste("Measured times on",
@@ -650,8 +652,8 @@ plot_torperf_failures <- function(start, end, source, server, filesize, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = "", labels = percent) +
     scale_colour_hue(name = paste("Problems encountered on",
         ifelse(source == "all", "all sources", source)),
@@ -684,8 +686,8 @@ plot_connbidirect <- function(start, end, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = "", labels = percent) +
     scale_colour_hue(name = "Medians and interquartile ranges",
                      breaks = c("both", "write", "read"),
@@ -753,8 +755,8 @@ plot_bandwidth_flags <- function(start, end, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name="Bandwidth (Gbit/s)",
         limits = c(0, max(bandwidth$value, na.rm = TRUE) * 8 / 1e9)) +
     scale_colour_manual(name = "",
@@ -883,8 +885,8 @@ plot_userstats <- function(start, end, node, variable, value, events,
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = "", labels = formatter) +
     expand_limits(y = 0) +
     ggtitle(title)
@@ -948,8 +950,8 @@ plot_userstats_bridge_combined <- function(start, end, country, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = "", limits = c(0, max_y),
         labels = formatter) +
     scale_colour_hue(paste("Top-", top, " transports", sep = "")) +
@@ -979,8 +981,8 @@ plot_advbwdist_perc <- function(start, end, p, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = "Advertised bandwidth in Gbit/s\n",
         limits = c(0, max(t$advbw, na.rm = TRUE))) +
     scale_colour_hue(name = "Percentile",
@@ -1007,8 +1009,8 @@ plot_advbwdist_relay <- function(start, end, n, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = "Advertised bandwidth in Gbit/s\n",
         limits = c(0, max(t$advbw, na.rm = TRUE))) +
     scale_colour_hue(name = "n", breaks = levels(t$relay)) +
@@ -1031,8 +1033,8 @@ plot_hidserv_dir_onions_seen <- function(start, end, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = "") +
     ggtitle("Unique .onion addresses\n")
   ggsave(filename = path, width = 8, height = 5, dpi = 72)
@@ -1055,8 +1057,8 @@ plot_hidserv_rend_relayed_cells <- function(start, end, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = "") +
     ggtitle("Onion-service traffic in Mbit/s\n")
   ggsave(filename = path, width = 8, height = 5, dpi = 72)
@@ -1081,8 +1083,8 @@ plot_hidserv_frac_reporting <- function(start, end, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = "", labels = percent) +
     scale_colour_hue(name = "",
                      breaks = c("rend-relayed-cells", "dir-onions-seen"),
@@ -1114,8 +1116,8 @@ plot_webstats_tb <- function(start, end, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = 'Requests per day\n', labels = formatter) +
     theme(strip.text.y = element_text(angle = 0, hjust = 0, size = rel(1.5)),
           strip.background = element_rect(fill = NA)) +
@@ -1138,8 +1140,8 @@ plot_webstats_tb_platform <- function(start, end, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = 'Requests per day\n', labels = formatter) +
     scale_colour_hue(name = "Platform",
         breaks = c("w", "m", "l", "o", ""),
@@ -1169,8 +1171,8 @@ plot_webstats_tb_locale <- function(start, end, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = 'Requests per day\n', labels = formatter) +
     scale_colour_hue(name = "Locale",
         breaks = c(e$locale, "(other)"),
@@ -1199,8 +1201,8 @@ plot_webstats_tm <- function(start, end, path) {
     scale_x_date(name = paste("\nThe Tor Project - ",
         "https://metrics.torproject.org/";, sep = ""),
         labels = date_format(date_breaks$format),
-        breaks = date_breaks$major,
-        minor_breaks = date_breaks$minor) +
+        date_breaks = date_breaks$major,
+        date_minor_breaks = date_breaks$minor) +
     scale_y_continuous(name = 'Requests per day\n', labels = formatter) +
     theme(strip.text.y = element_text(angle = 0, hjust = 0, size = rel(1.5)),
           strip.background = element_rect(fill = NA)) +
diff --git a/website/rserve/rserve-init.R b/website/rserve/rserve-init.R
index 004d870..5cdf9c2 100644
--- a/website/rserve/rserve-init.R
+++ b/website/rserve/rserve-init.R
@@ -1,11 +1,7 @@
 ##Pre-loaded libraries and graphing functions to speed things up
 
 library("ggplot2")
-library("proto")
-library("grid")
 library("reshape")
-library("plyr")
-library("digest")
 library("RColorBrewer")
 library("scales")
 

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
Prev by Author: [tor-commits] [collector/master] Bump version to 1.2.0-dev.
Next by Author: [tor-commits] [metrics-web/master] Make external links more obvious.
Previous by thread: [tor-commits] [tor/release-0.2.5] Fix CI homebrew checks for outdated packages.
Next by thread: [tor-commits] [translation/tails-perl5lib] Update translations for tails-perl5lib
Index(es):
- Author
- Thread