diff options
author | Christoph Helma <helma@in-silico.ch> | 2019-10-21 20:29:12 +0200 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2019-10-21 20:29:12 +0200 |
commit | 2e03df94681951a62229b76b52370da094aa1ec6 (patch) | |
tree | a1bedd275c3ffab65c49f4eefec91bf6a0768d09 /Makefile | |
parent | b1e01382e0580676d3686195f9897a60a2ffee1d (diff) |
Results section
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 22 |
1 files changed, 13 insertions, 9 deletions
@@ -8,7 +8,7 @@ PANDOC_SCHOLAR_PATH = pandoc-scholar OUTFILE_PREFIX = mutagenicity DEFAULT_EXTENSIONS = pdf #latex docx html #odt epub #PANDOC_WRITER_OPTIONS = --filter=panpipe --filter=pandoc-placetable --filter=pandoc-citeproc -M tmpvar=test -PANDOC_WRITER_OPTIONS = --filter=pandoc-crossref --filter=pandoc-placetable --filter=pandoc-citeproc +PANDOC_WRITER_OPTIONS = --filter=pandoc-placetable --filter=pandoc-crossref --filter=pandoc-citeproc TEMPLATE_FILE_LATEX = pandoc-scholar.latex # Lazar @@ -28,24 +28,25 @@ CONFUSION_MATRICES_DIR = 10-fold-crossvalidations/confusion-matrices R_CV_DIR = 10-fold-crossvalidations/R TENSORFLOW_CV_DIR = 10-fold-crossvalidations/tensorflow -TABLES = tables/r-summary.csv tables/tf-summary.csv tables/lazar-summary.csv tables/R-SVM.csv tables/R-RF.csv tables/R-DL.csv tables/tensorflow-all.csv tables/tensorflow-selected.csv tables/lazar-all.csv tables/lazar-high-confidence.csv tables/lazar-padel-all.csv tables/lazar-padel-high-confidence.csv +#TABLES = tables/r-summary.csv tables/tf-summary.csv tables/lazar-summary.csv tables/R-SVM.csv tables/R-RF.csv tables/R-DL.csv tables/tensorflow-all.csv tables/tensorflow-selected.csv tables/lazar-all.csv tables/lazar-high-confidence.csv tables/lazar-padel-all.csv tables/lazar-padel-high-confidence.csv +TABLES = tables/R-SVM.csv tables/R-RF.csv tables/R-DL.csv tables/tensorflow-all.csv tables/tensorflow-selected.csv tables/lazar-all.csv tables/lazar-high-confidence.csv tables/lazar-padel-all.csv tables/lazar-padel-high-confidence.csv R_SUMMARIES = $(SUMMARIES_DIR)/R-SVM.json $(SUMMARIES_DIR)/R-RF.json $(SUMMARIES_DIR)/R-DL.json TF_SUMMARIES = $(SUMMARIES_DIR)/tensorflow-all.json $(SUMMARIES_DIR)/tensorflow-selected.json LAZAR_SUMMARIES = $(SUMMARIES_DIR)/lazar-all.json $(SUMMARIES_DIR)/lazar-high-confidence.json $(SUMMARIES_DIR)/lazar-padel-all.json $(SUMMARIES_DIR)/lazar-padel-high-confidence.json -SUMMARIES = $(R_SUMMARIES) $(TF_SUMMARIES) $(LAZAR_SUMMARIES) +#SUMMARIES = $(R_SUMMARIES) $(TF_SUMMARIES) $(LAZAR_SUMMARIES) CONFUSION_MATRICES = $(CONFUSION_MATRICES_DIR)/R-SVM.csv $(CONFUSION_MATRICES_DIR)/R-RF.csv $(CONFUSION_MATRICES_DIR)/R-DL.csv $(CONFUSION_MATRICES_DIR)/tensorflow-all.csv $(CONFUSION_MATRICES_DIR)/tensorflow-selected.csv $(CONFUSION_MATRICES_DIR)/lazar-all.csv $(CONFUSION_MATRICES_DIR)/lazar-high-confidence.csv $(CONFUSION_MATRICES_DIR)/lazar-padel-all.csv $(CONFUSION_MATRICES_DIR)/lazar-padel-high-confidence.csv DATA = data/mutagenicity.sdf data/mutagenicity.csv data/mutagenicity-fingerprints.csv -all: $(DATA) $(TABLES) mutagenicity.pdf $(SUMMARIES_DIR)/results.json +all: $(DATA) $(TABLES) mutagenicity.pdf #all: $(SUMMARIES) $(DATA) $(TABLES) mutagenicity.pdf include $(PANDOC_SCHOLAR_PATH)/Makefile export: $(DATA) -mutagenicity.mustache.md: $(SUMMARIES_DIR)/results.json mutagenicity.md +mutagenicity.mustache.md: results.yaml mutagenicity.md mustache $^ > $@ # tables @@ -64,11 +65,14 @@ tables/%.csv: $(CONFUSION_MATRICES_DIR)/%.csv # summaries -$(SUMMARIES_DIR)/results.json: $(SUMMARIES) - scripts/results.rb $^ > $@ +#$(SUMMARIES_DIR)/results.json: $(SUMMARIES) + #scripts/results.rb $^ > $@ -$(SUMMARIES_DIR)/%.json: $(CONFUSION_MATRICES_DIR)/%.csv - scripts/confusion-matrix-summary.rb $< > $@ +#$(SUMMARIES_DIR)/%.json: $(CONFUSION_MATRICES_DIR)/%.csv + #scripts/confusion-matrix-summary.rb $< > $@ + +results.yaml: $(CONFUSION_MATRICES) + scripts/confusion-matrix-summary.rb $^ > $@ # confusion matrices |