[or-cvs] [ernie/master] Plot gabelmoo's user numbers, not moria1's.

[karsten at torproject.org]

Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Fri, 23 Apr 2010 13:52:04 +0200
Subject: Plot gabelmoo's user numbers, not moria1's.
Commit: a5fe90ce48b161b774566ddc053635c461864c51

---
 R/dirreq-stats.R |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/R/dirreq-stats.R b/R/dirreq-stats.R
index 6c0a7a0..fa02e75 100644
--- a/R/dirreq-stats.R
+++ b/R/dirreq-stats.R
@@ -3,16 +3,18 @@ suppressPackageStartupMessages(library("ggplot2"))
 
 dirreq <- read.csv("stats/dirreq-stats", header = TRUE,
   stringsAsFactors = FALSE)
-moria1Sub <- subset(dirreq,
-  directory %in% "9695DFC35FFEB861329B9F1AB04C46397020CE31")
-moria1 <- data.frame(date = moria1Sub$date,
-  moria1Sub[3:(length(moria1Sub) - 1)] * 6)
+gabelmooSub <- subset(dirreq, directory %in%
+  c("68333D0761BCF397A587A0C0B963E4A9E99EC4D3",
+    "F2044413DAC2E02E3D6BCF4735A19BCA1DE97281"))
+gabelmoo <- data.frame(date = gabelmooSub$date,
+  gabelmooSub[3:(length(gabelmooSub) - 1)] * 6)
 trustedSub <- subset(dirreq,
   directory %in% "8522EB98C91496E80EC238E732594D1509158E77")
+trustedSub[na.omit(trustedSub$share) == 0,3:length(trustedSub)] <- NA
 trusted <- data.frame(date = trustedSub$date,
   floor(trustedSub[3:(length(trustedSub) - 1)] / trustedSub$share * 10))
 
-write.csv(moria1, "website/csv/new-users.csv", quote = FALSE,
+write.csv(gabelmoo, "website/csv/new-users.csv", quote = FALSE,
   row.names = FALSE)
 write.csv(trusted, "website/csv/recurring-users.csv", quote = FALSE,
   row.names = FALSE)
@@ -138,7 +140,7 @@ countries <- data.frame(code = c("bh", "cn", "cu", "et", "ir", "mm", "sa",
   stringsAsFactors = FALSE)
 
 plot_current("website/graphs/new-users/", "-new",
-  "New or returning, directly connecting", moria1, countries)
+  "New or returning, directly connecting", gabelmoo, countries)
 plot_current("website/graphs/direct-users/", "-direct",
   "Recurring, directly connecting", trusted, countries)
 
-- 
1.6.5