diff options
author | Christoph Helma <helma@in-silico.ch> | 2016-05-13 13:38:24 +0200 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2016-05-13 13:38:24 +0200 |
commit | c90644211e214a50f6fdb3a936bf247f45f1f4be (patch) | |
tree | 9ae3f0b33feb55f3904c4d7a08e39567223b07aa /lib/validation.rb | |
parent | b8bb12c8a163c238d7d4387c1914e2100bb660df (diff) |
compound tests fixed
Diffstat (limited to 'lib/validation.rb')
-rw-r--r-- | lib/validation.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/validation.rb b/lib/validation.rb index 015e718..9122df1 100644 --- a/lib/validation.rb +++ b/lib/validation.rb @@ -32,20 +32,14 @@ module OpenTox predictions = validation_model.predict test_set.substances predictions.each{|cid,p| p.delete(:neighbors)} nr_unpredicted = 0 - p predictions.size predictions.each do |cid,prediction| - p prediction if prediction[:value] - tox = Substance.find(cid).toxicities[prediction[:prediction_feature_id].to_s] - p tox - #prediction[:measured] = Substance.find(cid).toxicities[prediction[:prediction_feature_id].to_s][test_set.id.to_s] - prediction[:measured] = tox[test_set.id.to_s] if tox + prediction[:measured] = test_set.values(cid, prediction[:prediction_feature_id]) else nr_unpredicted += 1 end - predictions.delete(cid) unless prediction[:value] and prediction[:measured] end - p predictions.size + predictions.select!{|cid,p| p[:value] and p[:measured]} validation = self.new( :model_id => validation_model.id, :test_dataset_id => test_set.id, |