summaryrefslogtreecommitdiff
path: root/lib/crossvalidation.rb
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2016-07-25 15:53:22 +0200
committerChristoph Helma <helma@in-silico.ch>2016-07-25 15:53:22 +0200
commit46c628f1757ce8274a0b277b3ec3306609b38c14 (patch)
tree92f66426189ff7fd612057d88428fa7cb0505a45 /lib/crossvalidation.rb
parentf93aad7227c7bb3702fd28aab2d289f1ca9ce7e9 (diff)
local_weighted_average fallback fixed, cv predictions pulled from validations to avoid mongo document size errors
Diffstat (limited to 'lib/crossvalidation.rb')
-rw-r--r--lib/crossvalidation.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/crossvalidation.rb b/lib/crossvalidation.rb
index 7aae3d2..d7a1f08 100644
--- a/lib/crossvalidation.rb
+++ b/lib/crossvalidation.rb
@@ -18,7 +18,7 @@ module OpenTox
cv.save # set created_at
nr_instances = 0
nr_unpredicted = 0
- predictions = {}
+ #predictions = {}
training_dataset = Dataset.find model.training_dataset_id
training_dataset.folds(n).each_with_index do |fold,fold_nr|
#fork do # parallel execution of validations can lead to Rserve and memory problems
@@ -28,7 +28,7 @@ module OpenTox
cv.validation_ids << validation.id
cv.nr_instances += validation.nr_instances
cv.nr_unpredicted += validation.nr_unpredicted
- cv.predictions.merge! validation.predictions
+ #cv.predictions.merge! validation.predictions
$logger.debug "Dataset #{training_dataset.name}, Fold #{fold_nr}: #{Time.now-t} seconds"
#end
end
@@ -47,6 +47,12 @@ module OpenTox
def validations
validation_ids.collect{|vid| TrainTest.find vid}
end
+
+ def predictions
+ predictions = {}
+ validations.each{|v| predictions.merge!(v.predictions)}
+ predictions
+ end
end
class ClassificationCrossValidation < CrossValidation