Graphs: rename makhoul -> Bertsekas and Tsitsiklis.

[loba-papers.git] / loba-besteffort / data / script.r

diff --git a/loba-besteffort/data/script.r b/loba-besteffort/data/script.r
index 8022f4bca6c1c4e9db9f9735bc5d92eef8d83cd7..f40d6a12af1f5b1d7efa6cddd0d3090784c925d1 100644 (file)
--- 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], " / ",
   ## 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
   title(main=t)
 
   ## restore the graphical parameters


@@ -127,14 +128,14 @@ draw2 <- function(dset = ds,
 
   ## rename rows
   names <- dset.wide$Algo
 
   ## 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)
+  names <- sub("makhoul_plain",             "a: Bertsekas and Tsitsiklis, 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: Bertsekas and Tsitsiklis, 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))
 
   rownames(dset.wide) <- names
   #colnames(dset.wide) <- sub("^[^.]*\\.", "", colnames(dset.wide))
 


@@ -179,9 +180,12 @@ draw2 <- function(dset = ds,
     mtext(s, side=1, line=1.5, at=a)
     a <- a + 9
   }
     mtext(s, side=1, line=1.5, at=a)
     a <- a + 9
   }

-  t <- paste0(dset$Mode[1], dset$Distrib[1], " / ",
+  t <- paste0(
+#HIDE#              dset$Mode[1],
+#HIDE#              dset$Distrib[1], " / ",

               dset$Ratio[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)",
   t <- sub("hcube", "hypercube", t)
   title(xlab="Platform size",
         ylab="Simulated time (s)",