Chore: minor changes in simca generated pdf

tools/simca/Makefile

@@ -19,3 +19,4 @@ clean:
 	rm -rf *.log *.data *.pdf Makefile.expe-rules *~ *.png cmxs_done
 
 
+.PRECIOUS: .sh

tools/simca/genExpeMakefiles.ml

@@ -38,7 +38,7 @@ type graph =
    gen_makefile, but their values ought to be always the same (this is
    arguable).  *)
 let precision = ref 0.01
-    (* 0.01 here  means that we simulate until  the Interval Confidence
+    (* 0.01 here  means that we simulate until the  Confidence Interval
        size of  the 3 complexity  numbers under estimation  is smaller
        than 1% of their current estimation.
     *)

tools/simca/gen_pdf.r

@@ -36,10 +36,12 @@ gen_pdf <- function(pdffilename, x1, x2){
         facet_grid(c(paste("complexity_kind"), paste(x2)) , scales='free') +
         ylab("Move/Step/Round Numbers")+xlab(paste(abscissa,"Number"))+
         ggtitle(paste("Compare", x1, "on various", x2, "Numbers on",
-                      stringr::str_to_title(graphname), sep = " "))
+                      stringr::str_to_title(graphname), sep = " "))+
+         theme(legend.position="bottom")
     mplot2 <- mplot+geom_ribbon(aes_string(x="n", ymax="max", ymin="min"), alpha=0.2) +
         ggtitle(paste("Compare", x1, "on various", x2, "Numbers on",
-                      stringr::str_to_title(graphname), "(+ min/max ribbon)", sep = " "))
+                      stringr::str_to_title(graphname), "(+ min/max ribbon)", sep = " "))+
+         theme(legend.position="bottom")
     print(mplot)
     print(mplot2)
         
@@ -50,24 +52,28 @@ gen_pdf <- function(pdffilename, x1, x2){
             facet_grid(c(paste(x2)), scales='free') +
             ylab(paste(cm, "Number", sep=" ")) + xlab(paste(abscissa,"Number"))+
             ggtitle(paste(stringr::str_to_title(cm), "Numbers on",
-                          stringr::str_to_title(graphname), sep = " "))
+                          stringr::str_to_title(graphname), sep = " "))+
+         theme(legend.position="bottom")
         plot1 <- plot + geom_point() 
         plot2 <- plot+geom_ribbon(aes_string(x="n", ymax="max", ymin="min"), alpha=0.2)+
             ggtitle(paste(stringr::str_to_title(cm), "Numbers on",
                           stringr::str_to_title(graphname),
-                          "(+ min/max ribbon)", sep = " "))
+                          "(+ min/max ribbon)", sep = " "))+
+         theme(legend.position="bottom")
         print(plot1)
         print(plot2)
         
         plot <- ggplot(datax,aes_string(x="n",y="mean",colour=x1,shape=x2))+ geom_line() +
             ylab(paste(cm, "Number", sep=" ")) + xlab(paste(abscissa,"Number"))+
             ggtitle(paste(stringr::str_to_title(cm), "Numbers on",
-                          stringr::str_to_title(graphname), sep = " "))
+                          stringr::str_to_title(graphname), sep = " "))+
+         theme(legend.position="bottom")
         plot1 <- plot + geom_point() 
         plot2 <- plot+geom_ribbon(aes_string(x="n", ymax="max", ymin="min"), alpha=0.2)+
             ggtitle(paste(stringr::str_to_title(cm), "Numbers on",
                           stringr::str_to_title(graphname),
-                          "(+ min/max ribbon)", sep = " "))
+                          "(+ min/max ribbon)", sep = " "))+
+         theme(legend.position="bottom")
         print(plot1)
         print(plot2)
     }

tools/simca/nonreg_test_campaign.ml

 #use "genExpeMakefiles.ml";;
 precision := 0.1;;
-(* 0.1  means that we simulate  until the Interval Confidence  size of
+(* 0.1  means that we simulate until the  onfidence Interval  size of
    the 3  complexity numbers under  estimation is smaller than  10% of
    their current estimation.
 
@@ -35,9 +35,10 @@ open Printf
 let gen_pdf () =
   let gl = ["clique"; "ring"; "er"] in
   List.iter (fun n -> sh ("rm -f "^n^".data")) gl; (* because parse_log appends data *) 
-  parse_log ["Uniform When Triggered", "alea-coloring-unif"] gl daemons;
-  parse_log ["Smallest When Triggered","alea-coloring"] gl daemons;
+  parse_log ["Uniform When Activated", "alea-coloring-unif"] gl daemons;
+  parse_log ["Smallest When Activated","alea-coloring"] gl daemons;
   parse_log ["Always the Biggest", "alea-coloring-alt"] gl daemons;
   List.iter (fun n -> sh ("./gen_pdf.r "^n^".data nonreg")) gl;
   ()
 ;;
+