more script consolidations

33 files changed, 175 insertions, 215 deletions

diff --git a/crossvalidations/confusion-matrices/lazar-all.csv b/crossvalidations/confusion-matrices/lazar-all.csv
deleted file mode 100644
index 4123387..0000000
--- a/crossvalidations/confusion-matrices/lazar-all.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-3326,833
-583,3039
diff --git a/crossvalidations/confusion-matrices/lazar-cdk-all.csv b/crossvalidations/confusion-matrices/lazar-cdk-all.csv
deleted file mode 100644
index 8409b4f..0000000
--- a/crossvalidations/confusion-matrices/lazar-cdk-all.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-700,1583
-3390,2410
diff --git a/crossvalidations/confusion-matrices/lazar-cdk-high-confidence.csv b/crossvalidations/confusion-matrices/lazar-cdk-high-confidence.csv
deleted file mode 100644
index 8409b4f..0000000
--- a/crossvalidations/confusion-matrices/lazar-cdk-high-confidence.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-700,1583
-3390,2410
diff --git a/crossvalidations/confusion-matrices/lazar-high-confidence.csv b/crossvalidations/confusion-matrices/lazar-high-confidence.csv
deleted file mode 100644
index 339aa6a..0000000
--- a/crossvalidations/confusion-matrices/lazar-high-confidence.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-2816,571
-365,2138
diff --git a/crossvalidations/confusion-matrices/lazar-mp2d-all.csv b/crossvalidations/confusion-matrices/lazar-mp2d-all.csv
deleted file mode 100644
index b8755c4..0000000
--- a/crossvalidations/confusion-matrices/lazar-mp2d-all.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-3334,830
-572,3054
diff --git a/crossvalidations/confusion-matrices/lazar-mp2d-high-confidence.csv b/crossvalidations/confusion-matrices/lazar-mp2d-high-confidence.csv
deleted file mode 100644
index e3b2b8e..0000000
--- a/crossvalidations/confusion-matrices/lazar-mp2d-high-confidence.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-2807,560
-352,2089
diff --git a/crossvalidations/confusion-matrices/lazar-padel-all.csv b/crossvalidations/confusion-matrices/lazar-padel-all.csv
deleted file mode 100644
index e7ca1d4..0000000
--- a/crossvalidations/confusion-matrices/lazar-padel-all.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-593,466
-1253,1777
diff --git a/crossvalidations/confusion-matrices/lazar-padel-high-confidence.csv b/crossvalidations/confusion-matrices/lazar-padel-high-confidence.csv
deleted file mode 100644
index b88df93..0000000
--- a/crossvalidations/confusion-matrices/lazar-padel-high-confidence.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-593,466
-1251,1771
diff --git a/crossvalidations/confusion-matrices/tensorflow-all.csv b/crossvalidations/confusion-matrices/tensorflow-all.csv
deleted file mode 100644
index f4b80d7..0000000
--- a/crossvalidations/confusion-matrices/tensorflow-all.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-2507,1528
-1495,2550
diff --git a/crossvalidations/confusion-matrices/tensorflow-lr-cdk.csv b/crossvalidations/confusion-matrices/tensorflow-lr-cdk.csv
deleted file mode 100644
index c1e7ebf..0000000
--- a/crossvalidations/confusion-matrices/tensorflow-lr-cdk.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-3252,768
-880,3165
diff --git a/crossvalidations/confusion-matrices/tensorflow-lr-mp2d.csv b/crossvalidations/confusion-matrices/tensorflow-lr-mp2d.csv
deleted file mode 100644
index 6692051..0000000
--- a/crossvalidations/confusion-matrices/tensorflow-lr-mp2d.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-3414,676
-659,3541
diff --git a/crossvalidations/confusion-matrices/tensorflow-lr2-cdk.csv b/crossvalidations/confusion-matrices/tensorflow-lr2-cdk.csv
deleted file mode 100644
index f6d6d9b..0000000
--- a/crossvalidations/confusion-matrices/tensorflow-lr2-cdk.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-3215,805
-794,3251
diff --git a/crossvalidations/confusion-matrices/tensorflow-lr2-mp2d.csv b/crossvalidations/confusion-matrices/tensorflow-lr2-mp2d.csv
deleted file mode 100644
index 035d61a..0000000
--- a/crossvalidations/confusion-matrices/tensorflow-lr2-mp2d.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-3398,692
-640,3560
diff --git a/crossvalidations/confusion-matrices/tensorflow-nn-cdk.csv b/crossvalidations/confusion-matrices/tensorflow-nn-cdk.csv
deleted file mode 100644
index 7c89e5e..0000000
--- a/crossvalidations/confusion-matrices/tensorflow-nn-cdk.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-3419,601
-610,3435
diff --git a/crossvalidations/confusion-matrices/tensorflow-nn-mp2d.csv b/crossvalidations/confusion-matrices/tensorflow-nn-mp2d.csv
deleted file mode 100644
index 6899f39..0000000
--- a/crossvalidations/confusion-matrices/tensorflow-nn-mp2d.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-3375,715
-615,3585
diff --git a/crossvalidations/confusion-matrices/tensorflow-rf-cdk.csv b/crossvalidations/confusion-matrices/tensorflow-rf-cdk.csv
deleted file mode 100644
index 2c8c4ed..0000000
--- a/crossvalidations/confusion-matrices/tensorflow-rf-cdk.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-3273,747
-562,3483
diff --git a/crossvalidations/confusion-matrices/tensorflow-rf-mp2d.csv b/crossvalidations/confusion-matrices/tensorflow-rf-mp2d.csv
deleted file mode 100644
index 36ca403..0000000
--- a/crossvalidations/confusion-matrices/tensorflow-rf-mp2d.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-3197,893
-742,3458
diff --git a/crossvalidations/confusion-matrices/tensorflow-selected.csv b/crossvalidations/confusion-matrices/tensorflow-selected.csv
deleted file mode 100644
index 9d5102e..0000000
--- a/crossvalidations/confusion-matrices/tensorflow-selected.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-2453,1454
-1549,2624
diff --git a/crossvalidations/confusion-matrices/tensorflow-svm-cdk.csv b/crossvalidations/confusion-matrices/tensorflow-svm-cdk.csv
deleted file mode 100644
index ee83739..0000000
--- a/crossvalidations/confusion-matrices/tensorflow-svm-cdk.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-3292,728
-713,3332
diff --git a/crossvalidations/confusion-matrices/tensorflow-svm-mp2d.csv b/crossvalidations/confusion-matrices/tensorflow-svm-mp2d.csv
deleted file mode 100644
index 50be84b..0000000
--- a/crossvalidations/confusion-matrices/tensorflow-svm-mp2d.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-3390,700
-589,3611
diff --git a/crossvalidations/summary.yaml b/crossvalidations/summary.yaml
index 40004e4..05ecfec 100644
--- a/crossvalidations/summary.yaml
+++ b/crossvalidations/summary.yaml
@@ -1,11 +1,11 @@
 ---
 :cv:
-  lazar-mp2d-all:
-    :tp: 3334
-    :fp: 830
-    :tn: 3054
-    :fn: 572
-    :n: 7790
+  mp2d_lazar_all:
+    :tp: 3327
+    :fp: 827
+    :tn: 3049
+    :fn: 574
+    :n: 7777
     :acc: 0.82
     :tpr: 0.85
     :fpr: 0.21
@@ -17,182 +17,182 @@
     :tnr_perc: 79
     :ppv_perc: 80
     :npv_perc: 84
-  lazar-mp2d-high-confidence:
-    :tp: 2807
-    :fp: 560
-    :tn: 2089
-    :fn: 352
-    :n: 5808
+  mp2d_lazar_high_confidence:
+    :tp: 2959
+    :fp: 639
+    :tn: 2302
+    :fn: 400
+    :n: 6300
     :acc: 0.84
-    :tpr: 0.89
-    :fpr: 0.21
-    :tnr: 0.79
-    :ppv: 0.83
-    :npv: 0.86
+    :tpr: 0.88
+    :fpr: 0.22
+    :tnr: 0.78
+    :ppv: 0.82
+    :npv: 0.85
     :acc_perc: 84
-    :tpr_perc: 89
-    :tnr_perc: 79
-    :ppv_perc: 83
-    :npv_perc: 86
-  lazar-cdk-all:
-    :tp: 700
-    :fp: 1583
-    :tn: 2410
-    :fn: 3390
-    :n: 8083
-    :acc: 0.38
-    :tpr: 0.17
-    :fpr: 0.4
-    :tnr: 0.6
-    :ppv: 0.31
-    :npv: 0.42
-    :acc_perc: 38
-    :tpr_perc: 17
-    :tnr_perc: 60
-    :ppv_perc: 31
-    :npv_perc: 42
-  lazar-cdk-high-confidence:
-    :tp: 700
-    :fp: 1583
-    :tn: 2410
-    :fn: 3390
-    :n: 8083
-    :acc: 0.38
-    :tpr: 0.17
-    :fpr: 0.4
-    :tnr: 0.6
-    :ppv: 0.31
-    :npv: 0.42
-    :acc_perc: 38
-    :tpr_perc: 17
-    :tnr_perc: 60
-    :ppv_perc: 31
-    :npv_perc: 42
-  tensorflow-rf-mp2d:
-    :tp: 3197
-    :fp: 893
-    :tn: 3458
-    :fn: 742
-    :n: 8290
+    :tpr_perc: 88
+    :tnr_perc: 78
+    :ppv_perc: 82
+    :npv_perc: 85
+  mp2d_rf:
+    :tp: 3196
+    :fp: 749
+    :tn: 3467
+    :fn: 891
+    :n: 8303
     :acc: 0.8
-    :tpr: 0.81
-    :fpr: 0.21
-    :tnr: 0.79
-    :ppv: 0.78
-    :npv: 0.82
+    :tpr: 0.78
+    :fpr: 0.18
+    :tnr: 0.82
+    :ppv: 0.81
+    :npv: 0.8
     :acc_perc: 80
-    :tpr_perc: 81
-    :tnr_perc: 79
-    :ppv_perc: 78
-    :npv_perc: 82
-  tensorflow-lr-mp2d:
-    :tp: 3414
-    :fp: 676
-    :tn: 3541
-    :fn: 659
-    :n: 8290
+    :tpr_perc: 78
+    :tnr_perc: 82
+    :ppv_perc: 81
+    :npv_perc: 80
+  mp2d_lr:
+    :tp: 3409
+    :fp: 666
+    :tn: 3550
+    :fn: 678
+    :n: 8303
     :acc: 0.84
-    :tpr: 0.84
+    :tpr: 0.83
     :fpr: 0.16
     :tnr: 0.84
-    :ppv: 0.83
+    :ppv: 0.84
     :npv: 0.84
     :acc_perc: 84
-    :tpr_perc: 84
+    :tpr_perc: 83
     :tnr_perc: 84
-    :ppv_perc: 83
+    :ppv_perc: 84
     :npv_perc: 84
-  tensorflow-lr2-mp2d:
-    :tp: 3398
-    :fp: 692
-    :tn: 3560
-    :fn: 640
-    :n: 8290
+  mp2d_lr2:
+    :tp: 3392
+    :fp: 647
+    :tn: 3569
+    :fn: 695
+    :n: 8303
     :acc: 0.84
-    :tpr: 0.84
-    :fpr: 0.16
-    :tnr: 0.84
-    :ppv: 0.83
-    :npv: 0.85
+    :tpr: 0.83
+    :fpr: 0.15
+    :tnr: 0.85
+    :ppv: 0.84
+    :npv: 0.84
     :acc_perc: 84
-    :tpr_perc: 84
-    :tnr_perc: 84
-    :ppv_perc: 83
-    :npv_perc: 85
-  tensorflow-nn-mp2d:
-    :tp: 3375
-    :fp: 715
-    :tn: 3585
-    :fn: 615
-    :n: 8290
+    :tpr_perc: 83
+    :tnr_perc: 85
+    :ppv_perc: 84
+    :npv_perc: 84
+  mp2d_nn:
+    :tp: 3370
+    :fp: 623
+    :tn: 3593
+    :fn: 717
+    :n: 8303
     :acc: 0.84
-    :tpr: 0.85
-    :fpr: 0.17
-    :tnr: 0.83
-    :ppv: 0.83
-    :npv: 0.85
+    :tpr: 0.82
+    :fpr: 0.15
+    :tnr: 0.85
+    :ppv: 0.84
+    :npv: 0.83
     :acc_perc: 84
-    :tpr_perc: 85
-    :tnr_perc: 83
-    :ppv_perc: 83
-    :npv_perc: 85
-  tensorflow-svm-mp2d:
-    :tp: 3390
-    :fp: 700
-    :tn: 3611
-    :fn: 589
-    :n: 8290
+    :tpr_perc: 82
+    :tnr_perc: 85
+    :ppv_perc: 84
+    :npv_perc: 83
+  mp2d_svm:
+    :tp: 3384
+    :fp: 599
+    :tn: 3617
+    :fn: 703
+    :n: 8303
     :acc: 0.84
-    :tpr: 0.85
-    :fpr: 0.16
-    :tnr: 0.84
-    :ppv: 0.83
-    :npv: 0.86
+    :tpr: 0.83
+    :fpr: 0.14
+    :tnr: 0.86
+    :ppv: 0.85
+    :npv: 0.84
     :acc_perc: 84
-    :tpr_perc: 85
-    :tnr_perc: 84
-    :ppv_perc: 83
-    :npv_perc: 86
-  tensorflow-rf-cdk:
-    :tp: 3273
-    :fp: 747
-    :tn: 3483
-    :fn: 562
-    :n: 8065
+    :tpr_perc: 83
+    :tnr_perc: 86
+    :ppv_perc: 85
+    :npv_perc: 84
+  cdk_lazar_all:
+    :tp: 370
+    :fp: 345
+    :tn: 54
+    :fn: 42
+    :n: 811
+    :acc: 0.52
+    :tpr: 0.9
+    :fpr: 0.86
+    :tnr: 0.14
+    :ppv: 0.52
+    :npv: 0.56
+    :acc_perc: 52
+    :tpr_perc: 90
+    :tnr_perc: 14
+    :ppv_perc: 52
+    :npv_perc: 56
+  cdk_lazar_high_confidence:
+    :tp: 370
+    :fp: 345
+    :tn: 54
+    :fn: 42
+    :n: 811
+    :acc: 0.52
+    :tpr: 0.9
+    :fpr: 0.86
+    :tnr: 0.14
+    :ppv: 0.52
+    :npv: 0.56
+    :acc_perc: 52
+    :tpr_perc: 90
+    :tnr_perc: 14
+    :ppv_perc: 52
+    :npv_perc: 56
+  cdk_rf:
+    :tp: 3267
+    :fp: 568
+    :tn: 3492
+    :fn: 750
+    :n: 8077
     :acc: 0.84
-    :tpr: 0.85
-    :fpr: 0.18
-    :tnr: 0.82
-    :ppv: 0.81
-    :npv: 0.86
+    :tpr: 0.81
+    :fpr: 0.14
+    :tnr: 0.86
+    :ppv: 0.85
+    :npv: 0.82
     :acc_perc: 84
-    :tpr_perc: 85
-    :tnr_perc: 82
-    :ppv_perc: 81
-    :npv_perc: 86
-  tensorflow-lr-cdk:
-    :tp: 3252
-    :fp: 768
-    :tn: 3165
-    :fn: 880
-    :n: 8065
-    :acc: 0.8
-    :tpr: 0.79
-    :fpr: 0.2
-    :tnr: 0.8
-    :ppv: 0.81
-    :npv: 0.78
-    :acc_perc: 80
-    :tpr_perc: 79
-    :tnr_perc: 80
-    :ppv_perc: 81
-    :npv_perc: 78
-  tensorflow-lr2-cdk:
-    :tp: 3215
-    :fp: 805
-    :tn: 3251
-    :fn: 794
-    :n: 8065
+    :tpr_perc: 81
+    :tnr_perc: 86
+    :ppv_perc: 85
+    :npv_perc: 82
+  cdk_lr:
+    :tp: 3247
+    :fp: 887
+    :tn: 3173
+    :fn: 770
+    :n: 8077
+    :acc: 0.79
+    :tpr: 0.81
+    :fpr: 0.22
+    :tnr: 0.78
+    :ppv: 0.79
+    :npv: 0.8
+    :acc_perc: 79
+    :tpr_perc: 81
+    :tnr_perc: 78
+    :ppv_perc: 79
+    :npv_perc: 80
+  cdk_lr2:
+    :tp: 3210
+    :fp: 803
+    :tn: 3257
+    :fn: 807
+    :n: 8077
     :acc: 0.8
     :tpr: 0.8
     :fpr: 0.2
@@ -204,12 +204,12 @@
     :tnr_perc: 80
     :ppv_perc: 80
     :npv_perc: 80
-  tensorflow-nn-cdk:
-    :tp: 3419
-    :fp: 601
-    :tn: 3435
-    :fn: 610
-    :n: 8065
+  cdk_nn:
+    :tp: 3414
+    :fp: 617
+    :tn: 3443
+    :fn: 603
+    :n: 8077
     :acc: 0.85
     :tpr: 0.85
     :fpr: 0.15
@@ -221,12 +221,12 @@
     :tnr_perc: 85
     :ppv_perc: 85
     :npv_perc: 85
-  tensorflow-svm-cdk:
-    :tp: 3292
-    :fp: 728
-    :tn: 3332
-    :fn: 713
-    :n: 8065
+  cdk_svm:
+    :tp: 3286
+    :fp: 720
+    :tn: 3340
+    :fn: 731
+    :n: 8077
     :acc: 0.82
     :tpr: 0.82
     :fpr: 0.18
diff --git a/crossvalidations/cdk/tensorflow/pred.lr.v4.norm.csv b/crossvalidations/tensorflow/pred.lr.v4.norm.csv
index ae90812..ae90812 100644
--- a/crossvalidations/cdk/tensorflow/pred.lr.v4.norm.csv
+++ b/crossvalidations/tensorflow/pred.lr.v4.norm.csv
diff --git a/crossvalidations/mp2d/tensorflow/pred.lr.v4_ext.csv b/crossvalidations/tensorflow/pred.lr.v4_ext.csv
index 264a5a9..264a5a9 100644
--- a/crossvalidations/mp2d/tensorflow/pred.lr.v4_ext.csv
+++ b/crossvalidations/tensorflow/pred.lr.v4_ext.csv
diff --git a/crossvalidations/cdk/tensorflow/pred.lr2.norm.v4.csv b/crossvalidations/tensorflow/pred.lr2.norm.v4.csv
index 5068f87..5068f87 100644
--- a/crossvalidations/cdk/tensorflow/pred.lr2.norm.v4.csv
+++ b/crossvalidations/tensorflow/pred.lr2.norm.v4.csv
diff --git a/crossvalidations/mp2d/tensorflow/pred.lr2.v4_ext.csv b/crossvalidations/tensorflow/pred.lr2.v4_ext.csv
index 4acb0a7..4acb0a7 100644
--- a/crossvalidations/mp2d/tensorflow/pred.lr2.v4_ext.csv
+++ b/crossvalidations/tensorflow/pred.lr2.v4_ext.csv
diff --git a/crossvalidations/cdk/tensorflow/pred.nn.v4.norm.csv b/crossvalidations/tensorflow/pred.nn.v4.norm.csv
index 412e1de..412e1de 100644
--- a/crossvalidations/cdk/tensorflow/pred.nn.v4.norm.csv
+++ b/crossvalidations/tensorflow/pred.nn.v4.norm.csv
diff --git a/crossvalidations/mp2d/tensorflow/pred.nn.v4_ext.csv b/crossvalidations/tensorflow/pred.nn.v4_ext.csv
index d84a58f..d84a58f 100644
--- a/crossvalidations/mp2d/tensorflow/pred.nn.v4_ext.csv
+++ b/crossvalidations/tensorflow/pred.nn.v4_ext.csv
diff --git a/crossvalidations/cdk/tensorflow/pred.rf.norm.v4.csv b/crossvalidations/tensorflow/pred.rf.norm.v4.csv
index e7793de..e7793de 100644
--- a/crossvalidations/cdk/tensorflow/pred.rf.norm.v4.csv
+++ b/crossvalidations/tensorflow/pred.rf.norm.v4.csv
diff --git a/crossvalidations/mp2d/tensorflow/pred.rf.v4_ext.csv b/crossvalidations/tensorflow/pred.rf.v4_ext.csv
index 9177946..9177946 100644
--- a/crossvalidations/mp2d/tensorflow/pred.rf.v4_ext.csv
+++ b/crossvalidations/tensorflow/pred.rf.v4_ext.csv
diff --git a/crossvalidations/cdk/tensorflow/pred.svm.norm.v4.csv b/crossvalidations/tensorflow/pred.svm.norm.v4.csv
index bcbb799..bcbb799 100644
--- a/crossvalidations/cdk/tensorflow/pred.svm.norm.v4.csv
+++ b/crossvalidations/tensorflow/pred.svm.norm.v4.csv
diff --git a/crossvalidations/mp2d/tensorflow/pred.svm.v4_ext.csv b/crossvalidations/tensorflow/pred.svm.v4_ext.csv
index c7ed642..c7ed642 100644
--- a/crossvalidations/mp2d/tensorflow/pred.svm.v4_ext.csv
+++ b/crossvalidations/tensorflow/pred.svm.v4_ext.csv
diff --git a/crossvalidations/mp2d/tensorflow/prediction-v5-ext.ipynb b/crossvalidations/tensorflow/prediction-v5-ext.ipynb
index d00bb7e..d00bb7e 100644
--- a/crossvalidations/mp2d/tensorflow/prediction-v5-ext.ipynb
+++ b/crossvalidations/tensorflow/prediction-v5-ext.ipynb
diff --git a/crossvalidations/cdk/tensorflow/prediction-v5-norm.ipynb b/crossvalidations/tensorflow/prediction-v5-norm.ipynb
index 3d3c10a..3d3c10a 100644
--- a/crossvalidations/cdk/tensorflow/prediction-v5-norm.ipynb
+++ b/crossvalidations/tensorflow/prediction-v5-norm.ipynb