[tor-commits] [metrics-tasks/master] There's a new bwauth in town, and it's going to be orange.

[karsten at torproject.org]

commit d91ae44fe39a8ed68368427e8b90dc027c4aa41c
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Nov 9 08:27:56 2011 +0100

    There's a new bwauth in town, and it's going to be orange.
---
 task-2394/ParseDescriptors.java  |    2 ++
 task-2394/bandwidth-comparison.R |   18 +++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/task-2394/ParseDescriptors.java b/task-2394/ParseDescriptors.java
index 7ddab73..fbbc4b5 100644
--- a/task-2394/ParseDescriptors.java
+++ b/task-2394/ParseDescriptors.java
@@ -42,6 +42,8 @@ public class ParseDescriptors {
         "moria1");
     bandwidthAuthorities.put("ED03BB616EB2F60BEC80151114BB25CEF515B226",
         "gabelmoo");
+    bandwidthAuthorities.put("49015F787433103580E3B66A1707A00E60F2D15B",
+        "maatuska");
     BufferedWriter bw = new BufferedWriter(new FileWriter(
         "bandwidth-comparison.csv"));
     bw.write("validafter,fingerprint,nickname,category,"
diff --git a/task-2394/bandwidth-comparison.R b/task-2394/bandwidth-comparison.R
index 50739b7..56095ef 100644
--- a/task-2394/bandwidth-comparison.R
+++ b/task-2394/bandwidth-comparison.R
@@ -40,6 +40,7 @@ cdf_relays_category_votes <- function(data, category) {
   urras <- sort(d$urrasbandwidth * 1000 / d$descriptorbandwidth)
   moria1 <- sort(d$moria1bandwidth * 1000 / d$descriptorbandwidth)
   gabelmoo <- sort(d$gabelmoobandwidth * 1000 / d$descriptorbandwidth)
+  maatuska <- sort(d$maatuskabandwidth * 1000 / d$descriptorbandwidth)
   d <- data.frame(x = consensus,
                y = (1:length(consensus)) / length(consensus),
                source = "consensus",
@@ -68,6 +69,12 @@ cdf_relays_category_votes <- function(data, category) {
                source = "gabelmoo",
                category = category))
   }
+  if (length(maatuska) > 0) {
+    d <- rbind(d, data.frame(x = maatuska,
+               y = (1:length(maatuska)) / length(maatuska),
+               source = "maatuska",
+               category = category))
+  }
   d
 }
 relays_category_votes <- rbind(
@@ -87,7 +94,8 @@ scale_y_continuous("Fraction of relays\n", limits = c(0, 1),
   formatter = "percent") +
 scale_colour_manual("", c("consensus" = "black",
   "urras" = alpha("purple", 0.5), "ides" = alpha("red", 0.5),
-  "moria1" = alpha("green", 0.5), "gabelmoo" = alpha("blue", 0.5))) +
+  "moria1" = alpha("green", 0.5), "gabelmoo" = alpha("blue", 0.5),
+  "maatuska" = alpha("orange", 0.5))) +
 geom_vline(xintercept = 1, legend = FALSE, linetype = "dotted") +
 opts(title = paste("Measured vs. self-reported bandwidth ratios in",
   "consensus and votes\n"), legend.position = "right")
@@ -127,7 +135,10 @@ cdf_measured_category_votes <- function(data, category) {
       measured = d$moria1bandwidth), "moria1", category),
     wecdf(data.frame(
       ratio = d$gabelmoobandwidth * 1000 / d$descriptorbandwidth,
-      measured = d$gabelmoobandwidth), "gabelmoo", category))
+      measured = d$gabelmoobandwidth), "gabelmoo", category),
+    wecdf(data.frame(
+      ratio = d$maatuskabandwidth * 1000 / d$descriptorbandwidth,
+      measured = d$maatuskabandwidth), "maatuska", category))
   d
 }
 measured_category_votes <- rbind(
@@ -147,7 +158,8 @@ scale_y_continuous("Fraction of measured bandwidth\n", limits = c(0, 1),
   formatter = "percent") +
 scale_colour_manual("", c("consensus" = "black",
   "urras" = alpha("purple", 0.5), "ides" = alpha("red", 0.5),
-  "moria1" = alpha("green", 0.5), "gabelmoo" = alpha("blue", 0.5))) +
+  "moria1" = alpha("green", 0.5), "gabelmoo" = alpha("blue", 0.5),
+  "maatuska" = alpha("orange", 0.5))) +
 geom_vline(xintercept = 1, legend = FALSE, linetype = "dotted") +
 opts(title = paste("Measured vs. self-reported bandwidth ratios in",
   "consensus and votes\n"), legend.position = "right")