X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba-papers.git/blobdiff_plain/50178272468b88cae817c0950ad973d3b8dbca74..HEAD:/loba-besteffort/data/script.r?ds=inline

diff --git a/loba-besteffort/data/script.r b/loba-besteffort/data/script.r
index 8022f4b..20898f9 100644
--- a/loba-besteffort/data/script.r
+++ b/loba-besteffort/data/script.r
@@ -88,7 +88,8 @@ draw <- function(dset = ds,
   ## finally, set title
   t <- paste0(dset$Mode[1], dset$Distrib[1], " / ",
               dset$Ratio[1], " / ",
-              dset$Platform[1], " / ", dset$Topo[1])
+              dset$Platform[1], " / ",
+              dset$Topo[1])
   title(main=t)
 
   ## restore the graphical parameters
@@ -106,6 +107,7 @@ draw2 <- function(dset = ds,
 
   ## extract desired data
   dset <- subset(dset,
+                 Algo != "makhoul_bookkeeping" & #HIDE#
                  Mode == draw_mode & Distrib == draw_distrib &
                  Ratio == draw_ratio &
                  Platform == draw_platform & Topo == draw_topo)
@@ -127,14 +129,18 @@ draw2 <- function(dset = ds,
 
   ## rename rows
   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)
+#HIDE#  names <- sub("makhoul_plain",             "a: Bertsekas and Tsitsiklis, plain", names)
+  names <- sub("makhoul_plain",             "a: Bertsekas and Tsitsiklis", 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)
+#HIDE#  names <- sub("makhoul_bookkeeping",       "e: Bertsekas and Tsitsiklis, virtual", names)
+#HIDE#  names <- sub("besteffort_bookkeeping",    "f: best effort, virtual", names)
+#HIDE#  names <- sub("besteffort-k2_bookkeeping", "g: best effort, k=2, virtual", names)
+#HIDE#  names <- sub("besteffort-k4_bookkeeping", "h: best effort, k=4, virtual", names)
+  names <- sub("besteffort_bookkeeping",    "e: best effort, virtual", names)
+  names <- sub("besteffort-k2_bookkeeping", "f: best effort, k=2, virtual", names)
+  names <- sub("besteffort-k4_bookkeeping", "g: best effort, k=4, virtual", names)
   rownames(dset.wide) <- names
   #colnames(dset.wide) <- sub("^[^.]*\\.", "", colnames(dset.wide))
 
@@ -169,19 +175,22 @@ draw2 <- function(dset = ds,
 
   ## finally, set titles
   c <- ncol(dset.plot) - 1
-  for (l in 0:7) {
+  for (l in 0:6) {
     t <- intToUtf8(utf8ToInt("a") + l)
-    for (a in 1.5 + l + 9 * 0:c)
+    for (a in 1.5 + l + 8 * 0:c)
       mtext(t, side=1, at=a)
   }
-  a=5
+  a=4.5
   for (s in sub("^[^.]*\\.", "", colnames(dset.plot))) {
     mtext(s, side=1, line=1.5, at=a)
-    a <- a + 9
+    a <- a + 8
   }
-  t <- paste0(dset$Mode[1], dset$Distrib[1], " / ",
+  t <- paste0(
+#HIDE#              dset$Mode[1],
+#HIDE#              dset$Distrib[1], " / ",
               dset$Ratio[1], " / ",
-              dset$Platform[1], " / ", dset$Topo[1])
+#HIDE#              dset$Platform[1], " / ",
+              dset$Topo[1])
   t <- sub("hcube", "hypercube", t)
   title(xlab="Platform size",
         ylab="Simulated time (s)",