From a29eb3e38414cd252850c9c4fb356f8b2bef6fb4 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Fri, 12 Feb 2021 19:54:07 +0100 Subject: model.rb refactored, mp2d models updated --- lib/statistics.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/statistics.rb') diff --git a/lib/statistics.rb b/lib/statistics.rb index 15ea416..e14dc7c 100644 --- a/lib/statistics.rb +++ b/lib/statistics.rb @@ -3,7 +3,7 @@ class ClassificationStatistics def initialize dir @dir = dir @folds = Dir[File.join(@dir,"[0-9]*")] - @confusion_matrix_dir = File.join(@dir,"confusion_matrices") + @confusion_matrix_dir = File.join(@dir,"confusion-matrices") @summaries_dir = File.join(@dir,"summaries") end @@ -17,12 +17,12 @@ class ClassificationStatistics @folds.each do |dir| test_dir = File.join(dir,"test") - classifications = File.readlines(File.join(test_dir,"classification")).collect{|row| row.chomp.split(",")} - measurements = File.readlines(File.join(test_dir,"dependent_variables")).collect{|v| v.to_i} - similarity_thresholds = File.readlines(File.join(dir,"train","similarity_thresholds")).collect{|v| v.chomp.to_f} + classifications = File.readlines(File.join(test_dir,"predictions")).collect{|row| row.chomp.split(",")} + measurements = File.readlines(File.join(test_dir,"dependent-variables")).collect{|v| v.to_i} + similarity_thresholds = File.readlines(File.join(dir,"train","similarity-thresholds")).collect{|v| v.chomp.to_f} classifications.each_with_index do |c,i| - prediction = c[1] - max_sim = c[4].to_f + prediction = c[2] + max_sim = c[5].to_f unless prediction.empty? prediction = prediction.to_i if prediction == 1 and measurements[i] == 1 -- cgit v1.2.3