[or-cvs] [ernie/master 2/2] Add torperf data source siv, remove gabelmoo.

[karsten at torproject.org]

Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Fri, 26 Mar 2010 15:55:14 +0100
Subject: Add torperf data source siv, remove gabelmoo.
Commit: e45f01383349367ae04daf773c729dc5a16c2802

---
 R/torperf.R                 |    6 +++---
 website/torperf-graphs.html |    9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/R/torperf.R b/R/torperf.R
index e4ad5a4..17d5e76 100644
--- a/R/torperf.R
+++ b/R/torperf.R
@@ -38,11 +38,11 @@ for (intervalInd in 1:length(intervals)) {
   colors <- c()
   height <- 800
   if (intervalInd == 1) {
-    sources <- c("gabelmoo", "moria", "torperf")
+    sources <- c("siv", "moria", "torperf")
     colors <- c("#0000EE", "#EE0000", "#00CD00")
   } else {
-    sources <- c("moria", "torperf")
-    colors <- c("#EE0000", "#00CD00")
+    sources <- c("siv", "moria", "torperf")
+    colors <- c("#0000EE", "#EE0000", "#00CD00")
     height <- 400
   }
   sizes <- c("5mb", "1mb", "50kb")
diff --git a/website/torperf-graphs.html b/website/torperf-graphs.html
index a5218a5..0bc46ac 100644
--- a/website/torperf-graphs.html
+++ b/website/torperf-graphs.html
@@ -34,19 +34,22 @@
         <p><a href="csv/torperf.csv">CSV</a> file containing all data.</p>
         <img src="graphs/torperf/torperf-50kb-torperf-6m.png" width="550" height="350"/>
         <img src="graphs/torperf/torperf-50kb-moria-6m.png" width="550" height="350"/>
-        <img src="graphs/torperf/torperf-50kb-gabelmoo-6m.png" width="550" height="350"/>
+        <img src="graphs/torperf/torperf-50kb-siv-6m.png" width="550" height="350"/>
         <img src="graphs/torperf/torperf-50kb-torperf-2w.png" width="550" height="350"/>
         <img src="graphs/torperf/torperf-50kb-moria-2w.png" width="550" height="350"/>
+        <img src="graphs/torperf/torperf-50kb-siv-2w.png" width="550" height="350"/>
         <img src="graphs/torperf/torperf-1mb-torperf-6m.png" width="550" height="350"/>
         <img src="graphs/torperf/torperf-1mb-moria-6m.png" width="550" height="350"/>
-        <img src="graphs/torperf/torperf-1mb-gabelmoo-6m.png" width="550" height="350"/>
+        <img src="graphs/torperf/torperf-1mb-siv-6m.png" width="550" height="350"/>
         <img src="graphs/torperf/torperf-1mb-torperf-2w.png" width="550" height="350"/>
         <img src="graphs/torperf/torperf-1mb-moria-2w.png" width="550" height="350"/>
+        <img src="graphs/torperf/torperf-1mb-siv-2w.png" width="550" height="350"/>
         <img src="graphs/torperf/torperf-5mb-torperf-6m.png" width="550" height="350"/>
         <img src="graphs/torperf/torperf-5mb-moria-6m.png" width="550" height="350"/>
-        <img src="graphs/torperf/torperf-5mb-gabelmoo-6m.png" width="550" height="350"/>
+        <img src="graphs/torperf/torperf-5mb-siv-6m.png" width="550" height="350"/>
         <img src="graphs/torperf/torperf-5mb-torperf-2w.png" width="550" height="350"/>
         <img src="graphs/torperf/torperf-5mb-moria-2w.png" width="550" height="350"/>
+        <img src="graphs/torperf/torperf-5mb-siv-2w.png" width="550" height="350"/>
         <br/>
       </div>
     </div>
-- 
1.6.5