From 4a4b743704b819dec39c672d9550038f45484160 Mon Sep 17 00:00:00 2001 From: mguetlein Date: Wed, 4 Jan 2012 12:23:33 +0100 Subject: fix validation aa errors, add more verbose error msg for propbabilites feature --- validation/validation_application.rb | 6 ++++-- validation/validation_service.rb | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/validation/validation_application.rb b/validation/validation_application.rb index f126679..c02b5f3 100755 --- a/validation/validation_application.rb +++ b/validation/validation_application.rb @@ -193,6 +193,7 @@ end get '/crossvalidation/:id/statistics/probabilities' do LOGGER.info "get crossvalidation statistics for crossvalidation with id "+params[:id].to_s + raise OpenTox::BadRequestError.new("Missing params, plz give confidence and prediction") unless params[:confidence] and params[:prediction] v = Validation::Validation.from_cv_statistics( params[:id], @subjectid ) props = v.probabilities(params[:confidence].to_s.to_f,params[:prediction].to_s) content_type "text/x-yaml" @@ -585,10 +586,11 @@ get '/:id/probabilities' do begin validation = Validation::Validation.get(params[:id]) rescue ActiveRecord::RecordNotFound => ex - raise OpenTox::NotFoundError.new "Validation '#{params[:id]}' not found." + raise OpenTox::NotFoundError.new("Validation '#{params[:id]}' not found.") end validation.subjectid = @subjectid - raise OpenTox::BadRequestError.new "Validation '"+params[:id].to_s+"' not finished" unless validation.finished + raise OpenTox::BadRequestError.new("Validation '"+params[:id].to_s+"' not finished") unless validation.finished + raise OpenTox::BadRequestError.new("Missing params, plz give confidence and prediction") unless params[:confidence] and params[:prediction] props = validation.probabilities(params[:confidence].to_s.to_f,params[:prediction].to_s) content_type "text/x-yaml" props.to_yaml diff --git a/validation/validation_service.rb b/validation/validation_service.rb index 7f853ca..889c652 100755 --- a/validation/validation_service.rb +++ b/validation/validation_service.rb @@ -41,6 +41,7 @@ module Validation vals = Validation.find( :crossvalidation_id => cv_id, :validation_type => "crossvalidation" ).collect{|x| x} v = Validation.new + v.subjectid = subjectid v.compute_prediction_data_with_cv(vals, waiting_task) v.compute_validation_stats() @@ -54,6 +55,7 @@ module Validation v.real_runtime = vals.collect{ |vv| vv.real_runtime }.uniq.join(";") v.save end + v.subjectid = subjectid waiting_task.progress(100) if waiting_task v end -- cgit v1.2.3