From 1c3239d6bc4378f3ee90d975973d4946756b3777 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Mon, 25 May 2020 17:35:13 +0100 Subject: Add rank plots on multivariate data --- Makefile | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9f66234b..9df9171f 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,9 @@ best_tables: \ $(TABLE_DIR)/best_cover_uni_avg.json \ $(TABLE_DIR)/best_cover_multi_avg.json \ $(TABLE_DIR)/best_f1_uni_full.json \ - $(TABLE_DIR)/best_cover_uni_full.json + $(TABLE_DIR)/best_cover_uni_full.json \ + $(TABLE_DIR)/best_f1_multi_full.json \ + $(TABLE_DIR)/best_cover_multi_full.json $(TABLE_DIR)/best_f1_combined_full.tex: $(SCRIPT_DIR)/make_table.py summaries | table-dir python $< -s $(SUMMARY_DIR) -e best -m f1 -d combined -f tex -t full > $@ @@ -104,6 +106,12 @@ $(TABLE_DIR)/best_cover_uni_full.json: $(SCRIPT_DIR)/make_table.py summaries | t $(TABLE_DIR)/best_f1_uni_full.json: $(SCRIPT_DIR)/make_table.py summaries | table-dir python $< -s $(SUMMARY_DIR) -e best -m f1 -d uni -f json -t full > $@ +$(TABLE_DIR)/best_f1_multi_full.json: $(SCRIPT_DIR)/make_table.py summaries + python $< -s $(SUMMARY_DIR) -e best -m f1 -d multi -f json -t full > $@ + +$(TABLE_DIR)/best_cover_multi_full.json: $(SCRIPT_DIR)/make_table.py summaries + python $< -s $(SUMMARY_DIR) -e best -m cover -d multi -f json -t full > $@ + default_tables: \ $(TABLE_DIR)/default_f1_combined_full.tex \ $(TABLE_DIR)/default_cover_combined_full.tex \ @@ -112,7 +120,9 @@ default_tables: \ $(TABLE_DIR)/default_cover_uni_avg.json \ $(TABLE_DIR)/default_cover_multi_avg.json \ $(TABLE_DIR)/default_cover_uni_full.json \ - $(TABLE_DIR)/default_f1_uni_full.json + $(TABLE_DIR)/default_f1_uni_full.json \ + $(TABLE_DIR)/default_cover_multi_full.json \ + $(TABLE_DIR)/default_f1_multi_full.json $(TABLE_DIR)/default_f1_combined_full.tex: $(SCRIPT_DIR)/make_table.py summaries | table-dir python $< -s $(SUMMARY_DIR) -e default -m f1 -d combined -f tex -t full > $@ @@ -138,6 +148,11 @@ $(TABLE_DIR)/default_cover_uni_full.json: $(SCRIPT_DIR)/make_table.py summaries $(TABLE_DIR)/default_f1_uni_full.json: $(SCRIPT_DIR)/make_table.py summaries | table-dir python $< -s $(SUMMARY_DIR) -e default -m f1 -d uni -f json -t full > $@ +$(TABLE_DIR)/default_cover_multi_full.json: $(SCRIPT_DIR)/make_table.py summaries | table-dir + python $< -s $(SUMMARY_DIR) -e default -m cover -d multi -f json -t full > $@ + +$(TABLE_DIR)/default_f1_multi_full.json: $(SCRIPT_DIR)/make_table.py summaries | table-dir + python $< -s $(SUMMARY_DIR) -e default -m f1 -d multi -f json -t full > $@ aggregate_wide: $(TABLE_DIR)/aggregate_table_wide.tex @@ -193,25 +208,53 @@ rank-dir: mkdir -p $(RANK_DIR) rankplots: \ - $(RANK_DIR)/rankplot_best_cover_uni.tex \ - $(RANK_DIR)/rankplot_best_f1_uni.tex \ - $(RANK_DIR)/rankplot_default_cover_uni.tex \ - $(RANK_DIR)/rankplot_default_f1_uni.tex \ $(RANK_DIR)/rankplot_best_cover_uni.pdf \ $(RANK_DIR)/rankplot_best_f1_uni.pdf \ $(RANK_DIR)/rankplot_default_cover_uni.pdf \ - $(RANK_DIR)/rankplot_default_f1_uni.pdf + $(RANK_DIR)/rankplot_default_f1_uni.pdf \ + $(RANK_DIR)/rankplot_best_cover_multi.pdf \ + $(RANK_DIR)/rankplot_best_f1_multi.pdf \ + $(RANK_DIR)/rankplot_default_cover_multi.pdf \ + $(RANK_DIR)/rankplot_default_f1_multi.pdf + +####### +# UNI # +####### + +$(RANK_DIR)/rankplot_best_cover_uni.tex: $(TABLE_DIR)/best_cover_uni_full.json \ + $(SCRIPT_DIR)/rank_plots.py | rank-dir + python $(SCRIPT_DIR)/rank_plots.py -i $< -o $@ -b max --type best + +$(RANK_DIR)/rankplot_best_f1_uni.tex: $(TABLE_DIR)/best_f1_uni_full.json \ + $(SCRIPT_DIR)/rank_plots.py | rank-dir + python $(SCRIPT_DIR)/rank_plots.py -i $< -o $@ -b max --type best + +$(RANK_DIR)/rankplot_default_cover_uni.tex: $(TABLE_DIR)/default_cover_uni_full.json \ + $(SCRIPT_DIR)/rank_plots.py | rank-dir + python $(SCRIPT_DIR)/rank_plots.py -i $< -o $@ -b max --type default + +$(RANK_DIR)/rankplot_default_f1_uni.tex: $(TABLE_DIR)/default_f1_uni_full.json \ + $(SCRIPT_DIR)/rank_plots.py | rank-dir + python $(SCRIPT_DIR)/rank_plots.py -i $< -o $@ -b max --type default + +######### +# MULTI # +######### -$(RANK_DIR)/rankplot_best_cover_uni.tex: $(TABLE_DIR)/best_cover_uni_full.json $(SCRIPT_DIR)/rank_plots.py | rank-dir +$(RANK_DIR)/rankplot_best_cover_multi.tex: $(TABLE_DIR)/best_cover_multi_full.json \ + $(SCRIPT_DIR)/rank_plots.py | rank-dir python $(SCRIPT_DIR)/rank_plots.py -i $< -o $@ -b max --type best -$(RANK_DIR)/rankplot_best_f1_uni.tex: $(TABLE_DIR)/best_f1_uni_full.json $(SCRIPT_DIR)/rank_plots.py | rank-dir +$(RANK_DIR)/rankplot_best_f1_multi.tex: $(TABLE_DIR)/best_f1_multi_full.json \ + $(SCRIPT_DIR)/rank_plots.py | rank-dir python $(SCRIPT_DIR)/rank_plots.py -i $< -o $@ -b max --type best -$(RANK_DIR)/rankplot_default_cover_uni.tex: $(TABLE_DIR)/default_cover_uni_full.json $(SCRIPT_DIR)/rank_plots.py | rank-dir +$(RANK_DIR)/rankplot_default_cover_multi.tex: $(TABLE_DIR)/default_cover_multi_full.json \ + $(SCRIPT_DIR)/rank_plots.py | rank-dir python $(SCRIPT_DIR)/rank_plots.py -i $< -o $@ -b max --type default -$(RANK_DIR)/rankplot_default_f1_uni.tex: $(TABLE_DIR)/default_f1_uni_full.json $(SCRIPT_DIR)/rank_plots.py | rank-dir +$(RANK_DIR)/rankplot_default_f1_multi.tex: $(TABLE_DIR)/default_f1_multi_full.json \ + $(SCRIPT_DIR)/rank_plots.py | rank-dir python $(SCRIPT_DIR)/rank_plots.py -i $< -o $@ -b max --type default $(RANK_DIR)/rankplot_%.pdf: $(RANK_DIR)/rankplot_%.tex | rank-dir -- cgit v1.2.3