Commit 4355f13c authored by Leo Gordon's avatar Leo Gordon
Browse files

Ensuring deterministic order of clusters in the dot output

parent b17476a0
......@@ -138,7 +138,7 @@ sub display_subgraph {
}
} # otherwise just draw a black frame around the subgraph
foreach my $node_name ( @{ $self->cluster_2_nodes->{ $cluster_name } || [] } ) {
foreach my $node_name ( sort @{ $self->cluster_2_nodes->{ $cluster_name } || [] } ) {
if( @{ $self->cluster_2_nodes->{ $node_name } || [] } ) {
$text .= $self->display_subgraph( $node_name, $depth+1 );
......
......@@ -21,8 +21,8 @@ subgraph cluster_gcpct {
style="bold,filled";
colorscheme=pastel19;
fillcolor=3;
analysis_calc_overall_percentage;
analysis_chunk_sequences;
dfr_1_mp;
subgraph cluster_cl_dfr_1_mp {
label="";
style="filled";
......@@ -33,8 +33,8 @@ subgraph cluster_gcpct {
sink_dfr_1_mp;
sink_dfr_1_mp;
}
dfr_1_mp;
dfr_2_mp;
analysis_calc_overall_percentage;
table_final_result;
}
}
......@@ -21,8 +21,8 @@ subgraph cluster_gcpct {
style="bold,filled";
colorscheme=pastel19;
fillcolor=3;
analysis_calc_overall_percentage;
analysis_chunk_sequences;
dfr_p1_mp;
subgraph cluster_cl_dfr_p1_mp {
label="";
style="filled";
......@@ -33,8 +33,8 @@ subgraph cluster_gcpct {
sink_dfr_p1_mp;
sink_dfr_p1_mp;
}
dfr_p1_mp;
dfr_p2_mp;
analysis_calc_overall_percentage;
table_final_result;
}
}
......@@ -28,8 +28,8 @@ subgraph cluster_long_mult_client {
style="bold,filled";
colorscheme=pastel19;
fillcolor=3;
analysis_add_together;
analysis_take_b_apart;
dfr_1_mp;
subgraph cluster_cl_dfr_1_mp {
label="";
style="filled";
......@@ -39,8 +39,8 @@ subgraph cluster_long_mult_client {
analysis_part_multiply;
sink_dfr_1_mp;
}
dfr_1_mp;
dfr_2_mp;
analysis_add_together;
table_final_result;
}
subgraph cluster_long_mult_server {
......@@ -49,8 +49,8 @@ subgraph cluster_long_mult_server {
colorscheme=pastel19;
fillcolor=8;
foreign_analysis_ehive_test_server__add_together;
table_ehive_test_server__final_result;
foreign_analysis_ehive_test_server__part_multiply;
sink_long_mult_server;
table_ehive_test_server__final_result;
}
}
......@@ -28,8 +28,8 @@ subgraph cluster_long_mult_client {
style="bold,filled";
colorscheme=pastel19;
fillcolor=3;
analysis_add_together;
analysis_take_b_apart;
dfr_p1_mp;
subgraph cluster_cl_dfr_p1_mp {
label="";
style="filled";
......@@ -39,8 +39,8 @@ subgraph cluster_long_mult_client {
analysis_part_multiply;
sink_dfr_p1_mp;
}
dfr_p1_mp;
dfr_p2_mp;
analysis_add_together;
table_final_result;
}
subgraph cluster_long_mult_server {
......@@ -49,8 +49,8 @@ subgraph cluster_long_mult_server {
colorscheme=pastel19;
fillcolor=8;
foreign_analysis_ehive_test_server__add_together;
table_ehive_test_server__final_result;
foreign_analysis_ehive_test_server__part_multiply;
sink_long_mult_server;
table_ehive_test_server__final_result;
}
}
......@@ -18,11 +18,11 @@ subgraph cluster_long_mult_wf {
style="bold,filled";
colorscheme=pastel19;
fillcolor=3;
analysis_add_together;
analysis_part_multiply;
analysis_take_b_apart;
dfr_2_mp;
analysis_part_multiply;
table_intermediate_result;
analysis_add_together;
table_final_result;
table_intermediate_result;
}
}
......@@ -18,11 +18,11 @@ subgraph cluster_long_mult_wf {
style="bold,filled";
colorscheme=pastel19;
fillcolor=3;
analysis_add_together;
analysis_part_multiply;
analysis_take_b_apart;
dfr_p1_mp;
analysis_part_multiply;
table_intermediate_result;
analysis_add_together;
table_final_result;
table_intermediate_result;
}
}
......@@ -26,12 +26,9 @@ subgraph cluster_smart_long_mult {
style="bold,filled";
colorscheme=pastel19;
fillcolor=3;
analysis_add_together;
analysis_redirect_trivial_jobs;
dfr_1_mp;
table_final_result;
table_final_result;
analysis_take_b_apart;
dfr_2_mp;
subgraph cluster_cl_dfr_2_mp {
label="";
style="filled";
......@@ -41,8 +38,11 @@ subgraph cluster_smart_long_mult {
analysis_part_multiply;
sink_dfr_2_mp;
}
dfr_1_mp;
dfr_2_mp;
dfr_3_mp;
analysis_add_together;
table_final_result;
table_final_result;
table_final_result;
}
}
......@@ -26,12 +26,9 @@ subgraph cluster_smart_long_mult {
style="bold,filled";
colorscheme=pastel19;
fillcolor=3;
analysis_add_together;
analysis_redirect_trivial_jobs;
dfr_p1_mp;
table_final_result;
table_final_result;
analysis_take_b_apart;
dfr_p2_mp;
subgraph cluster_cl_dfr_p2_mp {
label="";
style="filled";
......@@ -41,8 +38,11 @@ subgraph cluster_smart_long_mult {
analysis_part_multiply;
sink_dfr_p2_mp;
}
dfr_p1_mp;
dfr_p2_mp;
dfr_p3_mp;
analysis_add_together;
table_final_result;
table_final_result;
table_final_result;
}
}
Markdown is supported
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