svm validation, tensorflow mp2d pa predictions, r results removed, cleanup

1 files changed, 12 insertions, 8 deletions

diff --git a/scripts/summary2table.rb b/scripts/summary2table.rb
index 557dbd4..8bc323c 100755
--- a/scripts/summary2table.rb
+++ b/scripts/summary2table.rb
@@ -5,21 +5,25 @@ rows = {:acc => "Accuracy", :tpr => "True positive rate/Sensitivity", :tnr => "T
 data = YAML.load_file("10-fold-crossvalidations/summary.yaml")[:cv]
 
 case ARGV[0]
-when "R"
-  header = ["RF","SVM","DL"]
-  keys = header.collect{|h| "R-"+h}
 when "tensorflow"
-  header = ["RF","LR-sgd","LR-scikit","NN"]
-  keys = ["rf","lr","lr2","nn"].collect{|n| "tensorflow-"+n+".v3"}
+  header = ["MP2D-RF","MP2D-LR-sgd","MP2D-LR-scikit","MP2D-NN","MP2D-SVM","CDK-RF","CDK-LR-sgd","CDK-LR-scikit","CDK-NN","CDK-SVM"]
+  desc = ["mp2d","cdk"]
+  algos = ["rf","lr","lr2","nn","svm"]
+  keys = []
+  desc.each do |d| 
+    algos.each do |a|
+      keys << "tensorflow-"+a+"-"+d
+    end
+  end
 when "lazar"
   header = ["MP2D", "CDK"]
-  mp2dkeys = ["lazar-all","lazar-high-confidence"]
-  padelkeys = ["lazar-padel-all","lazar-padel-high-confidence"]
+  mp2dkeys = ["lazar-mp2d-all","lazar-mp2d-high-confidence"]
+  cdkkeys = ["lazar-cdk-all","lazar-cdk-high-confidence"]
   puts ","+header.join(",")
   rows.each do |short,long|
     print long+","
     print mp2dkeys.collect{|k| data[k][short]}.join("/")+","
-    puts padelkeys.collect{|k| data[k][short]}.join("/")
+    puts cdkkeys.collect{|k| data[k][short]}.join("/")
   end
   exit
 end