diff --git a/tools/gg/graphGen.ml b/tools/gg/graphGen.ml index 0b8c97f278dd67068b88bf0066dfbb540ff45d93..39421ba00ca987338a859ed76fee4360f98e8e09 100644 --- a/tools/gg/graphGen.ml +++ b/tools/gg/graphGen.ml @@ -23,6 +23,7 @@ let generate_du_dur graph plan_udg t : unit = ) (* Deadcode: + let compute_attr : (Topology.t -> string list -> (string * string) list) = fun g -> List.map diff --git a/tools/simca/coloring_campaign.ml b/tools/simca/coloring_campaign.ml index f475018495c06cf26ae6854b0c20517187496e46..c46381557b4384a630fb369d9b91b0929ae033fa 100644 --- a/tools/simca/coloring_campaign.ml +++ b/tools/simca/coloring_campaign.ml @@ -1,6 +1,6 @@ #use "genExpeMakefiles.ml";; precision := 0.01;; - (* 0.01 means that we simulate until the Interval Confidence + (* 0.01 means that we simulate until the Confidence Interval size of the 3 complexity numbers under estimation is smaller than 1% of their current estimation. *) @@ -8,9 +8,12 @@ let algos = ["../../test/alea-coloring-alt"; "../../test/alea-coloring-unif"; "../../test/alea-coloring"] let daemons = ["-sd";"-lcd";"-dd"] -let cliques = List.init 25 (fun n -> Clique (20*(n+1))) (* [20; 40; ...; 500] *) -let rings = List.init 25 (fun n -> Ring (400*(n+1))) (* [100; 500; ...; 10000] *) -let er = List.init 25 (fun n -> ER (10*(n+1), 0.4)) (* [10; 20; ...; 2500] *) +(* let cliques = List.init 25 (fun n -> Clique (20*(n+1))) (* [20; 40; ...; 500] *) *) +(* let rings = List.init 25 (fun n -> Ring (400*(n+1))) (* [400; 800; ...; 10000] *) *) +(* let er = List.init 25 (fun n -> ER (10*(n+1), 0.4)) (* [10; 20; ...; 250] *) *) +let rings = List.init 10 (fun n -> Ring (500*(n+1))) (* [500; 1000; ...; 5000] *) +let cliques = List.init 10 (fun n -> Clique (30*(n+1))) (* [30; 60; ...; 300] *) +let er = List.init 10 (fun n -> ER (30*(n+1), 0.4)) (* [30; 60; ...; 300] *) let gen_make_rules () = let fn = "Makefile.expe-rules" in @@ -31,10 +34,10 @@ let gen_make_rules () = let gen_pdf () = let gl = ["clique"; "ring"; "er"] in List.iter (fun n -> sh ("rm -f "^n^".data")) gl; - 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 coloring")) gl; + List.iter (fun n -> sh ("./gen_pdf_paper.r "^n^".data coloring")) gl; () ;;