From 08d3ea5916864f6f4143e6c1f622f2dd87d21d27 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Mon, 25 May 2020 15:32:17 +0100 Subject: Add descriptive statistics code and results --- Makefile | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 054a3972..9f66234b 100644 --- a/Makefile +++ b/Makefile @@ -237,7 +237,14 @@ clean_rankplots: CONSTANT_TARGETS = $(CONST_DIR)/sigtest_global_best_cover_uni.tex \ $(CONST_DIR)/sigtest_global_best_f1_uni.tex \ $(CONST_DIR)/sigtest_global_default_cover_uni.tex \ - $(CONST_DIR)/sigtest_global_default_f1_uni.tex + $(CONST_DIR)/sigtest_global_default_f1_uni.tex \ + $(CONST_DIR)/SeriesLengthMin.tex \ + $(CONST_DIR)/SeriesLengthMax.tex \ + $(CONST_DIR)/SeriesLengthMean.tex \ + $(CONST_DIR)/UniqueAnnotationsMin.tex \ + $(CONST_DIR)/UniqueAnnotationsMax.tex \ + $(CONST_DIR)/UniqueAnnotationsMean.tex \ + $(CONST_DIR)/UniqueAnnotationsStd.tex const-dir: mkdir -p $(CONST_DIR) @@ -260,6 +267,34 @@ $(CONST_DIR)/sigtest_global_default_f1_uni.tex: $(TABLE_DIR)/default_f1_uni_full $(SCRIPT_DIR)/significance.py | const-dir python $(SCRIPT_DIR)/significance.py -i $< -o $@ --type best --mode global +$(CONST_DIR)/SeriesLengthMin.tex: $(SCRIPT_DIR)/descriptive_length.py \ + $(DATASET_SUMMARIES) | const-dir + python $< -s $(SUMMARY_DIR) -t min > $@ + +$(CONST_DIR)/SeriesLengthMax.tex: $(SCRIPT_DIR)/descriptive_length.py \ + $(DATASET_SUMMARIES) | const-dir + python $< -s $(SUMMARY_DIR) -t max > $@ + +$(CONST_DIR)/SeriesLengthMean.tex: $(SCRIPT_DIR)/descriptive_length.py \ + $(DATASET_SUMMARIES) | const-dir + python $< -s $(SUMMARY_DIR) -t mean > $@ + +$(CONST_DIR)/UniqueAnnotationsMin.tex: $(SCRIPT_DIR)/descriptive_annotations.py \ + $(DATASET_SUMMARIES) | const-dir + python $< -s $(SUMMARY_DIR) -t min > $@ + +$(CONST_DIR)/UniqueAnnotationsMax.tex: $(SCRIPT_DIR)/descriptive_annotations.py \ + $(DATASET_SUMMARIES) | const-dir + python $< -s $(SUMMARY_DIR) -t max > $@ + +$(CONST_DIR)/UniqueAnnotationsMean.tex: $(SCRIPT_DIR)/descriptive_annotations.py \ + $(DATASET_SUMMARIES) | const-dir + python $< -s $(SUMMARY_DIR) -t mean > $@ + +$(CONST_DIR)/UniqueAnnotationsStd.tex: $(SCRIPT_DIR)/descriptive_annotations.py \ + $(DATASET_SUMMARIES) | const-dir + python $< -s $(SUMMARY_DIR) -t std > $@ + clean_constants: rm -f $(CONSTANT_TARGETS) -- cgit v1.2.3 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 From d5aeca4d8a6a6dd675f1054c3efa58cbcf8f779c Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Mon, 25 May 2020 17:35:26 +0100 Subject: Add clean_results target to makefile --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9df9171f..5e0d6122 100644 --- a/Makefile +++ b/Makefile @@ -257,6 +257,7 @@ $(RANK_DIR)/rankplot_default_f1_multi.tex: $(TABLE_DIR)/default_f1_multi_full.js $(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 latexmk -pdf -pdflatex="pdflatex -interaction=nonstopmode --shell-escape" \ -outdir=$(RANK_DIR) $< @@ -390,4 +391,6 @@ validate: ./utils/validate_schema.py ./schema.json # # ########### -clean: clean_summaries clean_tables clean_rankplots clean_venvs +clean: clean_results clean_venvs + +clean_results: clean_summaries clean_tables clean_rankplots clean_constants -- cgit v1.2.3