Commit ef71cc25 authored by erwan's avatar erwan
Browse files

Add the diameter in the dot graphs so that its computation do not alter the measurements

parent c6507c7d
Pipeline #65152 failed with stages
in 2 minutes and 11 seconds
......@@ -76,7 +76,8 @@ pages:
- apt-get install tree
script:
- mkdir .public
- cp -rf expe/results .public/
- cp -rf expe/results_expe-current .public/
- cp -rf expe/results_expe-docker .public/
- cp -rf coloring-campaign/sasa/tools/simca/ .public/
- cd .public
- tree -h -H '.' -L 2 --noreport --charset utf-8 --prune ; ls -R
......
graph bigER {
graph [min_deg=56 mean_deg=76.6484375 max_deg=101 is_connected=true is_cyclic=true is_tree=true links_number=9811]
graph [min_deg=56 mean_deg=76.6484375 max_deg=101 is_connected=true is_cyclic=true links_number=9811 diameter=2]
p0 [algo=""]
p1 [algo=""]
p2 [algo=""]
......
......@@ -14,24 +14,21 @@ TEST_DIRS=async-unison bfs-spanning-tree coloring dfs dfs-list unison alea-color
########################################################################
# Generate some graphs
grid4.dot:
gg grid -w 4 -he 4 -o $@
gg grid --diameter -w 4 -he 4 -o $@
grid.dot:
gg grid -w 10 -he 10 -o $@
gg grid --diameter -w 10 -he 10 -o $@
biggrid.dot:
gg grid -w 100 -he 100 -o $@
gg grid --diameter -w 100 -he 100 -o $@
ER.dot:
gg ER -p 0.3 -n 10 -o $@
gg ER --diameter -p 0.3 -n 10 -o $@
bigER.dot:
gg ER -p 0.1 -n 256 -o $@
hugeER.dot:
gg ER -p 0.05 -n 2000 -o $@
gg ER --diameter -p 0.05 -n 2000 -o $@
......
graph hugeER {
graph [min_deg=534 mean_deg=600.253 max_deg=671 is_connected=true is_cyclic=true is_tree=true links_number=600253]
graph [min_deg=534 mean_deg=600.253 max_deg=671 is_connected=true is_cyclic=true links_number=600253 diameter=2]
p0 [algo=""]
p1 [algo=""]
p2 [algo=""]
graph biggrid {
graph [min_deg=2 mean_deg=3.96 max_deg=4 is_connected=true is_cyclic=true is_tree=true links_number=19800]
graph [min_deg=2 mean_deg=3.96 max_deg=4 is_connected=true is_cyclic=true links_number=19800 diameter=198]
p0 [algo=""]
p1 [algo=""]
p2 [algo=""]
......
graph grid {
graph [min_deg=2 mean_deg=3.6 max_deg=4 is_connected=true is_cyclic=true is_tree=true links_number=180]
graph [min_deg=2 mean_deg=3.6 max_deg=4 is_connected=true is_cyclic=true is_tree=false links_number=180 diameter=18]
p0 [algo=""]
p1 [algo=""]
p2 [algo=""]
......@@ -101,6 +101,7 @@ graph [min_deg=2 mean_deg=3.6 max_deg=4 is_connected=true is_cyclic=true is_tree
p98 [algo=""]
p99 [algo=""]
p0 -- p1
p0 -- p10
p1 -- p11
......
(* Time-stamp: <modified the 05/03/2020 (at 21:38) by Erwan Jahier> *)
(* Time-stamp: <modified the 21/04/2021 (at 13:40) by Erwan Jahier> *)
open Algo
(* let m=10 (* max 2 (1+2*diameter ()) *) *)
let diameter = Algo.diameter ()
let diameter =
try int_of_string (Algo.get_graph_attribute "diameter")
with _ -> diameter()
let m = max 2 (1+2*diameter)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment