summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormguetlein <martin.guetlein@gmail.com>2011-05-23 16:49:50 +0200
committermguetlein <martin.guetlein@gmail.com>2011-05-23 16:49:50 +0200
commit4f15bab6c8598b81a5514fdb631834b637bf1ef0 (patch)
tree4ba5ed07305fb5b8043eba9618f86c9cfca13e7f
parent9105a8cd315ae0eb220af8879d4a83ac2fbe3740 (diff)
fix read predicted variables in crossvaldation
-rwxr-xr-xvalidation/validation_service.rb5
1 files 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 )