summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile26
1 files changed, 21 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 856d87c..9abf7eb 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,10 @@ CV_SUMMARY = 10-fold-crossvalidations/summary.yaml
# PA predictions
PA_DIR = pyrrolizidine-alkaloids
PA_LAZAR_DIR = $(PA_DIR)/lazar
+PA_R_DIR = $(PA_DIR)/R
+PA_TF_DIR = $(PA_DIR)/tensorflow
+
+PA_PREDICTIONS = $(PA_LAZAR_DIR)/pa-mp2d-predictions.csv $(PA_LAZAR_DIR)/pa-padel-predictions.csv $(PA_R_DIR)/PA.RF.outcome.csv $(PA_R_DIR)/PA.SVM.outcome.csv $(PA_R_DIR)/PA.DL.outcome.csv $(PA_TF_DIR)/pred.lr.v3-ext-Padel-2D.csv $(PA_TF_DIR)/pred.lr2.v3-ext-Padel-2D.csv $(PA_TF_DIR)/pred.rf.v3-ext-Padel-2D.csv $(PA_TF_DIR)/pred.nn.v3-ext-Padel-2D.csv
# manuscript
TABLES = tables/lazar-summary.csv tables/r-summary.csv tables/tensorflow-summary.csv tables/pa-tab.tex
@@ -58,7 +62,7 @@ figures/roc.csv: $(CV_SUMMARY)
scripts/summary2roc.rb $< > $@
# tables
-tables/pa-tab.tex: scripts/pa-table.rb
+tables/pa-tab.tex: scripts/pa-table.rb $(PA_PREDICTIONS)
scripts/pa-table.rb > $@
tables/lazar-summary.csv: $(CV_SUMMARY)
@@ -112,15 +116,27 @@ $(CONFUSION_MATRICES_DIR)/R-DL.csv: $(R_CV_DIR)/Sgl-Observations-DL.csv
scripts/cv-r-confusion-matrix.rb $< > $@
## tensorflow
-$(CONFUSION_MATRICES_DIR)/tensorflow-lr.v3.csv: $(TENSORFLOW_CV_DIR)/pred.lr.v3.sorted.csv
+$(TENSORFLOW_CV_DIR)/pred.lr.v3.norm.sorted.csv: $(TENSORFLOW_CV_DIR)/pred.lr.v3.sorted.csv
+ sort -n $< > $@
+
+$(TENSORFLOW_CV_DIR)/pred.lr2.v3.norm.sorted.csv: $(TENSORFLOW_CV_DIR)/pred.lr2.v3.sorted.csv
+ sort -n $< > $@
+
+$(TENSORFLOW_CV_DIR)/pred.nn.v3.norm.sorted.csv: $(TENSORFLOW_CV_DIR)/pred.nn.v3.sorted.csv
+ sort -n $< > $@
+
+$(TENSORFLOW_CV_DIR)/pred.rf.v3.norm.sorted.csv: $(TENSORFLOW_CV_DIR)/pred.rf.v3.sorted.csv
+ sort -n $< > $@
+
+$(CONFUSION_MATRICES_DIR)/tensorflow-lr.v3.csv: $(TENSORFLOW_CV_DIR)/pred.lr.v3.norm.sorted.csv
scripts/cv-tensorflow-confusion-matrix.rb $< > $@
-$(CONFUSION_MATRICES_DIR)/tensorflow-lr2.v3.csv: $(TENSORFLOW_CV_DIR)/pred.lr2.v3.sorted.csv
+$(CONFUSION_MATRICES_DIR)/tensorflow-lr2.v3.csv: $(TENSORFLOW_CV_DIR)/pred.lr2.v3.norm.sorted.csv
scripts/cv-tensorflow-confusion-matrix.rb $< > $@
-$(CONFUSION_MATRICES_DIR)/tensorflow-nn.v3.csv: $(TENSORFLOW_CV_DIR)/pred.nn.v3.sorted.csv
+$(CONFUSION_MATRICES_DIR)/tensorflow-nn.v3.csv: $(TENSORFLOW_CV_DIR)/pred.nn.v3.norm.sorted.csv
scripts/cv-tensorflow-confusion-matrix.rb $< > $@
-$(CONFUSION_MATRICES_DIR)/tensorflow-rf.v3.csv: $(TENSORFLOW_CV_DIR)/pred.rf.v3.sorted.csv
+$(CONFUSION_MATRICES_DIR)/tensorflow-rf.v3.csv: $(TENSORFLOW_CV_DIR)/pred.rf.v3.norm.sorted.csv
scripts/cv-tensorflow-confusion-matrix.rb $< > $@