1 files changed, 18 insertions, 14 deletions
diff --git a/scripts/summaries2table.rb b/scripts/summaries2table.rb
index 5470b26..f98ec54 100755
--- a/scripts/summaries2table.rb
+++ b/scripts/summaries2table.rb
@@ -1,19 +1,23 @@
 #!/usr/bin/env ruby
-require 'json'
+require 'yaml'
 
-results = {}
+rows = {:acc => "Accuracy", :tpr => "True positive rate/Sensitivity", :tnr => "True negative rate/Specificity", :ppv => "Positive predictive value/Precision", :npv => "Negative predictive value", :n => "Nr. predictions"}
+data = YAML.load_file "10-fold-crossvalidations/summary.yaml"
 
-ARGV.each do |f|
-  results[File.basename(f,".json")] = JSON.parse(File.read(f))
+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 = ["lr","lr2","nn"].collect{|n| "tensorflow-"+n+".v3"}
+when "lazar"
+  header = ["lazar-mp2d (all)","lazar-mp2d (high confidence)", "lazar-padel (all)","lazar-padel (high confidence)"]
+  keys = ["lazar-all","lazar-high-confidence", "lazar-padel-all","lazar-padel-high-confidence"]
 end
-
-print ","
-puts results.keys.collect{|k| k.sub("tensorflow","TF")}.join(",")
-["accuracy","true_positive_rate","true_negative_rate","positive_predictive_value","negative_predictive_value"].each do |m|
-  line = [m.gsub("_"," ")]
-  results.each do |k,v|
-    line << v[m].round(2)
-  end
-  puts line.join(",")
+puts ","+header.join(",")
+rows.each do |short,long|
+  print long+","
+  puts keys.collect{|k| data[k][short]}.join(",")
 end
-
+exit