[or-cvs] [ernie/master 2/2] Cut off last day from all graphs, as it may have incomplete data.

[karsten at torproject.org]

Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Sat, 27 Feb 2010 23:30:45 +0100
Subject: Cut off last day from all graphs, as it may have incomplete data.
Commit: 05da718ff5aa7889cb9a56b4e0a5a8c6aac49c2d

---
 R/bridge-stats.R    |    3 ++-
 R/consensus-stats.R |    3 ++-
 R/dirreq-stats.R    |    4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/R/bridge-stats.R b/R/bridge-stats.R
index f2b6672..65e83c0 100644
--- a/R/bridge-stats.R
+++ b/R/bridge-stats.R
@@ -3,6 +3,7 @@ suppressPackageStartupMessages(library("ggplot2"))
 
 bridge <- read.csv("stats/bridge-stats", header = TRUE,
   stringsAsFactors = FALSE)
+bridge <- bridge[1:length(bridge$date)-1,]
 write.csv(bridge, "website/csv/bridge-users.csv", quote = FALSE,
   row.names = FALSE)
 
@@ -23,7 +24,7 @@ plot_pastdays <- function(days, countries) {
       code <- countries[country, 1]
       people <- countries[country, 2]
       filename <- countries[country, 3]
-      end <- seq(from = Sys.Date(), length = 2, by = "-1 day")[2]
+      end <- Sys.Date()
       start <- seq(from = end, length = 2, by = paste("-", day, " days",
         sep = ""))[2]
       plot_bridges(paste(filename, "-bridges-", day, "d.png", sep = ""),
diff --git a/R/consensus-stats.R b/R/consensus-stats.R
index 6488d6b..e145798 100644
--- a/R/consensus-stats.R
+++ b/R/consensus-stats.R
@@ -3,6 +3,7 @@ suppressPackageStartupMessages(library("ggplot2"))
 
 consensuses <- read.csv("stats/consensus-stats", header = TRUE,
     stringsAsFactors = FALSE);
+consensuses <- consensuses[1:length(consensuses$date)-1,]
 write.csv(data.frame(date = consensuses$date,
   relays = consensuses$running, bridges = consensuses$brunning),
   "website/csv/networksize.csv", quote = FALSE, row.names = FALSE)
@@ -29,7 +30,7 @@ plot_consensus <- function(directory, filename, title, limits, rows, breaks,
 plot_pastdays <- function(directory, filenamePart, titlePart, days, rows,
     breaks, labels) {
   for (day in days) {
-    end <- seq(from = Sys.Date(), length = 2, by = "-1 day")[2]
+    end <- Sys.Date()
     start <- seq(from = end, length = 2, by = paste("-", day, " days",
       sep = ""))[2]
     plot_consensus(directory, paste(filenamePart, "-", day, "d.png",
diff --git a/R/dirreq-stats.R b/R/dirreq-stats.R
index 528f32b..13a34de 100644
--- a/R/dirreq-stats.R
+++ b/R/dirreq-stats.R
@@ -7,10 +7,12 @@ moria1Sub <- subset(dirreq,
   directory %in% "9695DFC35FFEB861329B9F1AB04C46397020CE31")
 moria1 <- data.frame(date = moria1Sub$date,
   moria1Sub[3:(length(moria1Sub) - 1)] * 6)
+moria1 <- moria1[1:length(moria1$date)-1,]
 trustedSub <- subset(dirreq,
   directory %in% "8522EB98C91496E80EC238E732594D1509158E77")
 trusted <- data.frame(date = trustedSub$date,
   floor(trustedSub[3:(length(trustedSub) - 1)] / trustedSub$share * 10))
+trusted <- trusted[1:length(trusted$date)-1,]
 
 write.csv(moria1, "website/csv/new-users.csv", quote = FALSE,
   row.names = FALSE)
@@ -38,7 +40,7 @@ plot_pastdays <- function(directory, filenamePart, titlePart, days, data,
       code <- countries[country, 1]
       people <- countries[country, 2]
       filename <- countries[country, 3]
-      end <- seq(from = Sys.Date(), length = 2, by = "-1 day")[2]
+      end <- Sys.Date()
       start <- seq(from = end, length = 2, by = paste("-", day, " days",
         sep = ""))[2]
       plot_dirreq(directory, paste(filename, filenamePart, "-", day,
-- 
1.6.5