diff options
| -rw-r--r-- | lib/test_util.rb | 2 | ||||
| -rw-r--r-- | nightly/nightly.rb | 9 | ||||
| -rw-r--r-- | report/validation_access.rb | 2 | ||||
| -rw-r--r-- | validation/validation_test.rb | 33 |
4 files changed, 31 insertions, 15 deletions
diff --git a/lib/test_util.rb b/lib/test_util.rb index 2d10b6b..1da27a5 100644 --- a/lib/test_util.rb +++ b/lib/test_util.rb @@ -33,7 +33,7 @@ module Lib data = File.read(file.path) task_uri = RestClient.post ws, data, :content_type => type - data_uri = task_uri + data_uri = task_uri.body puts "done: "+data_uri.to_s add_resource(data_uri) return data_uri diff --git a/nightly/nightly.rb b/nightly/nightly.rb index 6907191..cfee2e5 100644 --- a/nightly/nightly.rb +++ b/nightly/nightly.rb @@ -224,9 +224,10 @@ class Nightly def build() @algs = [ "http://opentox.ntua.gr:3003/algorithm/mlr", - "http://opentox.informatik.tu-muenchen.de:8080/OpenTox-dev/algorithm/kNNregression" + "http://opentox.informatik.tu-muenchen.de:8080/OpenTox-dev/algorithm/kNNregression", + File.join(@@config[:services]["opentox-majority"],["/regr/algorithm"]) ] - @alg_params = [nil, nil] + @alg_params = [nil, nil, nil] @train_data = "http://ambit.uni-plovdiv.bg:8080/ambit2/dataset/342" @test_data = "http://ambit.uni-plovdiv.bg:8080/ambit2/dataset/342" @pred_feature = "http://ambit.uni-plovdiv.bg:8080/ambit2/feature/103141" @@ -278,8 +279,8 @@ class Nightly end def build() - @algs = [File.join(@@lazar_server,"lazar")] - @alg_params = ["feature_generation_uri="+File.join(@@lazar_server,"fminer")] + @algs = [File.join(@@lazar_server,"lazar"), File.join(@@config[:services]["opentox-majority"],["/class/algorithm"]) ] + @alg_params = ["feature_generation_uri="+File.join(@@lazar_server,"fminer"),nil] @pred_feature = "http://localhost/toxmodel/feature%23Hamster%20Carcinogenicity%20(DSSTOX/CPDB)" LOGGER.debug "pepare hamster datasets" diff --git a/report/validation_access.rb b/report/validation_access.rb index 028e3d5..ffac11d 100644 --- a/report/validation_access.rb +++ b/report/validation_access.rb @@ -139,7 +139,7 @@ class Reports::ValidationWebservice < Reports::ValidationAccess if u.to_s =~ /.*\/crossvalidation\/.*/ uri = u.to_s+"/validations" begin - vali_uri_list = RestClient.get uri + vali_uri_list = RestClientWrapper.get uri rescue => ex raise Reports::BadRequest.new "cannot get validations for cv at '"+uri.to_s+"', error msg: "+ex.message end diff --git a/validation/validation_test.rb b/validation/validation_test.rb index 72778d3..58189bd 100644 --- a/validation/validation_test.rb +++ b/validation/validation_test.rb @@ -19,7 +19,7 @@ class ValidationTest < Test::Unit::TestCase def test_it - Nightly.build_nightly + #Nightly.build_nightly #get "/build_nightly" #get "/nightly" #get '1',nil,'HTTP_ACCEPT' => "application/rdf+xml" @@ -29,15 +29,16 @@ class ValidationTest < Test::Unit::TestCase #do_test_examples # USES CURL, DO NOT FORGET TO RESTART VALIDATION SERVICE #ex = ex_maj_class + #ex = ex_maj_regr #ex = ex_ntua #ex = ex_ntua2 - #ex = ex_tum + ex = ex_tum #ex = ex_local #ex = ex_ambit #create_validation(ex) #validate_model(ex) - #validate_algorithm(ex) + validate_algorithm(ex) #validate_split(ex) #xval(ex) @@ -50,6 +51,20 @@ class ValidationTest < Test::Unit::TestCase Sinatra::Application end + def ex_maj_regr + ex = Example.new + ex.classification = true + + ex.alg = File.join(@@config[:services]["opentox-majority"],"regr/algorithm") + #ex.alg_params = "feature_generation_uri="+File.join(@@config[:services]["opentox-algorithm"],"fminer") + + ex.train_data = "http://ambit.uni-plovdiv.bg:8080/ambit2/dataset/342" + ex.test_data = "http://ambit.uni-plovdiv.bg:8080/ambit2/dataset/342" + ex.act_feat = "http://ambit.uni-plovdiv.bg:8080/ambit2/feature/103141" + + return ex + end + def ex_maj_class ex = Example.new ex.classification = true @@ -167,7 +182,7 @@ class ValidationTest < Test::Unit::TestCase ex.act_feat = "http://ambit.uni-plovdiv.bg:8080/ambit2/feature/103141" # example model - ex.model = "http://opentox.ntua.gr:3003/model/124" + ex.model = "http://opentox.ntua.gr:3003/model/201" #ex.pred_feat = "http://ambit.uni-plovdiv.bg:8080/ambit2/feature/264783" # example prediction data #ex.pred_data = "http://ambit.uni-plovdiv.bg:8080/ambit2/dataset/656" @@ -268,12 +283,12 @@ class ValidationTest < Test::Unit::TestCase get '/crossvalidation/'+crossvalidation_id puts last_response.body - assert last_response.ok? || last_response.status==202 + #assert last_response.ok? || last_response.status==202 - get '/crossvalidation/'+crossvalidation_id+'/validations' - puts "validations:\n"+last_response.body - assert last_response.ok? - assert last_response.body.split("\n").size == num_folds, "num-folds:"+num_folds.to_s+" but num lines is "+last_response.body.split("\n").size.to_s + #get '/crossvalidation/'+crossvalidation_id+'/validations' + #puts "validations:\n"+last_response.body + #assert last_response.ok? + # assert last_response.body.split("\n").size == num_folds, "num-folds:"+num_folds.to_s+" but num lines is "+last_response.body.split("\n").size.to_s # if first_validation # # assert that both cross validaitons use the same datasets |