From: Arnaud Giersch Date: Mon, 25 Mar 2013 17:12:02 +0000 (+0100) Subject: Improve legends. X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba-papers.git/commitdiff_plain/fbb3b710630e2a7bd2b809c6fe4e7d5095f7cdaa?ds=sidebyside;hp=9b96bd5692f7c547db8325e06f805e8a2a680f14 Improve legends. --- diff --git a/loba-besteffort/data/all2.pdf b/loba-besteffort/data/all2.pdf index 1c41cab..80ae147 100644 Binary files a/loba-besteffort/data/all2.pdf and b/loba-besteffort/data/all2.pdf differ diff --git a/loba-besteffort/data/allgraphs.pdf b/loba-besteffort/data/allgraphs.pdf index e6ad485..a748d7e 100644 Binary files a/loba-besteffort/data/allgraphs.pdf and b/loba-besteffort/data/allgraphs.pdf differ diff --git a/loba-besteffort/data/graphs/I1-10:1-cluster-hcube.pdf b/loba-besteffort/data/graphs/I1-10:1-cluster-hcube.pdf index b9af7ec..312675c 100644 Binary files a/loba-besteffort/data/graphs/I1-10:1-cluster-hcube.pdf and b/loba-besteffort/data/graphs/I1-10:1-cluster-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/I1-10:1-cluster-line.pdf b/loba-besteffort/data/graphs/I1-10:1-cluster-line.pdf index d7dc04c..a3c9782 100644 Binary files a/loba-besteffort/data/graphs/I1-10:1-cluster-line.pdf and b/loba-besteffort/data/graphs/I1-10:1-cluster-line.pdf differ diff --git a/loba-besteffort/data/graphs/I1-10:1-cluster-torus.pdf b/loba-besteffort/data/graphs/I1-10:1-cluster-torus.pdf index 7b1475c..cba050f 100644 Binary files a/loba-besteffort/data/graphs/I1-10:1-cluster-torus.pdf and b/loba-besteffort/data/graphs/I1-10:1-cluster-torus.pdf differ diff --git a/loba-besteffort/data/graphs/I1-10:1-grid-hcube.pdf b/loba-besteffort/data/graphs/I1-10:1-grid-hcube.pdf index 294ac17..014d97e 100644 Binary files a/loba-besteffort/data/graphs/I1-10:1-grid-hcube.pdf and b/loba-besteffort/data/graphs/I1-10:1-grid-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/I1-10:1-grid-line.pdf b/loba-besteffort/data/graphs/I1-10:1-grid-line.pdf index 799cf90..968a7b5 100644 Binary files a/loba-besteffort/data/graphs/I1-10:1-grid-line.pdf and b/loba-besteffort/data/graphs/I1-10:1-grid-line.pdf differ diff --git a/loba-besteffort/data/graphs/I1-10:1-grid-torus.pdf b/loba-besteffort/data/graphs/I1-10:1-grid-torus.pdf index 18ba2f9..64809d8 100644 Binary files a/loba-besteffort/data/graphs/I1-10:1-grid-torus.pdf and b/loba-besteffort/data/graphs/I1-10:1-grid-torus.pdf differ diff --git a/loba-besteffort/data/graphs/I1-1:1-cluster-hcube.pdf b/loba-besteffort/data/graphs/I1-1:1-cluster-hcube.pdf index cd1f2b3..4b89dbd 100644 Binary files a/loba-besteffort/data/graphs/I1-1:1-cluster-hcube.pdf and b/loba-besteffort/data/graphs/I1-1:1-cluster-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/I1-1:1-cluster-line.pdf b/loba-besteffort/data/graphs/I1-1:1-cluster-line.pdf index 8ac8875..c1da821 100644 Binary files a/loba-besteffort/data/graphs/I1-1:1-cluster-line.pdf and b/loba-besteffort/data/graphs/I1-1:1-cluster-line.pdf differ diff --git a/loba-besteffort/data/graphs/I1-1:1-cluster-torus.pdf b/loba-besteffort/data/graphs/I1-1:1-cluster-torus.pdf index 34a6f2f..1c24911 100644 Binary files a/loba-besteffort/data/graphs/I1-1:1-cluster-torus.pdf and b/loba-besteffort/data/graphs/I1-1:1-cluster-torus.pdf differ diff --git a/loba-besteffort/data/graphs/I1-1:1-grid-hcube.pdf b/loba-besteffort/data/graphs/I1-1:1-grid-hcube.pdf index 346775d..8746760 100644 Binary files a/loba-besteffort/data/graphs/I1-1:1-grid-hcube.pdf and b/loba-besteffort/data/graphs/I1-1:1-grid-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/I1-1:1-grid-line.pdf b/loba-besteffort/data/graphs/I1-1:1-grid-line.pdf index 65e3055..7747f2e 100644 Binary files a/loba-besteffort/data/graphs/I1-1:1-grid-line.pdf and b/loba-besteffort/data/graphs/I1-1:1-grid-line.pdf differ diff --git a/loba-besteffort/data/graphs/I1-1:1-grid-torus.pdf b/loba-besteffort/data/graphs/I1-1:1-grid-torus.pdf index cb8f53e..78006f9 100644 Binary files a/loba-besteffort/data/graphs/I1-1:1-grid-torus.pdf and b/loba-besteffort/data/graphs/I1-1:1-grid-torus.pdf differ diff --git a/loba-besteffort/data/graphs/I1-1:10-cluster-hcube.pdf b/loba-besteffort/data/graphs/I1-1:10-cluster-hcube.pdf index 98e8194..896bb36 100644 Binary files a/loba-besteffort/data/graphs/I1-1:10-cluster-hcube.pdf and b/loba-besteffort/data/graphs/I1-1:10-cluster-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/I1-1:10-cluster-line.pdf b/loba-besteffort/data/graphs/I1-1:10-cluster-line.pdf index 876bf7b..052fc8e 100644 Binary files a/loba-besteffort/data/graphs/I1-1:10-cluster-line.pdf and b/loba-besteffort/data/graphs/I1-1:10-cluster-line.pdf differ diff --git a/loba-besteffort/data/graphs/I1-1:10-cluster-torus.pdf b/loba-besteffort/data/graphs/I1-1:10-cluster-torus.pdf index a63d244..b79ab2a 100644 Binary files a/loba-besteffort/data/graphs/I1-1:10-cluster-torus.pdf and b/loba-besteffort/data/graphs/I1-1:10-cluster-torus.pdf differ diff --git a/loba-besteffort/data/graphs/I1-1:10-grid-hcube.pdf b/loba-besteffort/data/graphs/I1-1:10-grid-hcube.pdf index 3568c6a..e20ab61 100644 Binary files a/loba-besteffort/data/graphs/I1-1:10-grid-hcube.pdf and b/loba-besteffort/data/graphs/I1-1:10-grid-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/I1-1:10-grid-line.pdf b/loba-besteffort/data/graphs/I1-1:10-grid-line.pdf index ef9f9a2..bd74586 100644 Binary files a/loba-besteffort/data/graphs/I1-1:10-grid-line.pdf and b/loba-besteffort/data/graphs/I1-1:10-grid-line.pdf differ diff --git a/loba-besteffort/data/graphs/I1-1:10-grid-torus.pdf b/loba-besteffort/data/graphs/I1-1:10-grid-torus.pdf index e9b9d47..85c297c 100644 Binary files a/loba-besteffort/data/graphs/I1-1:10-grid-torus.pdf and b/loba-besteffort/data/graphs/I1-1:10-grid-torus.pdf differ diff --git a/loba-besteffort/data/graphs/IN-10:1-cluster-hcube.pdf b/loba-besteffort/data/graphs/IN-10:1-cluster-hcube.pdf index 28c06c5..f0dbac6 100644 Binary files a/loba-besteffort/data/graphs/IN-10:1-cluster-hcube.pdf and b/loba-besteffort/data/graphs/IN-10:1-cluster-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/IN-10:1-cluster-line.pdf b/loba-besteffort/data/graphs/IN-10:1-cluster-line.pdf index 2ef5820..afeb670 100644 Binary files a/loba-besteffort/data/graphs/IN-10:1-cluster-line.pdf and b/loba-besteffort/data/graphs/IN-10:1-cluster-line.pdf differ diff --git a/loba-besteffort/data/graphs/IN-10:1-cluster-torus.pdf b/loba-besteffort/data/graphs/IN-10:1-cluster-torus.pdf index b75092c..0f34321 100644 Binary files a/loba-besteffort/data/graphs/IN-10:1-cluster-torus.pdf and b/loba-besteffort/data/graphs/IN-10:1-cluster-torus.pdf differ diff --git a/loba-besteffort/data/graphs/IN-10:1-grid-hcube.pdf b/loba-besteffort/data/graphs/IN-10:1-grid-hcube.pdf index b97f7a2..8c65e75 100644 Binary files a/loba-besteffort/data/graphs/IN-10:1-grid-hcube.pdf and b/loba-besteffort/data/graphs/IN-10:1-grid-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/IN-10:1-grid-line.pdf b/loba-besteffort/data/graphs/IN-10:1-grid-line.pdf index 92f8769..77d3690 100644 Binary files a/loba-besteffort/data/graphs/IN-10:1-grid-line.pdf and b/loba-besteffort/data/graphs/IN-10:1-grid-line.pdf differ diff --git a/loba-besteffort/data/graphs/IN-10:1-grid-torus.pdf b/loba-besteffort/data/graphs/IN-10:1-grid-torus.pdf index e569a71..1694cfd 100644 Binary files a/loba-besteffort/data/graphs/IN-10:1-grid-torus.pdf and b/loba-besteffort/data/graphs/IN-10:1-grid-torus.pdf differ diff --git a/loba-besteffort/data/graphs/IN-1:1-cluster-hcube.pdf b/loba-besteffort/data/graphs/IN-1:1-cluster-hcube.pdf index 0572ed2..83a9850 100644 Binary files a/loba-besteffort/data/graphs/IN-1:1-cluster-hcube.pdf and b/loba-besteffort/data/graphs/IN-1:1-cluster-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/IN-1:1-cluster-line.pdf b/loba-besteffort/data/graphs/IN-1:1-cluster-line.pdf index ae98d74..c86c834 100644 Binary files a/loba-besteffort/data/graphs/IN-1:1-cluster-line.pdf and b/loba-besteffort/data/graphs/IN-1:1-cluster-line.pdf differ diff --git a/loba-besteffort/data/graphs/IN-1:1-cluster-torus.pdf b/loba-besteffort/data/graphs/IN-1:1-cluster-torus.pdf index d7dd564..df0033b 100644 Binary files a/loba-besteffort/data/graphs/IN-1:1-cluster-torus.pdf and b/loba-besteffort/data/graphs/IN-1:1-cluster-torus.pdf differ diff --git a/loba-besteffort/data/graphs/IN-1:1-grid-hcube.pdf b/loba-besteffort/data/graphs/IN-1:1-grid-hcube.pdf index 0125544..ff160bb 100644 Binary files a/loba-besteffort/data/graphs/IN-1:1-grid-hcube.pdf and b/loba-besteffort/data/graphs/IN-1:1-grid-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/IN-1:1-grid-line.pdf b/loba-besteffort/data/graphs/IN-1:1-grid-line.pdf index 5e657f2..c1cc568 100644 Binary files a/loba-besteffort/data/graphs/IN-1:1-grid-line.pdf and b/loba-besteffort/data/graphs/IN-1:1-grid-line.pdf differ diff --git a/loba-besteffort/data/graphs/IN-1:1-grid-torus.pdf b/loba-besteffort/data/graphs/IN-1:1-grid-torus.pdf index 837d5b7..c43f87f 100644 Binary files a/loba-besteffort/data/graphs/IN-1:1-grid-torus.pdf and b/loba-besteffort/data/graphs/IN-1:1-grid-torus.pdf differ diff --git a/loba-besteffort/data/graphs/IN-1:10-cluster-hcube.pdf b/loba-besteffort/data/graphs/IN-1:10-cluster-hcube.pdf index 6a73f1e..4ed1575 100644 Binary files a/loba-besteffort/data/graphs/IN-1:10-cluster-hcube.pdf and b/loba-besteffort/data/graphs/IN-1:10-cluster-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/IN-1:10-cluster-line.pdf b/loba-besteffort/data/graphs/IN-1:10-cluster-line.pdf index 4e1094d..4372d98 100644 Binary files a/loba-besteffort/data/graphs/IN-1:10-cluster-line.pdf and b/loba-besteffort/data/graphs/IN-1:10-cluster-line.pdf differ diff --git a/loba-besteffort/data/graphs/IN-1:10-cluster-torus.pdf b/loba-besteffort/data/graphs/IN-1:10-cluster-torus.pdf index ada63bb..c21960f 100644 Binary files a/loba-besteffort/data/graphs/IN-1:10-cluster-torus.pdf and b/loba-besteffort/data/graphs/IN-1:10-cluster-torus.pdf differ diff --git a/loba-besteffort/data/graphs/IN-1:10-grid-hcube.pdf b/loba-besteffort/data/graphs/IN-1:10-grid-hcube.pdf index 8100e35..b0526e1 100644 Binary files a/loba-besteffort/data/graphs/IN-1:10-grid-hcube.pdf and b/loba-besteffort/data/graphs/IN-1:10-grid-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/IN-1:10-grid-line.pdf b/loba-besteffort/data/graphs/IN-1:10-grid-line.pdf index 8ce007d..8c67208 100644 Binary files a/loba-besteffort/data/graphs/IN-1:10-grid-line.pdf and b/loba-besteffort/data/graphs/IN-1:10-grid-line.pdf differ diff --git a/loba-besteffort/data/graphs/IN-1:10-grid-torus.pdf b/loba-besteffort/data/graphs/IN-1:10-grid-torus.pdf index 242d12f..a94f98b 100644 Binary files a/loba-besteffort/data/graphs/IN-1:10-grid-torus.pdf and b/loba-besteffort/data/graphs/IN-1:10-grid-torus.pdf differ diff --git a/loba-besteffort/data/graphs/R1-10:1-cluster-hcube.pdf b/loba-besteffort/data/graphs/R1-10:1-cluster-hcube.pdf index 2b269c6..8a5badd 100644 Binary files a/loba-besteffort/data/graphs/R1-10:1-cluster-hcube.pdf and b/loba-besteffort/data/graphs/R1-10:1-cluster-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/R1-10:1-cluster-line.pdf b/loba-besteffort/data/graphs/R1-10:1-cluster-line.pdf index 91bb4de..405ded1 100644 Binary files a/loba-besteffort/data/graphs/R1-10:1-cluster-line.pdf and b/loba-besteffort/data/graphs/R1-10:1-cluster-line.pdf differ diff --git a/loba-besteffort/data/graphs/R1-10:1-cluster-torus.pdf b/loba-besteffort/data/graphs/R1-10:1-cluster-torus.pdf index 79134d2..b5df11f 100644 Binary files a/loba-besteffort/data/graphs/R1-10:1-cluster-torus.pdf and b/loba-besteffort/data/graphs/R1-10:1-cluster-torus.pdf differ diff --git a/loba-besteffort/data/graphs/R1-10:1-grid-hcube.pdf b/loba-besteffort/data/graphs/R1-10:1-grid-hcube.pdf index 3f08fdb..2494a7c 100644 Binary files a/loba-besteffort/data/graphs/R1-10:1-grid-hcube.pdf and b/loba-besteffort/data/graphs/R1-10:1-grid-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/R1-10:1-grid-line.pdf b/loba-besteffort/data/graphs/R1-10:1-grid-line.pdf index 1ef3445..2169a3f 100644 Binary files a/loba-besteffort/data/graphs/R1-10:1-grid-line.pdf and b/loba-besteffort/data/graphs/R1-10:1-grid-line.pdf differ diff --git a/loba-besteffort/data/graphs/R1-10:1-grid-torus.pdf b/loba-besteffort/data/graphs/R1-10:1-grid-torus.pdf index 2e142a0..44a5376 100644 Binary files a/loba-besteffort/data/graphs/R1-10:1-grid-torus.pdf and b/loba-besteffort/data/graphs/R1-10:1-grid-torus.pdf differ diff --git a/loba-besteffort/data/graphs/R1-1:1-cluster-hcube.pdf b/loba-besteffort/data/graphs/R1-1:1-cluster-hcube.pdf index 8b3fb3a..be9c3ea 100644 Binary files a/loba-besteffort/data/graphs/R1-1:1-cluster-hcube.pdf and b/loba-besteffort/data/graphs/R1-1:1-cluster-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/R1-1:1-cluster-line.pdf b/loba-besteffort/data/graphs/R1-1:1-cluster-line.pdf index 9c11cf3..bba28dd 100644 Binary files a/loba-besteffort/data/graphs/R1-1:1-cluster-line.pdf and b/loba-besteffort/data/graphs/R1-1:1-cluster-line.pdf differ diff --git a/loba-besteffort/data/graphs/R1-1:1-cluster-torus.pdf b/loba-besteffort/data/graphs/R1-1:1-cluster-torus.pdf index a85fecb..0d6f319 100644 Binary files a/loba-besteffort/data/graphs/R1-1:1-cluster-torus.pdf and b/loba-besteffort/data/graphs/R1-1:1-cluster-torus.pdf differ diff --git a/loba-besteffort/data/graphs/R1-1:1-grid-hcube.pdf b/loba-besteffort/data/graphs/R1-1:1-grid-hcube.pdf index 35729eb..3706e9d 100644 Binary files a/loba-besteffort/data/graphs/R1-1:1-grid-hcube.pdf and b/loba-besteffort/data/graphs/R1-1:1-grid-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/R1-1:1-grid-line.pdf b/loba-besteffort/data/graphs/R1-1:1-grid-line.pdf index 0d9beca..0f77b40 100644 Binary files a/loba-besteffort/data/graphs/R1-1:1-grid-line.pdf and b/loba-besteffort/data/graphs/R1-1:1-grid-line.pdf differ diff --git a/loba-besteffort/data/graphs/R1-1:1-grid-torus.pdf b/loba-besteffort/data/graphs/R1-1:1-grid-torus.pdf index 400f6fe..ad75fbf 100644 Binary files a/loba-besteffort/data/graphs/R1-1:1-grid-torus.pdf and b/loba-besteffort/data/graphs/R1-1:1-grid-torus.pdf differ diff --git a/loba-besteffort/data/graphs/R1-1:10-cluster-hcube.pdf b/loba-besteffort/data/graphs/R1-1:10-cluster-hcube.pdf index 3169a26..2e77cc2 100644 Binary files a/loba-besteffort/data/graphs/R1-1:10-cluster-hcube.pdf and b/loba-besteffort/data/graphs/R1-1:10-cluster-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/R1-1:10-cluster-line.pdf b/loba-besteffort/data/graphs/R1-1:10-cluster-line.pdf index e6cbf31..0fb1ba4 100644 Binary files a/loba-besteffort/data/graphs/R1-1:10-cluster-line.pdf and b/loba-besteffort/data/graphs/R1-1:10-cluster-line.pdf differ diff --git a/loba-besteffort/data/graphs/R1-1:10-cluster-torus.pdf b/loba-besteffort/data/graphs/R1-1:10-cluster-torus.pdf index b35afe6..4d0392a 100644 Binary files a/loba-besteffort/data/graphs/R1-1:10-cluster-torus.pdf and b/loba-besteffort/data/graphs/R1-1:10-cluster-torus.pdf differ diff --git a/loba-besteffort/data/graphs/R1-1:10-grid-hcube.pdf b/loba-besteffort/data/graphs/R1-1:10-grid-hcube.pdf index 704e03c..897f27e 100644 Binary files a/loba-besteffort/data/graphs/R1-1:10-grid-hcube.pdf and b/loba-besteffort/data/graphs/R1-1:10-grid-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/R1-1:10-grid-line.pdf b/loba-besteffort/data/graphs/R1-1:10-grid-line.pdf index 15a4761..9a4d716 100644 Binary files a/loba-besteffort/data/graphs/R1-1:10-grid-line.pdf and b/loba-besteffort/data/graphs/R1-1:10-grid-line.pdf differ diff --git a/loba-besteffort/data/graphs/R1-1:10-grid-torus.pdf b/loba-besteffort/data/graphs/R1-1:10-grid-torus.pdf index b5f51f5..b3bed07 100644 Binary files a/loba-besteffort/data/graphs/R1-1:10-grid-torus.pdf and b/loba-besteffort/data/graphs/R1-1:10-grid-torus.pdf differ diff --git a/loba-besteffort/data/graphs/RN-10:1-cluster-hcube.pdf b/loba-besteffort/data/graphs/RN-10:1-cluster-hcube.pdf index 12dc245..fe19389 100644 Binary files a/loba-besteffort/data/graphs/RN-10:1-cluster-hcube.pdf and b/loba-besteffort/data/graphs/RN-10:1-cluster-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/RN-10:1-cluster-line.pdf b/loba-besteffort/data/graphs/RN-10:1-cluster-line.pdf index aa5b5b6..8496c47 100644 Binary files a/loba-besteffort/data/graphs/RN-10:1-cluster-line.pdf and b/loba-besteffort/data/graphs/RN-10:1-cluster-line.pdf differ diff --git a/loba-besteffort/data/graphs/RN-10:1-cluster-torus.pdf b/loba-besteffort/data/graphs/RN-10:1-cluster-torus.pdf index 4a6dead..6aef123 100644 Binary files a/loba-besteffort/data/graphs/RN-10:1-cluster-torus.pdf and b/loba-besteffort/data/graphs/RN-10:1-cluster-torus.pdf differ diff --git a/loba-besteffort/data/graphs/RN-10:1-grid-hcube.pdf b/loba-besteffort/data/graphs/RN-10:1-grid-hcube.pdf index 47b7072..1764383 100644 Binary files a/loba-besteffort/data/graphs/RN-10:1-grid-hcube.pdf and b/loba-besteffort/data/graphs/RN-10:1-grid-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/RN-10:1-grid-line.pdf b/loba-besteffort/data/graphs/RN-10:1-grid-line.pdf index e6b12c6..2357a3a 100644 Binary files a/loba-besteffort/data/graphs/RN-10:1-grid-line.pdf and b/loba-besteffort/data/graphs/RN-10:1-grid-line.pdf differ diff --git a/loba-besteffort/data/graphs/RN-10:1-grid-torus.pdf b/loba-besteffort/data/graphs/RN-10:1-grid-torus.pdf index 07fd86f..332a8f7 100644 Binary files a/loba-besteffort/data/graphs/RN-10:1-grid-torus.pdf and b/loba-besteffort/data/graphs/RN-10:1-grid-torus.pdf differ diff --git a/loba-besteffort/data/graphs/RN-1:1-cluster-hcube.pdf b/loba-besteffort/data/graphs/RN-1:1-cluster-hcube.pdf index c74e76b..e0bc7b1 100644 Binary files a/loba-besteffort/data/graphs/RN-1:1-cluster-hcube.pdf and b/loba-besteffort/data/graphs/RN-1:1-cluster-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/RN-1:1-cluster-line.pdf b/loba-besteffort/data/graphs/RN-1:1-cluster-line.pdf index cad4d04..ae60b63 100644 Binary files a/loba-besteffort/data/graphs/RN-1:1-cluster-line.pdf and b/loba-besteffort/data/graphs/RN-1:1-cluster-line.pdf differ diff --git a/loba-besteffort/data/graphs/RN-1:1-cluster-torus.pdf b/loba-besteffort/data/graphs/RN-1:1-cluster-torus.pdf index 8fec33a..50d7e55 100644 Binary files a/loba-besteffort/data/graphs/RN-1:1-cluster-torus.pdf and b/loba-besteffort/data/graphs/RN-1:1-cluster-torus.pdf differ diff --git a/loba-besteffort/data/graphs/RN-1:1-grid-hcube.pdf b/loba-besteffort/data/graphs/RN-1:1-grid-hcube.pdf index a351584..291624c 100644 Binary files a/loba-besteffort/data/graphs/RN-1:1-grid-hcube.pdf and b/loba-besteffort/data/graphs/RN-1:1-grid-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/RN-1:1-grid-line.pdf b/loba-besteffort/data/graphs/RN-1:1-grid-line.pdf index 5c7d3f8..2860553 100644 Binary files a/loba-besteffort/data/graphs/RN-1:1-grid-line.pdf and b/loba-besteffort/data/graphs/RN-1:1-grid-line.pdf differ diff --git a/loba-besteffort/data/graphs/RN-1:1-grid-torus.pdf b/loba-besteffort/data/graphs/RN-1:1-grid-torus.pdf index d7e1703..b4584f3 100644 Binary files a/loba-besteffort/data/graphs/RN-1:1-grid-torus.pdf and b/loba-besteffort/data/graphs/RN-1:1-grid-torus.pdf differ diff --git a/loba-besteffort/data/graphs/RN-1:10-cluster-hcube.pdf b/loba-besteffort/data/graphs/RN-1:10-cluster-hcube.pdf index 8710893..4182d15 100644 Binary files a/loba-besteffort/data/graphs/RN-1:10-cluster-hcube.pdf and b/loba-besteffort/data/graphs/RN-1:10-cluster-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/RN-1:10-cluster-line.pdf b/loba-besteffort/data/graphs/RN-1:10-cluster-line.pdf index edd8a8d..978f71c 100644 Binary files a/loba-besteffort/data/graphs/RN-1:10-cluster-line.pdf and b/loba-besteffort/data/graphs/RN-1:10-cluster-line.pdf differ diff --git a/loba-besteffort/data/graphs/RN-1:10-cluster-torus.pdf b/loba-besteffort/data/graphs/RN-1:10-cluster-torus.pdf index 61c4f30..65f8e49 100644 Binary files a/loba-besteffort/data/graphs/RN-1:10-cluster-torus.pdf and b/loba-besteffort/data/graphs/RN-1:10-cluster-torus.pdf differ diff --git a/loba-besteffort/data/graphs/RN-1:10-grid-hcube.pdf b/loba-besteffort/data/graphs/RN-1:10-grid-hcube.pdf index f69af97..b0d80e9 100644 Binary files a/loba-besteffort/data/graphs/RN-1:10-grid-hcube.pdf and b/loba-besteffort/data/graphs/RN-1:10-grid-hcube.pdf differ diff --git a/loba-besteffort/data/graphs/RN-1:10-grid-line.pdf b/loba-besteffort/data/graphs/RN-1:10-grid-line.pdf index 0060bf3..a730dfa 100644 Binary files a/loba-besteffort/data/graphs/RN-1:10-grid-line.pdf and b/loba-besteffort/data/graphs/RN-1:10-grid-line.pdf differ diff --git a/loba-besteffort/data/graphs/RN-1:10-grid-torus.pdf b/loba-besteffort/data/graphs/RN-1:10-grid-torus.pdf index f40f73c..2e18738 100644 Binary files a/loba-besteffort/data/graphs/RN-1:10-grid-torus.pdf and b/loba-besteffort/data/graphs/RN-1:10-grid-torus.pdf differ diff --git a/loba-besteffort/data/script.r b/loba-besteffort/data/script.r index 68d78a9..a4f7e3b 100644 --- a/loba-besteffort/data/script.r +++ b/loba-besteffort/data/script.r @@ -126,7 +126,16 @@ draw2 <- function(dset = ds, idvar="Algo", timevar="Size") ## rename rows - rownames(dset.wide) <- sub("bookkeeping", "virtual", dset.wide$Algo) + names <- dset.wide$Algo + names <- sub("makhoul_plain", "a: makhoul,plain", names) + names <- sub("besteffort_plain", "b: best effort,plain", names) + names <- sub("besteffort-k2_plain", "c: best effort,k=2,plain", names) + names <- sub("besteffort-k4_plain", "d: best effort,k=4,plain", names) + names <- sub("makhoul_bookkeeping", "e: makhoul,virtual", names) + names <- sub("besteffort_bookkeeping", "f: best effort,virtual", names) + names <- sub("besteffort-k2_bookkeeping", "g: best effort,k=2,virtual", names) + names <- sub("besteffort-k4_bookkeeping", "h: best effort,k=4,virtual", names) + rownames(dset.wide) <- names #colnames(dset.wide) <- sub("^[^.]*\\.", "", colnames(dset.wide)) ## remove first column (aka "Algo") @@ -135,7 +144,8 @@ draw2 <- function(dset = ds, dset.plot <- dset.mat[, c(FALSE,FALSE,TRUE)] barplot(dset.plot, beside=TRUE, - names.arg=sub("^[^.]*\\.", "", colnames(dset.plot)), + axisnames=FALSE, +# names.arg=sub("^[^.]*\\.", "", colnames(dset.plot)), col=gray.colors(nc) # col=rainbow(nc, s=.5) ) @@ -144,7 +154,7 @@ draw2 <- function(dset = ds, barplot(dset.plot, beside=TRUE, axes=FALSE, axisnames=FALSE, add=TRUE, legend.text=TRUE, - args.legend=list(x="topleft", inset=c(.02,0), title="Algorithms"), + args.legend=list(x="topleft", inset=c(.02,0), x.intersp=0.5, title="Algorithms"), col=gray.colors(nc) # col=rainbow(nc) ) @@ -153,10 +163,22 @@ draw2 <- function(dset = ds, barplot(dset.plot, beside=TRUE, axes=FALSE, axisnames=FALSE, add=TRUE, col="white" +# col=gray.colors(nc) # col=rainbow(nc, v=.5) ) ## finally, set titles + c <- ncol(dset.plot) - 1 + for (l in 0:7) { + t <- intToUtf8(utf8ToInt("a") + l) + for (a in 1.5 + l + 9 * 0:c) + mtext(t, side=1, at=a) + } + a=5 + for (s in sub("^[^.]*\\.", "", colnames(dset.plot))) { + mtext(s, side=1, line=1.5, at=a) + a <- a + 9 + } t <- paste0(dset$Mode[1], dset$Distrib[1], " / ", dset$Ratio[1], " / ", dset$Platform[1], " / ", dset$Topo[1]) @@ -166,53 +188,60 @@ draw2 <- function(dset = ds, } -msg <- function(text, - wait = TRUE) { - if (wait) - readline("Press to continue\n") - message(text) -} - if (FALSE) { -msg("First test, with algorithms \"plain\"...", wait = FALSE); -draw(subset(ds, grepl("[lt]_plain", Algo)), draw_distrib="N") -msg("... with draw2()...") -draw2(subset(ds, grepl("[lt]_plain", Algo)), draw_distrib="N") + if (TRUE) { + draw2(draw_distrib="1") + draw2(draw_distrib="N") + } else { + msg <- function(text, wait = TRUE) { + if (wait) + readline("Press to continue\n") + message(text) + } -msg("Second test, with algorithms \"bookkeeping\"..."); -draw(subset(ds, grepl("[lt]_bookkeeping", Algo)), draw_distrib="N") + msg("First test, with algorithms \"plain\"...", wait = FALSE); + draw(subset(ds, grepl("[lt]_plain", Algo)), draw_distrib="N") -msg("... with draw2()...") -draw2(subset(ds, grepl("[lt]_bookkeeping", Algo)), draw_distrib="N") + msg("... with draw2()...") + draw2(subset(ds, grepl("[lt]_plain", Algo)), draw_distrib="N") -msg("Third test, with all algorithms..."); -draw(draw_distrib="N") + msg("Second test, with algorithms \"bookkeeping\"..."); + draw(subset(ds, grepl("[lt]_bookkeeping", Algo)), draw_distrib="N") -msg("... with draw2()...") -draw2(draw_distrib="N") -} + msg("... with draw2()...") + draw2(subset(ds, grepl("[lt]_bookkeeping", Algo)), draw_distrib="N") -pdf.options(colormodel="grey") -system("mkdir -pv graphs") -for (m in c("R", "I")) { - for (d in c("1", "N")) { - for (r in c("10:1", "1:1", "1:10")) { - for (t in c("line", "torus", "hcube")) { - for (p in c("grid", "cluster")) { - message(sprintf(">>> Drawing: %s%s / %s / %s / %s", m, d, r, p, t)) + msg("Third test, with all algorithms..."); + draw(draw_distrib="N") + + msg("... with draw2()...") + draw2(draw_distrib="N") + } + +} else { + + pdf.options(colormodel="grey") + system("mkdir -pv graphs") + for (m in c("R", "I")) { + for (d in c("1", "N")) { + for (r in c("10:1", "1:1", "1:10")) { + for (t in c("line", "torus", "hcube")) { + for (p in c("grid", "cluster")) { + message(sprintf(">>> Drawing: %s%s / %s / %s / %s", m, d, r, p, t)) filename <- sprintf("graphs/%s%s-%s-%s-%s.pdf", m, d, r, p, t) - pdf(file=filename) - draw2(#subset(ds, grepl("[lt]_plain", Algo)), - draw_mode=m, draw_distrib=d, draw_ratio=r, - draw_topo=t, draw_platform=p) - dev.off() - embedFonts(file=filename, options="-dPDFSETTINGS=/prepress") + pdf(file=filename) + draw2(#subset(ds, grepl("[lt]_plain", Algo)), + draw_mode=m, draw_distrib=d, draw_ratio=r, + draw_topo=t, draw_platform=p) + dev.off() + embedFonts(file=filename, options="-dPDFSETTINGS=/prepress") + } } } } } -} -## restore default options -options(scipen=osp) + ## restore default options + options(scipen=osp) +}