From 4f15bab6c8598b81a5514fdb631834b637bf1ef0 Mon Sep 17 00:00:00 2001 From: mguetlein Date: Mon, 23 May 2011 16:49:50 +0200 Subject: fix read predicted variables in crossvaldation --- validation/validation_service.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/validation/validation_service.rb b/validation/validation_service.rb index e0c520e..f713120 100755 --- a/validation/validation_service.rb +++ b/validation/validation_service.rb @@ -40,12 +40,13 @@ module Validation raise OpenTox::BadRequestError.new "Crossvalidation '"+cv_id.to_s+"' not finished" unless crossvalidation.finished vals = Validation.find( :crossvalidation_id => cv_id, :validation_type => "crossvalidation" ).collect{|x| x} - feature_type = OpenTox::Model::Generic.new(vals.first.model_uri).feature_type(subjectid) + models = vals.collect{|v| OpenTox::Model::Generic.find(v.model_uri)} + feature_type = models.first.feature_type(subjectid) test_dataset_uris = vals.collect{|v| v.test_dataset_uri} test_target_dataset_uris = vals.collect{|v| v.test_target_dataset_uri} prediction_feature = vals.first.prediction_feature prediction_dataset_uris = vals.collect{|v| v.prediction_dataset_uri} - predicted_variables = vals.collect{|v| nil} + predicted_variables = models.collect{|m| m.metadata[OT.predictedVariables]} prediction = Lib::OTPredictions.new( feature_type, test_dataset_uris, test_target_dataset_uris, prediction_feature, prediction_dataset_uris, predicted_variables, subjectid ) -- cgit v1.2.3