default validations fixed

1 files changed, 2 insertions, 3 deletions

diff --git a/lib/model.rb b/lib/model.rb
index 841ab20..5b094fb 100644
--- a/lib/model.rb
+++ b/lib/model.rb
@@ -41,7 +41,7 @@ module OpenTox
         toxicities = []
         substances = []
         training_dataset.substances.each do |s|
-          s["toxicities"][prediction_feature_id].each do |act|
+          s["toxicities"][prediction_feature_id][training_dataset_id.to_s].each do |act|
             toxicities << act
             substances << s
           end
@@ -76,8 +76,7 @@ module OpenTox
         prediction = {}
         if neighbors.collect{|n| n["_id"]}.include? compound.id
 
-          #TODO restrict to dataset features
-          database_activities = neighbors.select{|n| n["_id"] == compound.id}.first["toxicities"][prediction_feature.id.to_s].uniq
+          database_activities = neighbors.select{|n| n["_id"] == compound.id}.first["toxicities"][prediction_feature.id.to_s][training_dataset_id.to_s].uniq
           prediction[:database_activities] = database_activities
           prediction[:warning] = "#{database_activities.size} compounds have been removed from neighbors, because they have the same structure as the query compound."
           neighbors.delete_if{|n| n["_id"] == compound.id}