From cc08e6beda7f7d70ebf6c6929a22d1a0cd7c1a20 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Tue, 24 May 2016 15:41:24 +0200 Subject: tests fixed. DescriptorTest#test_compound_all may fail within all.rb --- lib/validation-statistics.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/validation-statistics.rb') diff --git a/lib/validation-statistics.rb b/lib/validation-statistics.rb index 3c52b15..156353a 100644 --- a/lib/validation-statistics.rb +++ b/lib/validation-statistics.rb @@ -8,10 +8,11 @@ module OpenTox predictivity = {} nr_instances = 0 predictions.each do |cid,pred| - # TODO use measured majority class - if pred[:measured].uniq.size == 1 + # TODO + # use predictions without probabilities (single neighbor)?? + # use measured majority class?? + if pred[:measured].uniq.size == 1 and pred[:probabilities] m = pred[:measured].first - #pred[:measured].each do |m| if pred[:value] == m if pred[:value] == accept_values[0] confusion_matrix[0][0] += 1 @@ -63,12 +64,12 @@ module OpenTox end def self.regression predictions + # TODO: predictions within prediction_interval rmse = 0 mae = 0 x = [] y = [] predictions.each do |cid,pred| - p pred if pred[:value] and pred[:measured] x << pred[:measured].median y << pred[:value] -- cgit v1.2.3