Fix the coloring job that was actually broken

coloring-campaign/coloring_campaign.ml

@@ -7,24 +7,14 @@ precision := 0.1;;
 let algos = ["../../test/alea-coloring-alt";
              "../../test/alea-coloring-unif";
              "../../test/alea-coloring"]
-let daemons = ["-sd";"-lcd";"-dd"]  
 let daemons = ["-sd"; "-lcd"; "-dd"] 
 let cliques = List.init 10 (fun n -> Clique (30*(n+1))) (* Cliques of size 30, 60, ..., 300 *)
 let er = List.init 10 (fun n -> ER (30*(n+1), 0.4))     (* ER of size 30, 60, ..., 300 *)
 let rings = List.init 10 (fun n -> Ring (500*(n+1)))    (* Rings of size 500, 1000, ..., 5000 *)
-    
-let gen_make_rules () = 
-  let fn = "Makefile.expe-rules" in
-  let oc = open_out fn in
-  Printf.fprintf oc "# Generated by coloring_campaign.ml";
-  let compare_neg x y = compare y x in
-  let l = List.sort_uniq compare_neg (cliques @ rings @ er) in 
-  let targets,targets_cmxs = gen_makefile oc daemons algos l [] [] in
-  Printf.fprintf oc "\nCMXS=%s\n"  (String.concat " " targets_cmxs);
-  Printf.fprintf oc "\nLOG=%s\n%!" (String.concat " " targets);
-  Printf.printf "%s has been generated\n%!" fn;
-  close_out oc
-;;
+let networks = (cliques@rings@er)
+
+let gen_make_rules () = gen_makefile "Makefile.expe-rules" daemons algos networks;;
+
 #use "parseLog.ml";;
 let gen_pdf () =
   let gl = ["clique"; "ring"; "er"] in 

expe/Makefile

@@ -50,8 +50,9 @@ BIGLOG=$(BIGDOT:%.dot=%.log)
 # nb: It performs |DOT|x|TEST_DIRS| experiments
 EXPE=$(TEST_DIRS:%=%.expe)
 BIGEXPE=$(TEST_DIRS:%=%.bigexpe)
-expe: $(EXPE) ring1000.log
-bigexpe: $(BIGEXPE) ring10000.log
+expe: $(EXPE)
+bigexpe: $(BIGEXPE)
+ring: ring1000.log ring10000.log
 
 %.expe: $(DOT)
 	touch $@