[or-cvs] [metrics-db/master 3/3] Update default of countries we care about.

[karsten at torproject.org]

Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Mon, 16 Aug 2010 09:45:29 +0200
Subject: Update default of countries we care about.
Commit: e47164c93a137f7069ef6ffd1f63e6da182526a0

---
 R/bridge-stats.R                               |   19 ++++++++++++-------
 R/dirreq-stats.R                               |   19 ++++++++++++-------
 config                                         |    2 +-
 src/org/torproject/ernie/db/Configuration.java |    3 ++-
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/R/bridge-stats.R b/R/bridge-stats.R
index bebb56d..fc78477 100644
--- a/R/bridge-stats.R
+++ b/R/bridge-stats.R
@@ -123,13 +123,18 @@ plot_current <- function(countries) {
   }
 }
 
-countries <- data.frame(code = c("bh", "cn", "cu", "et", "ir", "mm", "sa",
-  "sy", "tn", "tm", "uz", "vn", "ye"), people = c("Bahraini", "Chinese",
-  "Cuban", "Ethiopian", "Iranian", "Burmese", "Saudi", "Syrian",
-  "Tunisian", "Turkmen", "Uzbek", "Vietnamese", "Yemeni"), filename =
-  c("bahrain", "china", "cuba", "ethiopia", "iran", "burma", "saudi",
-  "syria", "tunisia", "turkmenistan", "uzbekistan", "vietnam", "yemen"),
-  stringsAsFactors = FALSE)
+countries <- data.frame(code = c("au", "bh", "br", "ca", "cn", "cu", "de",
+  "et", "fr", "gb", "ir", "it", "jp", "kr", "mm", "pl", "ru", "sa", "se",
+  "sy", "tn", "tm", "us", "uz", "vn", "ye"), people = c("Australian",
+  "Bahraini", "Brazilian", "Canadian", "Chinese", "Cuban", "German",
+  "Ethiopian", "French", "U.K.", "Iranian", "Italian", "Japanese",
+  "South Korean", "Burmese", "Polish", "Russian", "Saudi", "Swedish",
+  "Syrian", "Tunisian", "Turkmen", "U.S.", "Uzbek", "Vietnamese",
+  "Yemeni"), filename = c("australia", "bahrain", "brazil", "canada",
+  "china", "cuba", "germany", "ethiopia", "france", "uk", "iran", "italy",
+  "japan", "southkorea", "burma", "poland", "russia", "saudi", "sweden",
+  "syria", "tunisia", "turkmenistan", "usa", "uzbekistan", "vietnam",
+  "yemen"), stringsAsFactors = FALSE)
 
 if (file.exists("stats/bridge-stats")) {
   bridge <- read.csv("stats/bridge-stats", header = TRUE,
diff --git a/R/dirreq-stats.R b/R/dirreq-stats.R
index 0615fe5..a9b48e6 100644
--- a/R/dirreq-stats.R
+++ b/R/dirreq-stats.R
@@ -137,13 +137,18 @@ plot_current <- function(directory, filenamePart, titlePart, data,
   }
 }
 
-countries <- data.frame(code = c("bh", "cn", "cu", "et", "ir", "mm", "sa",
-  "sy", "tn", "tm", "uz", "vn", "ye"), people = c("Bahraini", "Chinese",
-  "Cuban", "Ethiopian", "Iranian", "Burmese", "Saudi", "Syrian",
-  "Tunisian", "Turkmen", "Uzbek", "Vietnamese", "Yemeni"), filename =
-  c("bahrain", "china", "cuba", "ethiopia", "iran", "burma", "saudi",
-  "syria", "tunisia", "turkmenistan", "uzbekistan", "vietnam", "yemen"),
-  stringsAsFactors = FALSE)
+countries <- data.frame(code = c("au", "bh", "br", "ca", "cn", "cu", "de",
+  "et", "fr", "gb", "ir", "it", "jp", "kr", "mm", "pl", "ru", "sa", "se",
+  "sy", "tn", "tm", "us", "uz", "vn", "ye"), people = c("Australian",
+  "Bahraini", "Brazilian", "Canadian", "Chinese", "Cuban", "German",
+  "Ethiopian", "French", "U.K.", "Iranian", "Italian", "Japanese",
+  "South Korean", "Burmese", "Polish", "Russian", "Saudi", "Swedish",
+  "Syrian", "Tunisian", "Turkmen", "U.S.", "Uzbek", "Vietnamese",
+  "Yemeni"), filename = c("australia", "bahrain", "brazil", "canada",
+  "china", "cuba", "germany", "ethiopia", "france", "uk", "iran", "italy",
+  "japan", "southkorea", "burma", "poland", "russia", "saudi", "sweden",
+  "syria", "tunisia", "turkmenistan", "usa", "uzbekistan", "vietnam",
+  "yemen"), stringsAsFactors = FALSE)
 
 if (file.exists("stats/dirreq-stats")) {
   dirreq <- read.csv("stats/dirreq-stats", header = TRUE,
diff --git a/config b/config
index 0bac2b5..695e268 100644
--- a/config
+++ b/config
@@ -105,7 +105,7 @@
 ## Comma-separated set of countries to be included in dirreq and bridge
 ## graphs; note that after adding new countries, an import of the relevant
 ## descriptor archives (relay and/or bridge) is necessary!
-#DirreqBridgeCountries bh,cn,cu,et,ir,mm,sa,sy,tn,tm,uz,vn,ye
+#DirreqBridgeCountries au,bh,br,ca,cn,cu,de,et,fr,gb,ir,it,jp,kr,mm,pl,ru,sa,se,sy,tn,tm,us,uz,vn,ye
 #
 ## Comma-separated set of fingerprints of directory mirrors to be included
 ## in dirreq and bridge graphs; note that after adding new directories, an
diff --git a/src/org/torproject/ernie/db/Configuration.java b/src/org/torproject/ernie/db/Configuration.java
index 3e74702..f7910e7 100644
--- a/src/org/torproject/ernie/db/Configuration.java
+++ b/src/org/torproject/ernie/db/Configuration.java
@@ -16,7 +16,8 @@ public class Configuration {
   private boolean writeConsensusStats = false;
   private boolean writeDirreqStats = false;
   private SortedSet<String> dirreqBridgeCountries = new TreeSet<String>(
-      Arrays.asList("bh,cn,cu,et,ir,mm,sa,sy,tn,tm,uz,vn,ye".split(",")));
+      Arrays.asList(("au,bh,br,ca,cn,cu,de,et,fr,gb,ir,it,jp,kr,mm,pl,ru,"
+          + "sa,se,sy,tn,tm,us,uz,vn,ye").split(",")));
   private SortedSet<String> dirreqDirectories = new TreeSet<String>(
       Arrays.asList(("8522EB98C91496E80EC238E732594D1509158E77,"
       + "9695DFC35FFEB861329B9F1AB04C46397020CE31").split(",")));
-- 
1.7.1