[or-cvs] [metrics/master] Make axes in dirarch graphs look nicer.

karsten at seul.org karsten at seul.org
Mon Oct 12 09:23:13 UTC 2009


Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Mon, 12 Oct 2009 11:17:00 +0200
Subject: Make axes in dirarch graphs look nicer.
Commit: 9bf4d8bc34d2f9ae459e925c8f484535d4c2b1e4

---
 report/dirarch/advertised.pdf     |   49 +++--------
 report/dirarch/country.pdf        |   55 ++++---------
 report/dirarch/countryadvbw.pdf   |   61 +++++----------
 report/dirarch/countrybw.pdf      |   57 ++++---------
 report/dirarch/dynamic-cutoff.pdf |    8 +-
 report/dirarch/dynamic.pdf        |   53 ++++---------
 report/dirarch/platforms.pdf      |   49 +++--------
 report/dirarch/relayflags.pdf     |   51 +++---------
 scripts/dirarch/dirarch.R         |  162 ++++++++++++-------------------------
 9 files changed, 164 insertions(+), 381 deletions(-)

diff --git a/report/dirarch/advertised.pdf b/report/dirarch/advertised.pdf
index c4bc4f2..2714b74 100644
--- a/report/dirarch/advertised.pdf
+++ b/report/dirarch/advertised.pdf
@@ -2,8 +2,8 @@
 %âãÏÓ\r
 1 0 obj
 <<
-/CreationDate (D:20090804074027)
-/ModDate (D:20090804074027)
+/CreationDate (D:20091012110846)
+/ModDate (D:20091012110846)
 /Title (R Graphics Output)
 /Producer (R 2.8.1)
 /Creator (R)
@@ -2592,16 +2592,14 @@ S
 S
 Q q
 0.000 0.000 0.000 RG
-0.60 w
+0.75 w
 [] 0 d
 1 J
 1 j
 10.00 M
-185.02 59.04 m 434.46 59.04 l S
 185.02 59.04 m 185.02 51.84 l S
 309.57 59.04 m 309.57 51.84 l S
 434.46 59.04 m 434.46 51.84 l S
-80.61 59.04 m 507.15 59.04 l S
 80.61 59.04 m 80.61 57.60 l S
 91.18 59.04 m 91.18 57.60 l S
 101.42 59.04 m 101.42 57.60 l S
@@ -2612,7 +2610,6 @@ Q q
 153.63 59.04 m 153.63 57.60 l S
 164.21 59.04 m 164.21 57.60 l S
 174.44 59.04 m 174.44 57.60 l S
-185.02 59.04 m 185.02 57.60 l S
 195.60 59.04 m 195.60 57.60 l S
 205.16 59.04 m 205.16 57.60 l S
 215.73 59.04 m 215.73 57.60 l S
@@ -2624,7 +2621,6 @@ Q q
 278.18 59.04 m 278.18 57.60 l S
 288.76 59.04 m 288.76 57.60 l S
 298.99 59.04 m 298.99 57.60 l S
-309.57 59.04 m 309.57 57.60 l S
 320.15 59.04 m 320.15 57.60 l S
 330.05 59.04 m 330.05 57.60 l S
 340.62 59.04 m 340.62 57.60 l S
@@ -2636,14 +2632,12 @@ Q q
 403.07 59.04 m 403.07 57.60 l S
 413.65 59.04 m 413.65 57.60 l S
 423.89 59.04 m 423.89 57.60 l S
-434.46 59.04 m 434.46 57.60 l S
 445.04 59.04 m 445.04 57.60 l S
 454.60 59.04 m 454.60 57.60 l S
 465.17 59.04 m 465.17 57.60 l S
 475.41 59.04 m 475.41 57.60 l S
 485.99 59.04 m 485.99 57.60 l S
 496.57 59.04 m 496.57 57.60 l S
-507.15 59.04 m 507.15 57.60 l S
 BT
 0.000 0.000 0.000 rg
 /F2 1 Tf 5.00 0.00 -0.00 5.00 83.64 48.96 Tm (M) Tj
@@ -2780,24 +2774,7 @@ ET
 BT
 /F2 1 Tf 12.00 0.00 -0.00 12.00 462.07 33.12 Tm (2009) Tj
 ET
-Q q
-0.000 0.000 0.000 RG
-0.75 w
-[] 0 d
-1 J
-1 j
-10.00 M
-73.44 59.04 m
-505.44 59.04 l
-S
-Q q
-0.000 0.000 0.000 RG
-0.75 w
-[] 0 d
-1 J
-1 j
-10.00 M
-56.16 72.11 m 56.16 398.69 l S
+73.44 59.04 m 505.10 59.04 l S
 56.16 72.11 m 48.96 72.11 l S
 56.16 137.42 m 48.96 137.42 l S
 56.16 202.74 m 48.96 202.74 l S
@@ -2805,7 +2782,6 @@ Q q
 56.16 333.38 m 48.96 333.38 l S
 56.16 398.69 m 48.96 398.69 l S
 BT
-0.000 0.000 0.000 rg
 /F2 1 Tf 0.00 12.00 -12.00 0.00 38.88 68.77 Tm (0) Tj
 ET
 BT
@@ -2823,6 +2799,7 @@ ET
 BT
 /F2 1 Tf 0.00 12.00 -12.00 0.00 38.88 388.69 Tm (500) Tj
 ET
+56.16 72.11 m 56.16 398.77 l S
 BT
 /F2 1 Tf 12.00 0.00 -0.00 12.00 522.72 375.15 Tm (Observed) Tj
 ET
@@ -2833,7 +2810,7 @@ Q
 endstream
 endobj
 7 0 obj
-45914
+45592
 endobj
 3 0 obj
 <<
@@ -2880,14 +2857,14 @@ xref
 0000000000 65535 f 
 0000000021 00000 n 
 0000000163 00000 n 
-0000046280 00000 n 
-0000046363 00000 n 
+0000045958 00000 n 
+0000046041 00000 n 
 0000000212 00000 n 
 0000000292 00000 n 
-0000046259 00000 n 
-0000046455 00000 n 
-0000046712 00000 n 
-0000046808 00000 n 
+0000045937 00000 n 
+0000046133 00000 n 
+0000046390 00000 n 
+0000046486 00000 n 
 trailer
 <<
 /Size 11
@@ -2895,5 +2872,5 @@ trailer
 /Root 2 0 R
 >>
 startxref
-46910
+46588
 %%EOF
diff --git a/report/dirarch/country.pdf b/report/dirarch/country.pdf
index bd2c557..fcaa3ac 100644
--- a/report/dirarch/country.pdf
+++ b/report/dirarch/country.pdf
@@ -2,8 +2,8 @@
 %âãÏÓ\r
 1 0 obj
 <<
-/CreationDate (D:20090804074028)
-/ModDate (D:20090804074028)
+/CreationDate (D:20091012110847)
+/ModDate (D:20091012110847)
 /Title (R Graphics Output)
 /Producer (R 2.8.1)
 /Creator (R)
@@ -6399,16 +6399,14 @@ S
 S
 Q q
 0.000 0.000 0.000 RG
-0.60 w
+0.75 w
 [] 0 d
 1 J
 1 j
 10.00 M
-181.44 59.04 m 423.96 59.04 l S
 181.44 59.04 m 181.44 51.84 l S
 302.53 59.04 m 302.53 51.84 l S
 423.96 59.04 m 423.96 51.84 l S
-79.93 59.04 m 494.62 59.04 l S
 79.93 59.04 m 79.93 57.60 l S
 90.21 59.04 m 90.21 57.60 l S
 100.16 59.04 m 100.16 57.60 l S
@@ -6419,7 +6417,6 @@ Q q
 150.92 59.04 m 150.92 57.60 l S
 161.21 59.04 m 161.21 57.60 l S
 171.16 59.04 m 171.16 57.60 l S
-181.44 59.04 m 181.44 57.60 l S
 191.73 59.04 m 191.73 57.60 l S
 201.02 59.04 m 201.02 57.60 l S
 211.30 59.04 m 211.30 57.60 l S
@@ -6431,7 +6428,6 @@ Q q
 272.01 59.04 m 272.01 57.60 l S
 282.30 59.04 m 282.30 57.60 l S
 292.25 59.04 m 292.25 57.60 l S
-302.53 59.04 m 302.53 57.60 l S
 312.82 59.04 m 312.82 57.60 l S
 322.44 59.04 m 322.44 57.60 l S
 332.72 59.04 m 332.72 57.60 l S
@@ -6443,14 +6439,12 @@ Q q
 393.43 59.04 m 393.43 57.60 l S
 403.72 59.04 m 403.72 57.60 l S
 413.67 59.04 m 413.67 57.60 l S
-423.96 59.04 m 423.96 57.60 l S
 434.24 59.04 m 434.24 57.60 l S
 443.53 59.04 m 443.53 57.60 l S
 453.81 59.04 m 453.81 57.60 l S
 463.77 59.04 m 463.77 57.60 l S
 474.05 59.04 m 474.05 57.60 l S
 484.33 59.04 m 484.33 57.60 l S
-494.62 59.04 m 494.62 57.60 l S
 BT
 0.000 0.000 0.000 rg
 /F2 1 Tf 5.00 0.00 -0.00 5.00 82.82 48.96 Tm (M) Tj
@@ -6587,24 +6581,7 @@ ET
 BT
 /F2 1 Tf 12.00 0.00 -0.00 12.00 450.42 33.12 Tm (2009) Tj
 ET
-Q q
-0.000 0.000 0.000 RG
-0.75 w
-[] 0 d
-1 J
-1 j
-10.00 M
-72.96 59.04 m
-492.96 59.04 l
-S
-Q q
-0.000 0.000 0.000 RG
-0.75 w
-[] 0 d
-1 J
-1 j
-10.00 M
-56.16 72.11 m 56.16 386.81 l S
+72.96 59.04 m 492.63 59.04 l S
 56.16 72.11 m 48.96 72.11 l S
 56.16 135.05 m 48.96 135.05 l S
 56.16 197.99 m 48.96 197.99 l S
@@ -6612,7 +6589,6 @@ Q q
 56.16 323.87 m 48.96 323.87 l S
 56.16 386.81 m 48.96 386.81 l S
 BT
-0.000 0.000 0.000 rg
 /F2 1 Tf 0.00 12.00 -12.00 0.00 38.88 68.77 Tm (0) Tj
 ET
 BT
@@ -6630,17 +6606,18 @@ ET
 BT
 /F2 1 Tf 0.00 12.00 -12.00 0.00 38.88 376.81 Tm (500) Tj
 ET
+56.16 72.11 m 56.16 398.77 l S
 BT
 1.000 0.647 0.000 rg
-/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 286.84 Tm (Germany) Tj
+/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 282.43 Tm (Germany) Tj
 ET
 BT
 0.000 0.000 1.000 rg
-/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 334.04 Tm (U.S.A.) Tj
+/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 337.19 Tm (U.S.A.) Tj
 ET
 BT
 0.000 0.392 0.000 rg
-/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 154.03 Tm (France) Tj
+/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 150.88 Tm (France) Tj
 ET
 BT
 0.627 0.125 0.941 rg
@@ -6654,7 +6631,7 @@ Q
 endstream
 endobj
 7 0 obj
-104718
+104396
 endobj
 3 0 obj
 <<
@@ -6701,14 +6678,14 @@ xref
 0000000000 65535 f 
 0000000021 00000 n 
 0000000163 00000 n 
-0000105085 00000 n 
-0000105168 00000 n 
+0000104763 00000 n 
+0000104846 00000 n 
 0000000212 00000 n 
 0000000292 00000 n 
-0000105063 00000 n 
-0000105260 00000 n 
-0000105517 00000 n 
-0000105613 00000 n 
+0000104741 00000 n 
+0000104938 00000 n 
+0000105195 00000 n 
+0000105291 00000 n 
 trailer
 <<
 /Size 11
@@ -6716,5 +6693,5 @@ trailer
 /Root 2 0 R
 >>
 startxref
-105715
+105393
 %%EOF
diff --git a/report/dirarch/countryadvbw.pdf b/report/dirarch/countryadvbw.pdf
index 16b2be3..ff9d56d 100644
--- a/report/dirarch/countryadvbw.pdf
+++ b/report/dirarch/countryadvbw.pdf
@@ -2,8 +2,8 @@
 %âãÏÓ\r
 1 0 obj
 <<
-/CreationDate (D:20090804074034)
-/ModDate (D:20090804074034)
+/CreationDate (D:20091012110849)
+/ModDate (D:20091012110849)
 /Title (R Graphics Output)
 /Producer (R 2.8.1)
 /Creator (R)
@@ -31,7 +31,7 @@ stream
 q
 Q q 56.16 59.04 453.60 352.80 re W n
 1.000 0.647 0.000 RG
-1.50 w
+0.75 w
 [] 0 d
 1 J
 1 j
@@ -1317,7 +1317,7 @@ BT
 ET
 Q q 56.16 59.04 453.60 352.80 re W n
 0.000 0.000 1.000 RG
-1.50 w
+0.75 w
 [] 0 d
 1 J
 1 j
@@ -6399,16 +6399,14 @@ S
 S
 Q q
 0.000 0.000 0.000 RG
-0.60 w
+0.75 w
 [] 0 d
 1 J
 1 j
 10.00 M
-181.44 59.04 m 423.96 59.04 l S
 181.44 59.04 m 181.44 51.84 l S
 302.53 59.04 m 302.53 51.84 l S
 423.96 59.04 m 423.96 51.84 l S
-79.93 59.04 m 494.62 59.04 l S
 79.93 59.04 m 79.93 57.60 l S
 90.21 59.04 m 90.21 57.60 l S
 100.16 59.04 m 100.16 57.60 l S
@@ -6419,7 +6417,6 @@ Q q
 150.92 59.04 m 150.92 57.60 l S
 161.21 59.04 m 161.21 57.60 l S
 171.16 59.04 m 171.16 57.60 l S
-181.44 59.04 m 181.44 57.60 l S
 191.73 59.04 m 191.73 57.60 l S
 201.02 59.04 m 201.02 57.60 l S
 211.30 59.04 m 211.30 57.60 l S
@@ -6431,7 +6428,6 @@ Q q
 272.01 59.04 m 272.01 57.60 l S
 282.30 59.04 m 282.30 57.60 l S
 292.25 59.04 m 292.25 57.60 l S
-302.53 59.04 m 302.53 57.60 l S
 312.82 59.04 m 312.82 57.60 l S
 322.44 59.04 m 322.44 57.60 l S
 332.72 59.04 m 332.72 57.60 l S
@@ -6443,14 +6439,12 @@ Q q
 393.43 59.04 m 393.43 57.60 l S
 403.72 59.04 m 403.72 57.60 l S
 413.67 59.04 m 413.67 57.60 l S
-423.96 59.04 m 423.96 57.60 l S
 434.24 59.04 m 434.24 57.60 l S
 443.53 59.04 m 443.53 57.60 l S
 453.81 59.04 m 453.81 57.60 l S
 463.77 59.04 m 463.77 57.60 l S
 474.05 59.04 m 474.05 57.60 l S
 484.33 59.04 m 484.33 57.60 l S
-494.62 59.04 m 494.62 57.60 l S
 BT
 0.000 0.000 0.000 rg
 /F2 1 Tf 5.00 0.00 -0.00 5.00 82.82 48.96 Tm (M) Tj
@@ -6587,30 +6581,12 @@ ET
 BT
 /F2 1 Tf 12.00 0.00 -0.00 12.00 450.42 33.12 Tm (2009) Tj
 ET
-Q q
-0.000 0.000 0.000 RG
-0.75 w
-[] 0 d
-1 J
-1 j
-10.00 M
-72.96 59.04 m
-492.96 59.04 l
-S
-Q q
-0.000 0.000 0.000 RG
-0.75 w
-[] 0 d
-1 J
-1 j
-10.00 M
-56.16 72.11 m 56.16 343.73 l S
+72.96 59.04 m 492.63 59.04 l S
 56.16 72.11 m 48.96 72.11 l S
 56.16 162.65 m 48.96 162.65 l S
 56.16 253.19 m 48.96 253.19 l S
 56.16 343.73 m 48.96 343.73 l S
 BT
-0.000 0.000 0.000 rg
 /F2 1 Tf 0.00 12.00 -12.00 0.00 38.88 68.77 Tm (0) Tj
 ET
 BT
@@ -6622,21 +6598,22 @@ ET
 BT
 /F2 1 Tf 0.00 12.00 -12.00 0.00 38.88 333.72 Tm (150) Tj
 ET
+56.16 72.11 m 56.16 398.77 l S
 BT
 1.000 0.647 0.000 rg
-/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 294.04 Tm (Germany) Tj
+/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 292.23 Tm (Germany) Tj
 ET
 BT
 0.000 0.000 1.000 rg
-/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 275.76 Tm (U.S.A.) Tj
+/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 279.38 Tm (U.S.A.) Tj
 ET
 BT
 0.000 0.392 0.000 rg
-/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 111.40 Tm (France) Tj
+/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 109.59 Tm (France) Tj
 ET
 BT
 0.627 0.125 0.941 rg
-/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 94.64 Tm (Sweden) Tj
+/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 96.45 Tm (Sweden) Tj
 ET
 BT
 0.000 1.000 1.000 rg
@@ -6646,7 +6623,7 @@ Q
 endstream
 endobj
 7 0 obj
-104328
+104006
 endobj
 3 0 obj
 <<
@@ -6693,14 +6670,14 @@ xref
 0000000000 65535 f 
 0000000021 00000 n 
 0000000163 00000 n 
-0000104695 00000 n 
-0000104778 00000 n 
+0000104373 00000 n 
+0000104456 00000 n 
 0000000212 00000 n 
 0000000292 00000 n 
-0000104673 00000 n 
-0000104870 00000 n 
-0000105127 00000 n 
-0000105223 00000 n 
+0000104351 00000 n 
+0000104548 00000 n 
+0000104805 00000 n 
+0000104901 00000 n 
 trailer
 <<
 /Size 11
@@ -6708,5 +6685,5 @@ trailer
 /Root 2 0 R
 >>
 startxref
-105325
+105003
 %%EOF
diff --git a/report/dirarch/countrybw.pdf b/report/dirarch/countrybw.pdf
index 18e46be..27c9083 100644
--- a/report/dirarch/countrybw.pdf
+++ b/report/dirarch/countrybw.pdf
@@ -2,8 +2,8 @@
 %âãÏÓ\r
 1 0 obj
 <<
-/CreationDate (D:20090804074031)
-/ModDate (D:20090804074031)
+/CreationDate (D:20091012110848)
+/ModDate (D:20091012110848)
 /Title (R Graphics Output)
 /Producer (R 2.8.1)
 /Creator (R)
@@ -6399,16 +6399,14 @@ S
 S
 Q q
 0.000 0.000 0.000 RG
-0.60 w
+0.75 w
 [] 0 d
 1 J
 1 j
 10.00 M
-181.44 59.04 m 423.96 59.04 l S
 181.44 59.04 m 181.44 51.84 l S
 302.53 59.04 m 302.53 51.84 l S
 423.96 59.04 m 423.96 51.84 l S
-79.93 59.04 m 494.62 59.04 l S
 79.93 59.04 m 79.93 57.60 l S
 90.21 59.04 m 90.21 57.60 l S
 100.16 59.04 m 100.16 57.60 l S
@@ -6419,7 +6417,6 @@ Q q
 150.92 59.04 m 150.92 57.60 l S
 161.21 59.04 m 161.21 57.60 l S
 171.16 59.04 m 171.16 57.60 l S
-181.44 59.04 m 181.44 57.60 l S
 191.73 59.04 m 191.73 57.60 l S
 201.02 59.04 m 201.02 57.60 l S
 211.30 59.04 m 211.30 57.60 l S
@@ -6431,7 +6428,6 @@ Q q
 272.01 59.04 m 272.01 57.60 l S
 282.30 59.04 m 282.30 57.60 l S
 292.25 59.04 m 292.25 57.60 l S
-302.53 59.04 m 302.53 57.60 l S
 312.82 59.04 m 312.82 57.60 l S
 322.44 59.04 m 322.44 57.60 l S
 332.72 59.04 m 332.72 57.60 l S
@@ -6443,14 +6439,12 @@ Q q
 393.43 59.04 m 393.43 57.60 l S
 403.72 59.04 m 403.72 57.60 l S
 413.67 59.04 m 413.67 57.60 l S
-423.96 59.04 m 423.96 57.60 l S
 434.24 59.04 m 434.24 57.60 l S
 443.53 59.04 m 443.53 57.60 l S
 453.81 59.04 m 453.81 57.60 l S
 463.77 59.04 m 463.77 57.60 l S
 474.05 59.04 m 474.05 57.60 l S
 484.33 59.04 m 484.33 57.60 l S
-494.62 59.04 m 494.62 57.60 l S
 BT
 0.000 0.000 0.000 rg
 /F2 1 Tf 5.00 0.00 -0.00 5.00 82.82 48.96 Tm (M) Tj
@@ -6587,31 +6581,13 @@ ET
 BT
 /F2 1 Tf 12.00 0.00 -0.00 12.00 450.42 33.12 Tm (2009) Tj
 ET
-Q q
-0.000 0.000 0.000 RG
-0.75 w
-[] 0 d
-1 J
-1 j
-10.00 M
-72.96 59.04 m
-492.96 59.04 l
-S
-Q q
-0.000 0.000 0.000 RG
-0.75 w
-[] 0 d
-1 J
-1 j
-10.00 M
-56.16 72.11 m 56.16 378.94 l S
+72.96 59.04 m 492.63 59.04 l S
 56.16 72.11 m 48.96 72.11 l S
 56.16 148.81 m 48.96 148.81 l S
 56.16 225.52 m 48.96 225.52 l S
 56.16 302.23 m 48.96 302.23 l S
 56.16 378.94 m 48.96 378.94 l S
 BT
-0.000 0.000 0.000 rg
 /F2 1 Tf 0.00 12.00 -12.00 0.00 38.88 68.77 Tm (0) Tj
 ET
 BT
@@ -6626,21 +6602,22 @@ ET
 BT
 /F2 1 Tf 0.00 12.00 -12.00 0.00 38.88 372.27 Tm (80) Tj
 ET
+56.16 72.11 m 56.16 398.77 l S
 BT
 1.000 0.647 0.000 rg
-/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 307.86 Tm (Germany) Tj
+/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 304.02 Tm (Germany) Tj
 ET
 BT
 0.000 0.000 1.000 rg
-/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 310.40 Tm (U.S.A.) Tj
+/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 314.24 Tm (U.S.A.) Tj
 ET
 BT
 0.000 0.392 0.000 rg
-/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 104.49 Tm (France) Tj
+/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 112.16 Tm (France) Tj
 ET
 BT
 0.627 0.125 0.941 rg
-/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 107.19 Tm (Sweden) Tj
+/F2 1 Tf 12.00 0.00 -0.00 12.00 509.76 99.52 Tm (Sweden) Tj
 ET
 BT
 0.000 1.000 1.000 rg
@@ -6650,7 +6627,7 @@ Q
 endstream
 endobj
 7 0 obj
-104441
+104118
 endobj
 3 0 obj
 <<
@@ -6697,14 +6674,14 @@ xref
 0000000000 65535 f 
 0000000021 00000 n 
 0000000163 00000 n 
-0000104808 00000 n 
-0000104891 00000 n 
+0000104485 00000 n 
+0000104568 00000 n 
 0000000212 00000 n 
 0000000292 00000 n 
-0000104786 00000 n 
-0000104983 00000 n 
-0000105240 00000 n 
-0000105336 00000 n 
+0000104463 00000 n 
+0000104660 00000 n 
+0000104917 00000 n 
+0000105013 00000 n 
 trailer
 <<
 /Size 11
@@ -6712,5 +6689,5 @@ trailer
 /Root 2 0 R
 >>
 startxref
-105438
+105115
 %%EOF
diff --git a/report/dirarch/dynamic-cutoff.pdf b/report/dirarch/dynamic-cutoff.pdf
index 22782b9..f2d72e5 100644
--- a/report/dirarch/dynamic-cutoff.pdf
+++ b/report/dirarch/dynamic-cutoff.pdf
@@ -2,8 +2,8 @@
 %âãÏÓ\r
 1 0 obj
 <<
-/CreationDate (D:20090804074028)
-/ModDate (D:20090804074028)
+/CreationDate (D:20091012110846)
+/ModDate (D:20091012110846)
 /Title (R Graphics Output)
 /Producer (R 2.8.1)
 /Creator (R)
@@ -110,7 +110,6 @@ Q q
 1 J
 1 j
 10.00 M
-73.44 59.04 m 505.44 59.04 l S
 73.44 59.04 m 73.44 51.84 l S
 121.44 59.04 m 121.44 51.84 l S
 169.44 59.04 m 169.44 51.84 l S
@@ -152,7 +151,7 @@ ET
 BT
 /F2 1 Tf 12.00 0.00 -0.00 12.00 498.77 33.12 Tm (10) Tj
 ET
-56.16 72.11 m 56.16 386.02 l S
+73.44 59.04 m 522.72 59.04 l S
 56.16 72.11 m 48.96 72.11 l S
 56.16 134.89 m 48.96 134.89 l S
 56.16 197.67 m 48.96 197.67 l S
@@ -177,6 +176,7 @@ ET
 BT
 /F2 1 Tf 0.00 12.00 -12.00 0.00 38.88 376.01 Tm (500) Tj
 ET
+56.16 72.11 m 56.16 398.77 l S
 Q
 endstream
 endobj
diff --git a/report/dirarch/dynamic.pdf b/report/dirarch/dynamic.pdf
index d311b1c..f01d635 100644
--- a/report/dirarch/dynamic.pdf
+++ b/report/dirarch/dynamic.pdf
@@ -2,8 +2,8 @@
 %âãÏÓ\r
 1 0 obj
 <<
-/CreationDate (D:20090804074028)
-/ModDate (D:20090804074028)
+/CreationDate (D:20091012110846)
+/ModDate (D:20091012110846)
 /Title (R Graphics Output)
 /Producer (R 2.8.1)
 /Creator (R)
@@ -2592,16 +2592,14 @@ S
 S
 Q q
 0.000 0.000 0.000 RG
-0.60 w
+0.75 w
 [] 0 d
 1 J
 1 j
 10.00 M
-199.34 59.04 m 476.50 59.04 l S
 199.34 59.04 m 199.34 51.84 l S
 337.73 59.04 m 337.73 51.84 l S
 476.50 59.04 m 476.50 51.84 l S
-83.32 59.04 m 557.26 59.04 l S
 83.32 59.04 m 83.32 57.60 l S
 95.08 59.04 m 95.08 57.60 l S
 106.45 59.04 m 106.45 57.60 l S
@@ -2612,7 +2610,6 @@ Q q
 164.46 59.04 m 164.46 57.60 l S
 176.21 59.04 m 176.21 57.60 l S
 187.59 59.04 m 187.59 57.60 l S
-199.34 59.04 m 199.34 57.60 l S
 211.09 59.04 m 211.09 57.60 l S
 221.71 59.04 m 221.71 57.60 l S
 233.46 59.04 m 233.46 57.60 l S
@@ -2624,7 +2621,6 @@ Q q
 302.85 59.04 m 302.85 57.60 l S
 314.60 59.04 m 314.60 57.60 l S
 325.98 59.04 m 325.98 57.60 l S
-337.73 59.04 m 337.73 57.60 l S
 349.48 59.04 m 349.48 57.60 l S
 360.48 59.04 m 360.48 57.60 l S
 372.23 59.04 m 372.23 57.60 l S
@@ -2636,14 +2632,12 @@ Q q
 441.62 59.04 m 441.62 57.60 l S
 453.37 59.04 m 453.37 57.60 l S
 464.74 59.04 m 464.74 57.60 l S
-476.50 59.04 m 476.50 57.60 l S
 488.25 59.04 m 488.25 57.60 l S
 498.87 59.04 m 498.87 57.60 l S
 510.62 59.04 m 510.62 57.60 l S
 522.00 59.04 m 522.00 57.60 l S
 533.75 59.04 m 533.75 57.60 l S
 545.50 59.04 m 545.50 57.60 l S
-557.26 59.04 m 557.26 57.60 l S
 BT
 0.000 0.000 0.000 rg
 /F2 1 Tf 5.00 0.00 -0.00 5.00 86.93 48.96 Tm (M) Tj
@@ -2780,24 +2774,7 @@ ET
 BT
 /F2 1 Tf 12.00 0.00 -0.00 12.00 508.65 33.12 Tm (2009) Tj
 ET
-Q q
-0.000 0.000 0.000 RG
-0.75 w
-[] 0 d
-1 J
-1 j
-10.00 M
-75.36 59.04 m
-555.36 59.04 l
-S
-Q q
-0.000 0.000 0.000 RG
-0.75 w
-[] 0 d
-1 J
-1 j
-10.00 M
-56.16 72.11 m 56.16 356.91 l S
+75.36 59.04 m 554.98 59.04 l S
 56.16 72.11 m 48.96 72.11 l S
 56.16 129.07 m 48.96 129.07 l S
 56.16 186.03 m 48.96 186.03 l S
@@ -2805,7 +2782,6 @@ Q q
 56.16 299.95 m 48.96 299.95 l S
 56.16 356.91 m 48.96 356.91 l S
 BT
-0.000 0.000 0.000 rg
 /F2 1 Tf 0.00 12.00 -12.00 0.00 38.88 68.77 Tm (0) Tj
 ET
 BT
@@ -2823,19 +2799,20 @@ ET
 BT
 /F2 1 Tf 0.00 12.00 -12.00 0.00 38.88 343.56 Tm (1000) Tj
 ET
+56.16 72.11 m 56.16 398.77 l S
 Q q 56.16 59.04 518.40 352.80 re W n
 BT
 0.000 0.000 0.000 rg
-/F2 1 Tf 12.00 0.00 -0.00 12.00 457.45 354.04 Tm (Static IP address) Tj
+/F2 1 Tf 12.00 0.00 -0.00 12.00 438.49 354.04 Tm (Static IP address) Tj
 ET
 BT
-/F2 1 Tf 12.00 0.00 -0.00 12.00 440.80 177.46 Tm (Dynamic IP address) Tj
+/F2 1 Tf 12.00 0.00 -0.00 12.00 421.84 177.46 Tm (Dynamic IP address) Tj
 ET
 Q
 endstream
 endobj
 7 0 obj
-46038
+45716
 endobj
 3 0 obj
 <<
@@ -2882,14 +2859,14 @@ xref
 0000000000 65535 f 
 0000000021 00000 n 
 0000000163 00000 n 
-0000046404 00000 n 
-0000046487 00000 n 
+0000046082 00000 n 
+0000046165 00000 n 
 0000000212 00000 n 
 0000000292 00000 n 
-0000046383 00000 n 
-0000046579 00000 n 
-0000046836 00000 n 
-0000046932 00000 n 
+0000046061 00000 n 
+0000046257 00000 n 
+0000046514 00000 n 
+0000046610 00000 n 
 trailer
 <<
 /Size 11
@@ -2897,5 +2874,5 @@ trailer
 /Root 2 0 R
 >>
 startxref
-47034
+46712
 %%EOF
diff --git a/report/dirarch/platforms.pdf b/report/dirarch/platforms.pdf
index c6c5c63..7ef2c5e 100644
--- a/report/dirarch/platforms.pdf
+++ b/report/dirarch/platforms.pdf
@@ -2,8 +2,8 @@
 %âãÏÓ\r
 1 0 obj
 <<
-/CreationDate (D:20090804074027)
-/ModDate (D:20090804074027)
+/CreationDate (D:20091012110846)
+/ModDate (D:20091012110846)
 /Title (R Graphics Output)
 /Producer (R 2.8.1)
 /Creator (R)
@@ -5201,16 +5201,14 @@ S
 S
 Q q
 0.000 0.000 0.000 RG
-0.60 w
+0.75 w
 [] 0 d
 1 J
 1 j
 10.00 M
-199.74 59.04 m 477.67 59.04 l S
 199.74 59.04 m 199.74 51.84 l S
 338.51 59.04 m 338.51 51.84 l S
 477.67 59.04 m 477.67 51.84 l S
-83.40 59.04 m 558.65 59.04 l S
 83.40 59.04 m 83.40 57.60 l S
 95.18 59.04 m 95.18 57.60 l S
 106.59 59.04 m 106.59 57.60 l S
@@ -5221,7 +5219,6 @@ Q q
 164.76 59.04 m 164.76 57.60 l S
 176.55 59.04 m 176.55 57.60 l S
 187.95 59.04 m 187.95 57.60 l S
-199.74 59.04 m 199.74 57.60 l S
 211.52 59.04 m 211.52 57.60 l S
 222.17 59.04 m 222.17 57.60 l S
 233.96 59.04 m 233.96 57.60 l S
@@ -5233,7 +5230,6 @@ Q q
 303.53 59.04 m 303.53 57.60 l S
 315.32 59.04 m 315.32 57.60 l S
 326.73 59.04 m 326.73 57.60 l S
-338.51 59.04 m 338.51 57.60 l S
 350.30 59.04 m 350.30 57.60 l S
 361.32 59.04 m 361.32 57.60 l S
 373.11 59.04 m 373.11 57.60 l S
@@ -5245,14 +5241,12 @@ Q q
 442.69 59.04 m 442.69 57.60 l S
 454.47 59.04 m 454.47 57.60 l S
 465.88 59.04 m 465.88 57.60 l S
-477.67 59.04 m 477.67 57.60 l S
 489.45 59.04 m 489.45 57.60 l S
 500.10 59.04 m 500.10 57.60 l S
 511.88 59.04 m 511.88 57.60 l S
 523.29 59.04 m 523.29 57.60 l S
 535.08 59.04 m 535.08 57.60 l S
 546.86 59.04 m 546.86 57.60 l S
-558.65 59.04 m 558.65 57.60 l S
 BT
 0.000 0.000 0.000 rg
 /F2 1 Tf 5.00 0.00 -0.00 5.00 87.02 48.96 Tm (M) Tj
@@ -5389,30 +5383,12 @@ ET
 BT
 /F2 1 Tf 12.00 0.00 -0.00 12.00 509.95 33.12 Tm (2009) Tj
 ET
-Q q
-0.000 0.000 0.000 RG
-0.75 w
-[] 0 d
-1 J
-1 j
-10.00 M
-75.41 59.04 m
-556.75 59.04 l
-S
-Q q
-0.000 0.000 0.000 RG
-0.75 w
-[] 0 d
-1 J
-1 j
-10.00 M
-56.16 72.11 m 56.16 404.08 l S
+75.41 59.04 m 556.37 59.04 l S
 56.16 72.11 m 48.96 72.11 l S
 56.16 182.77 m 48.96 182.77 l S
 56.16 293.43 m 48.96 293.43 l S
 56.16 404.08 m 48.96 404.08 l S
 BT
-0.000 0.000 0.000 rg
 /F2 1 Tf 0.00 12.00 -12.00 0.00 38.88 68.77 Tm (0) Tj
 ET
 BT
@@ -5424,6 +5400,7 @@ ET
 BT
 /F2 1 Tf 0.00 12.00 -12.00 0.00 38.88 390.74 Tm (1500) Tj
 ET
+56.16 72.11 m 56.16 398.77 l S
 Q q 56.16 59.04 519.84 352.80 re W n
 BT
 0.000 0.000 0.000 rg
@@ -5445,7 +5422,7 @@ Q
 endstream
 endobj
 7 0 obj
-84953
+84631
 endobj
 3 0 obj
 <<
@@ -5492,14 +5469,14 @@ xref
 0000000000 65535 f 
 0000000021 00000 n 
 0000000163 00000 n 
-0000085319 00000 n 
-0000085402 00000 n 
+0000084997 00000 n 
+0000085080 00000 n 
 0000000212 00000 n 
 0000000292 00000 n 
-0000085298 00000 n 
-0000085494 00000 n 
-0000085751 00000 n 
-0000085847 00000 n 
+0000084976 00000 n 
+0000085172 00000 n 
+0000085429 00000 n 
+0000085525 00000 n 
 trailer
 <<
 /Size 11
@@ -5507,5 +5484,5 @@ trailer
 /Root 2 0 R
 >>
 startxref
-85949
+85627
 %%EOF
diff --git a/report/dirarch/relayflags.pdf b/report/dirarch/relayflags.pdf
index 5c54eb2..df1c33e 100644
--- a/report/dirarch/relayflags.pdf
+++ b/report/dirarch/relayflags.pdf
@@ -2,8 +2,8 @@
 %âãÏÓ\r
 1 0 obj
 <<
-/CreationDate (D:20090804074027)
-/ModDate (D:20090804074027)
+/CreationDate (D:20091012110846)
+/ModDate (D:20091012110846)
 /Title (R Graphics Output)
 /Producer (R 2.8.1)
 /Creator (R)
@@ -8287,16 +8287,14 @@ S
 S
 Q q
 0.000 0.000 0.000 RG
-0.60 w
+0.75 w
 [] 0 d
 1 J
 1 j
 10.00 M
-185.11 59.04 m 434.75 59.04 l S
 185.11 59.04 m 185.11 51.84 l S
 309.76 59.04 m 309.76 51.84 l S
 434.75 59.04 m 434.75 51.84 l S
-80.61 59.04 m 507.49 59.04 l S
 80.61 59.04 m 80.61 57.60 l S
 91.20 59.04 m 91.20 57.60 l S
 101.44 59.04 m 101.44 57.60 l S
@@ -8307,7 +8305,6 @@ Q q
 153.69 59.04 m 153.69 57.60 l S
 164.28 59.04 m 164.28 57.60 l S
 174.52 59.04 m 174.52 57.60 l S
-185.11 59.04 m 185.11 57.60 l S
 195.70 59.04 m 195.70 57.60 l S
 205.26 59.04 m 205.26 57.60 l S
 215.85 59.04 m 215.85 57.60 l S
@@ -8319,7 +8316,6 @@ Q q
 278.34 59.04 m 278.34 57.60 l S
 288.93 59.04 m 288.93 57.60 l S
 299.17 59.04 m 299.17 57.60 l S
-309.76 59.04 m 309.76 57.60 l S
 320.35 59.04 m 320.35 57.60 l S
 330.25 59.04 m 330.25 57.60 l S
 340.84 59.04 m 340.84 57.60 l S
@@ -8331,14 +8327,12 @@ Q q
 403.33 59.04 m 403.33 57.60 l S
 413.92 59.04 m 413.92 57.60 l S
 424.16 59.04 m 424.16 57.60 l S
-434.75 59.04 m 434.75 57.60 l S
 445.34 59.04 m 445.34 57.60 l S
 454.90 59.04 m 454.90 57.60 l S
 465.48 59.04 m 465.48 57.60 l S
 475.73 59.04 m 475.73 57.60 l S
 486.32 59.04 m 486.32 57.60 l S
 496.90 59.04 m 496.90 57.60 l S
-507.49 59.04 m 507.49 57.60 l S
 BT
 0.000 0.000 0.000 rg
 /F2 1 Tf 5.00 0.00 -0.00 5.00 83.65 48.96 Tm (M) Tj
@@ -8475,30 +8469,12 @@ ET
 BT
 /F2 1 Tf 12.00 0.00 -0.00 12.00 462.39 33.12 Tm (2009) Tj
 ET
-Q q
-0.000 0.000 0.000 RG
-0.75 w
-[] 0 d
-1 J
-1 j
-10.00 M
-73.44 59.04 m
-505.44 59.04 l
-S
-Q q
-0.000 0.000 0.000 RG
-0.75 w
-[] 0 d
-1 J
-1 j
-10.00 M
-56.16 72.11 m 56.16 339.72 l S
+73.44 59.04 m 505.44 59.04 l S
 56.16 72.11 m 48.96 72.11 l S
 56.16 161.31 m 48.96 161.31 l S
 56.16 250.52 m 48.96 250.52 l S
 56.16 339.72 m 48.96 339.72 l S
 BT
-0.000 0.000 0.000 rg
 /F2 1 Tf 0.00 12.00 -12.00 0.00 38.88 68.77 Tm (0) Tj
 ET
 BT
@@ -8510,12 +8486,13 @@ ET
 BT
 /F2 1 Tf 0.00 12.00 -12.00 0.00 38.88 326.38 Tm (1500) Tj
 ET
+56.16 72.11 m 56.16 398.77 l S
 BT
 /F2 1 Tf 12.00 0.00 -0.00 12.00 522.72 368.77 Tm (Total) Tj
 ET
 BT
 1.000 0.647 0.000 rg
-/F2 1 Tf 12.00 0.00 -0.00 12.00 522.72 206.42 Tm (Exit) Tj
+/F2 1 Tf 12.00 0.00 -0.00 12.00 522.72 210.88 Tm (Exit) Tj
 ET
 BT
 1.000 0.000 0.000 rg
@@ -8541,7 +8518,7 @@ Q
 endstream
 endobj
 7 0 obj
-135921
+135599
 endobj
 3 0 obj
 <<
@@ -8588,14 +8565,14 @@ xref
 0000000000 65535 f 
 0000000021 00000 n 
 0000000163 00000 n 
-0000136288 00000 n 
-0000136371 00000 n 
+0000135966 00000 n 
+0000136049 00000 n 
 0000000212 00000 n 
 0000000292 00000 n 
-0000136266 00000 n 
-0000136463 00000 n 
-0000136720 00000 n 
-0000136816 00000 n 
+0000135944 00000 n 
+0000136141 00000 n 
+0000136398 00000 n 
+0000136494 00000 n 
 trailer
 <<
 /Size 11
@@ -8603,5 +8580,5 @@ trailer
 /Root 2 0 R
 >>
 startxref
-136918
+136596
 %%EOF
diff --git a/scripts/dirarch/dirarch.R b/scripts/dirarch/dirarch.R
index 07cdfc0..b2663b8 100644
--- a/scripts/dirarch/dirarch.R
+++ b/scripts/dirarch/dirarch.R
@@ -1,7 +1,20 @@
+monthticks <- c(22, 53, 83, 114, 144, 175, 206, 236, 267, 297, 359, 387, 418, 448, 479, 509, 540, 571, 601, 632, 662, 724, 753, 784, 814, 845, 875, 906, 937, 967, 998, 1028, 1090, 1118, 1149, 1179, 1210, 1241)
+yearticks <- c(328, 693, 1059)
+
+plot_axes <- function(ymax) {
+  axis(1, at=c(328, 693, 1059), labels=FALSE, lwd.ticks=1, lwd=0)
+  axis(1, at=monthticks, labels=FALSE, lwd.ticks=1, lwd=0, tcl=-0.1)
+  axis(1, at=sort(c(monthticks, yearticks)) + 15, labels=c("M","A","M","J","J","A","S","O","N","D","J","F","M","A","M","J","J","A","S","O","N","D","J","F","M","A","M","J","J","A","S","O","N","D","J","F","M","A","M","J","J"), tick=FALSE, line=-1.1, cex.axis=0.45)
+  axis(1, at=c(328-183, 328+182, 693+182, 1059+120), labels=c("2006", "2007", "2008", "2009"), tick=FALSE)
+  axis(1, at=c(1, length(r$running)), lwd.ticks=0, labels=FALSE)
+  axis(2, lwd=0, lwd.ticks=1)
+  axis(2, at=c(0, ymax), lwd.ticks=0, labels=FALSE)
+}
+
 r <- read.csv("out/dirarch/relayflags.csv")
 r <- r[1:length(r$running)-1,]
 pdf("report/dirarch/relayflags.pdf", width=8, height=6)
-oldpar <- par(mar=c(4.1, 3.9, 1.4, 3.7)) 
+par(mar=c(4.1, 3.9, 1.4, 3.7))
 plot(r$running, type="l", ylim=c(0, max(na.omit(r$running))), frame=FALSE, axes=FALSE, col="black", xlab="Date", ylab="Running relays", main="Relay statuses")
 lines(r$exit, type="l", col="orange")
 lines(r$fast, type="l", col="red")
@@ -9,157 +22,98 @@ lines(r$guard, type="l", col="blue")
 lines(c(rep(NA,643),r$hsdir[644:length(r$hsdir)]), type="l", col="darkred")
 lines(r$stable, type="l", col="purple")
 lines(r$v2dir, type="l", col="darkgreen")
-axis(1, at=c(328, 693, 1059), labels=FALSE, lwd=0.8)
-monthticks <- c(22, 53, 83, 114, 144, 175, 206, 236, 267, 297, 328, 359, 387, 418, 448, 479, 509, 540, 571, 601, 632, 662, 693, 724, 753, 784, 814, 845, 875, 906, 937, 967, 998, 1028, 1059, 1090, 1118, 1149, 1179, 1210, 1241, 1272)
-axis(1, at=monthticks, labels=FALSE, lwd=0.8, tcl=-0.1)
-axis(1, at=monthticks + 15, labels=c("M","A","M","J","J","A","S","O","N","D", "J","F","M","A","M","J","J","A","S","O","N","D",
-"J","F","M","A","M","J","J","A","S","O","N","D",
-"J","F","M","A","M","J","J", ""), tick=FALSE, line=-1.1, cex.axis=0.45)
-axis(1, at=c(328-183, 328+182, 693+182, 1059+120), labels=c("2006", "2007", "2008", "2009"), tick=FALSE)
-parside <- { flip <- 1; xaxis <- TRUE; islog <- FALSE; otherlog <- FALSE; 3 }
-lines(c(1,length(r$running)),rep(par("usr")[parside],2), xpd=TRUE)
-axis(2)
+plot_axes(max(na.omit(r$running)))
 mtext("Total", side=4, las=1, at=r$running[length(r$running)])
-mtext("Exit", side=4, las=1, at=r$exit[length(r$running)], col="orange")
+mtext("Exit", side=4, las=1, at=r$exit[length(r$running)]+25, col="orange")
 mtext("Fast", side=4, las=1, at=r$fast[length(r$running)], col="red")
 mtext("Guard", side=4, las=1, at=r$guard[length(r$running)], col="blue")
 mtext("HSDir", side=4, las=1, at=r$hsdir[length(r$running)], col="darkred")
 mtext("Stable", side=4, las=1, at=r$stable[length(r$running)]+40, col="purple")
 mtext("V2Dir", side=4, las=1, at=r$v2dir[length(r$running)]-5, col="darkgreen")
-par(oldpar)
 dev.off();
 
 p <- read.csv("out/dirarch/platforms.csv")
 pdf("report/dirarch/platforms.pdf", width=8, height=6)
-oldpar <- par(mar=c(4.1, 3.9, 1.4, 0)) 
+par(mar=c(4.1, 3.9, 1.4, 0))
 plot(c(rep(NA,61),p$v012[62:length(p$v012)]), type="l", ylim=c(0, max(na.omit(p$v020))), frame=FALSE, axes=FALSE, col="orange", xlab="Date", ylab="Running relays", main="Relay versions")
 lines(p$v010, type="l", col="purple")
 lines(p$v011, type="l", col="red")
 lines(c(rep(NA,389),p$v020[390:length(p$v020)]), type="l", col="darkgreen")
 lines(c(rep(NA,748),p$v021[749:length(p$v021)]), type="l", col="blue")
-axis(1, at=c(328, 693, 1059), labels=FALSE, lwd=0.8)
-monthticks <- c(22, 53, 83, 114, 144, 175, 206, 236, 267, 297, 328, 359, 387, 418, 448, 479, 509, 540, 571, 601, 632, 662, 693, 724, 753, 784, 814, 845, 875, 906, 937, 967, 998, 1028, 1059, 1090, 1118, 1149, 1179, 1210, 1241, 1272)
-axis(1, at=monthticks, labels=FALSE, lwd=0.8, tcl=-0.1)
-axis(1, at=monthticks + 15, labels=c("M","A","M","J","J","A","S","O","N","D", "J","F","M","A","M","J","J","A","S","O","N","D",
-"J","F","M","A","M","J","J","A","S","O","N","D",
-"J","F","M","A","M","J","J", ""), tick=FALSE, line=-1.1, cex.axis=0.45)
-axis(1, at=c(328-183, 328+182, 693+182, 1059+120), labels=c("2006", "2007", "2008", "2009"), tick=FALSE)
-parside <- { flip <- 1; xaxis <- TRUE; islog <- FALSE; otherlog <- FALSE; 3 }
-lines(c(1,length(p$v012)),rep(par("usr")[parside],2), xpd=TRUE)
-axis(2)
+plot_axes(max(na.omit(p$v020)))
 text(50, 415, labels="0.1.0.x")
 text(325, 840, labels="0.1.1.x")
 text(830, 1220, labels="0.1.2.x")
 text(1000, 820, labels="0.2.0.x")
 text(1000, 150, labels="0.2.1.x")
-par(oldpar)
 dev.off();
 
 a <- read.csv("out/dirarch/advertised.csv")
 factor <- 2^20
 pdf("report/dirarch/advertised.pdf", width=8, height=6)
-oldpar <- par(mar=c(4.1, 3.9, 1.4, 3.7))
+par(mar=c(4.1, 3.9, 1.4, 3.7))
 plot(a$observed/factor, type="l", ylim=c(0, max(na.omit(a$observed))/factor), frame=FALSE, axes=FALSE, col="darkgreen", xlab="Date", ylab="Bandwidth [MB/s]", main="Relay bandwidths")
 lines((a$routerbw+a$extrabw)/900/factor, type="l", col="red")
-axis(1, at=c(328, 693, 1059), labels=FALSE, lwd=0.8)
-monthticks <- c(22, 53, 83, 114, 144, 175, 206, 236, 267, 297, 328, 359, 387, 418, 448, 479, 509, 540, 571, 601, 632, 662, 693, 724, 753, 784, 814, 845, 875, 906, 937, 967, 998, 1028, 1059, 1090, 1118, 1149, 1179, 1210, 1241, 1272)
-axis(1, at=monthticks, labels=FALSE, lwd=0.8, tcl=-0.1)
-axis(1, at=monthticks + 15, labels=c("M","A","M","J","J","A","S","O","N","D", "J","F","M","A","M","J","J","A","S","O","N","D",
-"J","F","M","A","M","J","J","A","S","O","N","D",
-"J","F","M","A","M","J","J", ""), tick=FALSE, line=-1.1, cex.axis=0.45)
-axis(1, at=c(328-183, 328+182, 693+182, 1059+120), labels=c("2006", "2007", "2008", "2009"), tick=FALSE)
-parside <- { flip <- 1; xaxis <- TRUE; islog <- FALSE; otherlog <- FALSE; 3 }
-lines(c(1,length(a$observed)),rep(par("usr")[parside],2), xpd=TRUE)
-axis(2)
+plot_axes(max(na.omit(a$observed/factor)))
 mtext("Observed", side=4, las=1, at=a$observed[length(a$observed)]/factor)
 mtext("History", side=4, las=1, at=(a$routerbw[length(a$routerbw)]+a$extrabw[length(a$extrabw)])/900/factor)
-par(oldpar)
 dev.off();
 
 d <- read.csv("out/dirarch/dynamic.csv")
 pdf("report/dirarch/dynamic.pdf", width=8, height=6)
-oldpar <- par(mar=c(4.1, 3.9, 1.4, 0.1))
+par(mar=c(4.1, 3.9, 1.4, 0.1))
 plot(d$ip1+d$ip2, type="l", ylim=c(0, max(na.omit(d$ip1+d$ip2))), frame=FALSE, axes=FALSE, col="darkgreen", xlab="Date", ylab="Running relays", main="Relays on dynamic IP addresses")
 lines(d$ip3to5+d$ip6to10+d$ip11ormore, type="l", col="orange")
-axis(1, at=c(328, 693, 1059), labels=FALSE, lwd=0.8)
-monthticks <- c(22, 53, 83, 114, 144, 175, 206, 236, 267, 297, 328, 359, 387, 418, 448, 479, 509, 540, 571, 601, 632, 662, 693, 724, 753, 784, 814, 845, 875, 906, 937, 967, 998, 1028, 1059, 1090, 1118, 1149, 1179, 1210, 1241, 1272)
-axis(1, at=monthticks, labels=FALSE, lwd=0.8, tcl=-0.1)
-axis(1, at=monthticks + 15, labels=c("M","A","M","J","J","A","S","O","N","D", "J","F","M","A","M","J","J","A","S","O","N","D",
-"J","F","M","A","M","J","J","A","S","O","N","D",
-"J","F","M","A","M","J","J", ""), tick=FALSE, line=-1.1, cex.axis=0.45)
-axis(1, at=c(328-183, 328+182, 693+182, 1059+120), labels=c("2006", "2007", "2008", "2009"), tick=FALSE)
-parside <- { flip <- 1; xaxis <- TRUE; islog <- FALSE; otherlog <- FALSE; 3 }
-lines(c(1,length(d$ip1)),rep(par("usr")[parside],2), xpd=TRUE)
-axis(2)
-text(length(d$total), 1000, labels="Static IP address", pos=2)
-text(length(d$total), 380, labels="Dynamic IP address", pos=2)
-par(oldpar)
+plot_axes(max(na.omit(d$ip1+d$ip2)))
+text(length(d$total)-50, 1000, labels="Static IP address", pos=2)
+text(length(d$total)-50, 380, labels="Dynamic IP address", pos=2)
 dev.off();
 
 d <- read.csv("out/dirarch/dynamic-cutoff.csv")
 pdf("report/dirarch/dynamic-cutoff.pdf", width=8, height=6)
-oldpar <- par(mar=c(4.1, 3.9, 1.4, 3.7))
+par(mar=c(4.1, 3.9, 1.4, 3.7))
 plot(d$count, type="b", xlim=c(1,10), xlab="Distinct IP addresses seen between Feb 2006 and Jun 2009", ylab="Running relays", main="Distinct IP addresses per relay", frame=FALSE, axes=FALSE, col="blue")
 abline(v = 2.5, lty = 2)
 text(x = 2.5, y = 200, pos = 4, "cutoff between static and dynamic addresses")
-axis(1, at=1:10)
-axis(2)
-par(oldpar)
+axis(1, at=1:10, lwd=0, lwd.ticks=1)
+axis(1, at=c(1, 10.5), lwd.ticks=0, labels=FALSE)
+axis(2, lwd=0, lwd.ticks=1)
+axis(2, at=c(0, d$count[1]), lwd.ticks=0, labels=FALSE)
 dev.off();
 
 c <- read.csv("out/dirarch/country.csv")
 #c1 <- as.vector(lapply(na.omit(c[,3:length(c)]), mean)); c1[c1 > 30]
 pdf("report/dirarch/country.pdf", width=8, height=6)
-oldpar <- par(mar=c(4.1, 3.9, 1.4, 4.6))
+par(mar=c(4.1, 3.9, 1.4, 4.6))
 plot(c$DE, type="l", ylim=c(0, max(na.omit(c$DE))), frame=FALSE, axes=FALSE, xlab="Date", ylab="Running relays", main="Relay locations", col="orange")
 lines(c$US, type="l", col="blue")
 lines(c$FR, type="l", col="darkgreen")
 lines(c$CN, type="l", col="red")
 lines(c$SE, type="l", col="purple")
-axis(1, at=c(328, 693, 1059), labels=FALSE, lwd=0.8)
-monthticks <- c(22, 53, 83, 114, 144, 175, 206, 236, 267, 297, 328, 359, 387, 418, 448, 479, 509, 540, 571, 601, 632, 662, 693, 724, 753, 784, 814, 845, 875, 906, 937, 967, 998, 1028, 1059, 1090, 1118, 1149, 1179, 1210, 1241, 1272)
-axis(1, at=monthticks, labels=FALSE, lwd=0.8, tcl=-0.1)
-axis(1, at=monthticks + 15, labels=c("M","A","M","J","J","A","S","O","N","D", "J","F","M","A","M","J","J","A","S","O","N","D",
-"J","F","M","A","M","J","J","A","S","O","N","D",
-"J","F","M","A","M","J","J", ""), tick=FALSE, line=-1.1, cex.axis=0.45)
-axis(1, at=c(328-183, 328+182, 693+182, 1059+120), labels=c("2006", "2007", "2008", "2009"), tick=FALSE)
-parside <- { flip <- 1; xaxis <- TRUE; islog <- FALSE; otherlog <- FALSE; 3 }
-lines(c(1,length(c$DE)),rep(par("usr")[parside],2), xpd=TRUE)
-axis(2)
-mtext("Germany", side=4, las=1, at=c$DE[length(c$total)] + 7, col="orange")
-mtext("U.S.A.", side=4, las=1, at=c$US[length(c$total)] - 5, col="blue")
-mtext("France", side=4, las=1, at=c$FR[length(c$total)] + 5, col="darkgreen")
-mtext("Sweden", side=4, las=1, at=c$SE[length(c$total)] + 5, col="purple")
-mtext("China", side=4, las=1, at=c$CN[length(c$total)] - 2, col="red")
-par(oldpar)
+plot_axes(max(na.omit(c$DE)))
+mtext("Germany", side=4, las=1, at=c$DE[length(c$total)], col="orange")
+mtext("U.S.A.", side=4, las=1, at=c$US[length(c$total)], col="blue")
+mtext("France", side=4, las=1, at=c$FR[length(c$total)], col="darkgreen")
+mtext("Sweden", side=4, las=1, at=c$SE[length(c$total)]+5, col="purple")
+mtext("China", side=4, las=1, at=c$CN[length(c$total)]-2, col="red")
 dev.off();
 
 c <- read.csv("out/dirarch/countrybw.csv", stringsAsFactors = FALSE)
 factor <- 2^20 * 900
 pdf("report/dirarch/countrybw.pdf", width=8, height=6)
-oldpar <- par(mar=c(4.1, 3.9, 1.4, 4.6))
+par(mar=c(4.1, 3.9, 1.4, 4.6))
 plot(c$tDE/factor, type="l", ylim=c(0, max(na.omit(c$tDE))/factor), frame=FALSE, axes=FALSE, xlab="Date", ylab="Bandwidth [MB/s]", main="Relay locations", col="orange")
 #DE, US, NL, FR, SE, AT, GR, DK, CN, IT
 lines(c$tUS/factor, type="l", col="blue")
 lines(c$tNL/factor, type="l", col="cyan")
 lines(c$tFR/factor, type="l", col="darkgreen")
 lines(c$tSE/factor, type="l", col="purple")
-axis(1, at=c(328, 693, 1059), labels=FALSE, lwd=0.8)
-monthticks <- c(22, 53, 83, 114, 144, 175, 206, 236, 267, 297, 328, 359, 387, 418, 448, 479, 509, 540, 571, 601, 632, 662, 693, 724, 753, 784, 814, 845, 875, 906, 937, 967, 998, 1028, 1059, 1090, 1118, 1149, 1179, 1210, 1241, 1272)
-axis(1, at=monthticks, labels=FALSE, lwd=0.8, tcl=-0.1)
-axis(1, at=monthticks + 15, labels=c("M","A","M","J","J","A","S","O","N","D", "J","F","M","A","M","J","J","A","S","O","N","D",
-"J","F","M","A","M","J","J","A","S","O","N","D",
-"J","F","M","A","M","J","J", ""), tick=FALSE, line=-1.1, cex.axis=0.45)
-axis(1, at=c(328-183, 328+182, 693+182, 1059+120), labels=c("2006", "2007", "2008", "2009"), tick=FALSE)
-parside <- { flip <- 1; xaxis <- TRUE; islog <- FALSE; otherlog <- FALSE; 3 }
-lines(c(1,length(c$tDE)),rep(par("usr")[parside],2), xpd=TRUE)
-axis(2)
-mtext("Germany", side=4, las=1, at=c$tDE[length(c$ttotal)]/factor+1, col="orange")
-mtext("U.S.A.", side=4, las=1, at=c$tUS[length(c$ttotal)]/factor-1, col="blue")
-mtext("France", side=4, las=1, at=c$tFR[length(c$ttotal)]/factor-1, col="darkgreen")
-mtext("Sweden", side=4, las=1, at=c$tSE[length(c$ttotal)]/factor+1, col="purple")
+plot_axes(max(na.omit(c$tDE/factor)))
+mtext("Germany", side=4, las=1, at=c$tDE[length(c$ttotal)]/factor, col="orange")
+mtext("U.S.A.", side=4, las=1, at=c$tUS[length(c$ttotal)]/factor, col="blue")
+mtext("France", side=4, las=1, at=c$tFR[length(c$ttotal)]/factor+1, col="darkgreen")
+mtext("Sweden", side=4, las=1, at=c$tSE[length(c$ttotal)]/factor-1, col="purple")
 mtext("Netherlands", side=4, las=1, at=c$tNL[length(c$ttotal)]/factor, col="cyan")
-par(oldpar)
 dev.off();
 
 w <- read.csv("out/dirarch/countryadvbw.csv", stringsAsFactors = FALSE)
@@ -167,27 +121,17 @@ w <- read.csv("out/dirarch/countryadvbw.csv", stringsAsFactors = FALSE)
 #w[639:643,] <- NA
 factor <- 2^20
 pdf("report/dirarch/countryadvbw.pdf", width=8, height=6)
-oldpar <- par(mar=c(4.1, 3.9, 1.4, 4.6))
-plot(w$oDE/factor, type="l", ylim=c(0, max(na.omit(w$oDE))/factor), frame=FALSE, axes=FALSE, xlab="Date", ylab="Bandwidth in MiB/s", main="Country locations", col="orange", lwd=2)
-lines(w$oUS/factor, type="l", col="blue", lwd=2)
-lines(w$oNL/factor, type="l", col="cyan", lwd=2)
-lines(w$oFR/factor, type="l", col="darkgreen", lwd=2)
-lines(w$oSE/factor, type="l", col="purple", lwd=2)
-axis(1, at=c(328, 693, 1059), labels=FALSE, lwd=0.8)
-monthticks <- c(22, 53, 83, 114, 144, 175, 206, 236, 267, 297, 328, 359, 387, 418, 448, 479, 509, 540, 571, 601, 632, 662, 693, 724, 753, 784, 814, 845, 875, 906, 937, 967, 998, 1028, 1059, 1090, 1118, 1149, 1179, 1210, 1241, 1272)
-axis(1, at=monthticks, labels=FALSE, lwd=0.8, tcl=-0.1)
-axis(1, at=monthticks + 15, labels=c("M","A","M","J","J","A","S","O","N","D", "J","F","M","A","M","J","J","A","S","O","N","D",
-"J","F","M","A","M","J","J","A","S","O","N","D",
-"J","F","M","A","M","J","J", ""), tick=FALSE, line=-1.1, cex.axis=0.45)
-axis(1, at=c(328-183, 328+182, 693+182, 1059+120), labels=c("2006", "2007", "2008", "2009"), tick=FALSE)
-parside <- { flip <- 1; xaxis <- TRUE; islog <- FALSE; otherlog <- FALSE; 3 }
-lines(c(1,length(c$tDE)),rep(par("usr")[parside],2), xpd=TRUE)
-axis(2)
-mtext("Germany", side=4, las=1, at=w$oDE[length(w$ototal)]/factor+5, col="orange")
-mtext("U.S.A.", side=4, las=1, at=w$oUS[length(w$ototal)]/factor-5, col="blue")
-mtext("France", side=4, las=1, at=w$oFR[length(w$ototal)]/factor+3, col="darkgreen")
-mtext("Sweden", side=4, las=1, at=w$oSE[length(w$ototal)]/factor-3, col="purple")
+par(mar=c(4.1, 3.9, 1.4, 4.6))
+plot(w$oDE/factor, type="l", ylim=c(0, max(na.omit(w$oDE))/factor), frame=FALSE, axes=FALSE, xlab="Date", ylab="Bandwidth in MiB/s", main="Country locations", col="orange")
+lines(w$oUS/factor, type="l", col="blue")
+lines(w$oNL/factor, type="l", col="cyan")
+lines(w$oFR/factor, type="l", col="darkgreen")
+lines(w$oSE/factor, type="l", col="purple")
+plot_axes(max(na.omit(w$oDE/factor)))
+mtext("Germany", side=4, las=1, at=w$oDE[length(w$ototal)]/factor+4, col="orange")
+mtext("U.S.A.", side=4, las=1, at=w$oUS[length(w$ototal)]/factor-3, col="blue")
+mtext("France", side=4, las=1, at=w$oFR[length(w$ototal)]/factor+2, col="darkgreen")
+mtext("Sweden", side=4, las=1, at=w$oSE[length(w$ototal)]/factor-2, col="purple")
 mtext("Netherlands", side=4, las=1, at=w$oNL[length(w$ototal)]/factor, col="cyan")
-par(oldpar)
 dev.off();
 
-- 
1.5.6.5



More information about the tor-commits mailing list