From 9225f321b99071561ac3e7dc8ddfbbf36bfb8148 Mon Sep 17 00:00:00 2001 From: Lukas Lazarek Date: Tue, 14 Jan 2025 16:34:34 +0200 Subject: [PATCH] Update syntax viz after Vagos's benchmark updates --- infrastructure/target/lines_of_code.csv | 2 +- infrastructure/target/nodes_in_scripts.csv | 2 +- infrastructure/target/scripts_to_benchmark.csv | 2 +- infrastructure/viz/syntax.py | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/infrastructure/target/lines_of_code.csv b/infrastructure/target/lines_of_code.csv index a2fbc704..b05561f2 100644 --- a/infrastructure/target/lines_of_code.csv +++ b/infrastructure/target/lines_of_code.csv @@ -1,4 +1,4 @@ -aurpkg/scripts/pacaur.sh,18 +aurpkg/scripts/pacaur.sh,20 bio/scripts/bio.sh,22 covid-mts/scripts/1.sh,9 covid-mts/scripts/2.sh,10 diff --git a/infrastructure/target/nodes_in_scripts.csv b/infrastructure/target/nodes_in_scripts.csv index 5fc2bf9d..0573f086 100644 --- a/infrastructure/target/nodes_in_scripts.csv +++ b/infrastructure/target/nodes_in_scripts.csv @@ -1,4 +1,4 @@ -aurpkg/scripts/pacaur.sh,assignment:4;quoted_control:11;variable_use:13;command(mkdir):1;command(cd):2;and_command:1;function_command:2;escaped_char:11;command(mkcd):1;command(curl):1;file_redirection:2;command(echo):2;or_command:1;command(makedeb):1;dup_redirection:1;command(export):1;dollar_paren_shell_control:1;command(cat):1;command(tr):1;pipeline:1;command(run_tests):1;for_command:1 +aurpkg/scripts/pacaur.sh,assignment:6;quoted_control:12;variable_use:15;command(mkdir):1;command(cd):2;and_command:1;function_command:2;escaped_char:12;command(mkcd):1;command(curl):1;file_redirection:3;command(echo):2;or_command:1;command(makedeb):1;dup_redirection:1;command(export):1;dollar_paren_shell_control:1;command(cat):1;command(tr):1;pipeline:1;dollar_paren_paren_arith_control:1;command(run_tests):1;for_command:1 bio/scripts/bio.sh,command(cd):1;quoted_control:29;dollar_paren_shell_control:4;command(dirname):1;variable_use:34;command(exit):1;or_command:1;assignment:6;command(cat):1;command(read):2;command(echo):6;command(cut):4;pipeline:6;command(samtools):5;escaped_char:23;command(sed):1;file_redirection:2;command(sort):1;command(uniq):1;while_command:2 covid-mts/scripts/1.sh,command(cat):1;quoted_control:5;variable_use:1;command(sed):1;escaped_char:7;command(cut):2;command(sort):2;command(uniq):1;command(awk):1;pipeline:1 covid-mts/scripts/2.sh,command(cat):1;quoted_control:5;variable_use:1;command(sed):1;escaped_char:7;command(cut):2;command(sort):3;command(uniq):1;command(awk):1;pipeline:1 diff --git a/infrastructure/target/scripts_to_benchmark.csv b/infrastructure/target/scripts_to_benchmark.csv index beaeea1b..9e3b822c 100644 --- a/infrastructure/target/scripts_to_benchmark.csv +++ b/infrastructure/target/scripts_to_benchmark.csv @@ -104,7 +104,7 @@ unix50/scripts/6.sh,unix50 unix50/scripts/7.sh,unix50 unix50/scripts/8.sh,unix50 unix50/scripts/9.sh,unix50 -vps-audit-negate/scripts/vps-audit-negate.sh,vps-audit-negate +vps-audit-negate/scripts/vps-audit-negate.sh,vps-audit vps-audit/scripts/vps-audit.sh,vps-audit web-index/scripts/bigrams_aux.sh,web-index web-index/scripts/extract_text.sh,web-index diff --git a/infrastructure/viz/syntax.py b/infrastructure/viz/syntax.py index 59b5b233..5555b145 100644 --- a/infrastructure/viz/syntax.py +++ b/infrastructure/viz/syntax.py @@ -124,12 +124,12 @@ def node_heatmap(df, outdir=None): annot_data = annot_data.loc[[x for x in annot_data.index if x not in node_order] + list(reversed(node_order))] # Sort the columns by the sum of the values in each column - heatmap_data = heatmap_data[heatmap_data.sum().sort_values(ascending=False).index] + heatmap_data = heatmap_data[heatmap_data.sum().sort_values(ascending=True).index] annot_data = annot_data[heatmap_data.columns] # Add an overall total column, this should be outside the normalizations - heatmap_data['total'] = heatmap_data.sum(axis=1) - annot_data['total'] = annot_data.sum(axis=1) + heatmap_data['ALL'] = heatmap_data.sum(axis=1) + annot_data['ALL'] = annot_data.sum(axis=1) heatmap_data = heatmap_data.applymap(lambda x: min(x, limit)) annot_data = heatmap_data.applymap(lambda x: \