From 5d7aec4c09709f2179bbbac1e1140255156c0cda Mon Sep 17 00:00:00 2001 From: gebele Date: Tue, 21 Mar 2017 15:08:38 +0000 Subject: fixed endless loop; rescue for missing neighbors --- lib/model.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/model.rb b/lib/model.rb index 56d8665..7cc6765 100644 --- a/lib/model.rb +++ b/lib/model.rb @@ -273,7 +273,7 @@ module OpenTox #prediction[:warnings] << "Closest neighbor has similarity < #{algorithms[:similarity][:warn_min]}. Prediction may be out of applicability domain." #end end - if prediction[:warnings].empty? or threshold < algorithms[:similarity][:min] + if prediction[:warnings].empty? or threshold <= algorithms[:similarity][:min] prediction else # try again with a lower threshold predict_substance substance, 0.2 @@ -309,7 +309,7 @@ module OpenTox # serialize result if object.is_a? Substance prediction = predictions[substances.first.id.to_s] - prediction[:neighbors].sort!{|a,b| b[1] <=> a[1]} # sort according to similarity + prediction[:neighbors].sort!{|a,b| b[1] <=> a[1]} if prediction[:neighbors]# sort according to similarity return prediction elsif object.is_a? Array return predictions -- cgit v1.2.3