From 7856b7f17ff65bebe078115d32325bef3e9cebdf Mon Sep 17 00:00:00 2001 From: mguetlein Date: Thu, 10 Feb 2011 15:50:25 +0100 Subject: add waiting task for tests, add new ambit example --- test/test_application.rb | 11 ++++++----- test/test_examples.rb | 28 ++++++++++++++++++++++++++++ test/test_examples_util.rb | 12 ++++++------ validation/validation_test.rb | 2 +- 4 files changed, 41 insertions(+), 12 deletions(-) diff --git a/test/test_application.rb b/test/test_application.rb index d1b0458..f255d1d 100755 --- a/test/test_application.rb +++ b/test/test_application.rb @@ -2,16 +2,17 @@ post '/test_validation/?' do validationExamples = ValidationExamples.select(params[:select]) return "please \"select\" a single validation example:\n"+ValidationExamples.list if validationExamples.size!=1 or validationExamples[0].size!=1 - task = OpenTox::Task.create("Test validation",url_for("/test_validation",:full)) do #,params + task = OpenTox::Task.create("Test validation",url_for("/test_validation",:full)) do |task| v = validationExamples[0][0] ex = v.new ex.subjectid = @subjectid ex.upload_files + task.progress(10) ex.check_requirements - ex.validate - raise ex.validation_error if ex.validation_error - ex.report unless params[:report]=="false" - raise ex.report_error if ex.report_error + ex.validate(OpenTox::SubTask.create(task,10,80)) + #raise ex.validation_error if ex.validation_error + ex.report(OpenTox::SubTask.create(task,80,99)) unless params[:report]=="false" + #raise ex.report_error if ex.report_error if ex.report_uri ex.report_uri else diff --git a/test/test_examples.rb b/test/test_examples.rb index fb6db4c..cfedcbd 100755 --- a/test/test_examples.rb +++ b/test/test_examples.rb @@ -387,6 +387,30 @@ module ValidationExamples end + ######################################################################################################## + + class AmbitTrainingTest < TrainingTestValidation + def initialize + #@model_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/model/29139" + @training_dataset_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/dataset/R401560" + @test_dataset_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/dataset/R401560" + @prediction_feature = "https://ambit.uni-plovdiv.bg:8443/ambit2/feature/22190" + @algorithm_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/algorithm/LR" + end + end + + ######################################################################################################## + + class AmbitTrainingTestSplit < SplitTestValidation + def initialize + #@model_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/model/29139" + @dataset_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/dataset/R401560" + #@test_dataset_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/dataset/R401560" + @prediction_feature = "https://ambit.uni-plovdiv.bg:8443/ambit2/feature/22190" + @algorithm_uri = "https://ambit.uni-plovdiv.bg:8443/ambit2/algorithm/LR" + end + end + ######################################################################################################## @@ -522,6 +546,10 @@ module ValidationExamples "18a" => [ TumModel ], "19a" => [ AmbitModel ], + + "20a" => [ AmbitTrainingTest ], + + "21a" => [ AmbitTrainingTestSplit ], } def self.list diff --git a/test/test_examples_util.rb b/test/test_examples_util.rb index 51cf4cc..d596a9a 100755 --- a/test/test_examples_util.rb +++ b/test/test_examples_util.rb @@ -54,14 +54,14 @@ module ValidationExamples #end end - def self.validation_post(uri, params, subjectid ) + def self.validation_post(uri, params, subjectid, waiting_task=nil ) params[:subjectid] = subjectid if subjectid if $test_case $test_case.post uri,params return wait($test_case.last_response.body) else - return OpenTox::RestClientWrapper.post(File.join(CONFIG[:services]["opentox-validation"],uri),params).to_s + return OpenTox::RestClientWrapper.post(File.join(CONFIG[:services]["opentox-validation"],uri),params,nil,waiting_task).to_s end end @@ -292,9 +292,9 @@ module ValidationExamples end end - def report + def report( waiting_task=nil ) #begin - @report_uri = Util.validation_post '/report/'+report_type,{:validation_uris => @validation_uri}, @subjectid if @validation_uri + @report_uri = Util.validation_post '/report/'+report_type,{:validation_uris => @validation_uri},@subjectid,waiting_task if @validation_uri Util.validation_get "/report/"+report_uri.split("/")[-2]+"/"+report_uri.split("/")[-1], @subjectid if @report_uri #rescue => ex #puts "could not create report: "+ex.message @@ -303,9 +303,9 @@ module ValidationExamples #end end - def validate + def validate( waiting_task=nil ) #begin - @validation_uri = Util.validation_post '/'+validation_type, get_params, @subjectid + @validation_uri = Util.validation_post '/'+validation_type, get_params, @subjectid, waiting_task #rescue => ex #puts "could not validate: "+ex.message #@validation_error = ex.message diff --git a/validation/validation_test.rb b/validation/validation_test.rb index e98a4d1..e39dbeb 100755 --- a/validation/validation_test.rb +++ b/validation/validation_test.rb @@ -156,7 +156,7 @@ class ValidationTest < Test::Unit::TestCase # puts d.compounds.inspect # exit - run_test("5a",:validation_uri=>"http://local-ot/validation/253") #,"http://local-ot/validation/28")#,"http://local-ot/validation/394"); + run_test("21a")#,:validation_uri=>"http://local-ot/validation/253") #,"http://local-ot/validation/28")#,"http://local-ot/validation/394"); #run_test("3b",:validation_uri=>"http://local-ot/validation/crossvalidation/45") #,{:dataset_uri => "http://local-ot/dataset/773", :prediction_feature => "http://local-ot/dataset/773/feature/Hamster%20Carcinogenicity"}) -- cgit v1.2.3