Merge remote-tracking branch 'origin/development'

1 files changed, 3 insertions, 10 deletions

diff --git a/lib/train-test-validation.rb b/lib/train-test-validation.rb
index 9a5532d..d034cd1 100644
--- a/lib/train-test-validation.rb
+++ b/lib/train-test-validation.rb
@@ -18,22 +18,15 @@ module OpenTox
         validation_model = model.class.create prediction_feature: model.prediction_feature, training_dataset: training_set, algorithms: model.algorithms
         validation_model.save
         predictions = validation_model.predict test_set.substances
-        nr_unpredicted = 0
         predictions.each do |cid,prediction|
-          if prediction[:value]
-            prediction[:measurements] = test_set.values(cid, prediction[:prediction_feature_id])
-          else
-            nr_unpredicted += 1
-          end
+          prediction[:measurements] = test_set.values(cid, prediction[:prediction_feature_id]) if prediction[:value]
         end
         predictions.select!{|cid,p| p[:value] and p[:measurements]}
-        # hack to avoid mongos file size limit error on large datasets
-        #predictions.each{|cid,p| p[:neighbors] = []} if model.training_dataset.name.match(/mutagenicity/i)
+        # remove neighbors to avoid mongos file size limit error on large datasets
+        predictions.each{|cid,p| p.delete(:neighbors)} #if model.training_dataset.name.match(/mutagenicity/i)
         validation = self.new(
           :model_id => validation_model.id,
           :test_dataset_id => test_set.id,
-          :nr_instances => test_set.substances.size,
-          :nr_unpredicted => nr_unpredicted,
           :predictions => predictions
         )
         validation.save