summaryrefslogtreecommitdiff
path: root/validation
diff options
context:
space:
mode:
authormguetlein <martin.guetlein@gmail.com>2010-08-19 11:26:00 +0200
committermguetlein <martin.guetlein@gmail.com>2010-08-19 11:26:00 +0200
commitf4c065998f6c918e67058b05ac17778cfbc57f58 (patch)
treebe4a6cf71c7177bdb306344e052b456aa73b454e /validation
parent0f5cc11dcecf6eda0a7230d69aa346cfb86c6a49 (diff)
task title and creator, reach report minor fixes
Diffstat (limited to 'validation')
-rw-r--r--validation/validation_application.rb8
-rw-r--r--validation/validation_test.rb2
2 files changed, 5 insertions, 5 deletions
diff --git a/validation/validation_application.rb b/validation/validation_application.rb
index 263c88c..2da9694 100644
--- a/validation/validation_application.rb
+++ b/validation/validation_application.rb
@@ -100,7 +100,7 @@ end
post '/crossvalidation/?' do
content_type "text/uri-list"
- task_uri = OpenTox::Task.as_task do
+ task_uri = OpenTox::Task.as_task( "Perform crossvalidation", url_for("/crossvalidation", :full) ) do
LOGGER.info "creating crossvalidation "+params.inspect
halt 400, "dataset_uri missing" unless params[:dataset_uri]
halt 400, "algorithm_uri missing" unless params[:algorithm_uri]
@@ -153,7 +153,7 @@ end
post '/?' do
content_type "text/uri-list"
- task_uri = OpenTox::Task.as_task do |task|
+ task_uri = OpenTox::Task.as_task( "Perform validation", url_for("/", :full) ) do |task|
LOGGER.info "creating validation "+params.inspect
if params[:model_uri] and params[:test_dataset_uri] and !params[:training_dataset_uri] and !params[:algorithm_uri]
v = Validation::Validation.new :model_uri => params[:model_uri],
@@ -182,7 +182,7 @@ end
post '/training_test_split' do
content_type "text/uri-list"
- task_uri = OpenTox::Task.as_task do
+ task_uri = OpenTox::Task.as_task( "Perform training test split validation", url_for("/training_test_split", :full) ) do
LOGGER.info "creating training test split "+params.inspect
halt 400, "dataset_uri missing" unless params[:dataset_uri]
halt 400, "algorithm_uri missing" unless params[:algorithm_uri]
@@ -213,7 +213,7 @@ end
post '/validate_datasets' do
content_type "text/uri-list"
- task_uri = OpenTox::Task.as_task do
+ task_uri = OpenTox::Task.as_task( "Perform dataset validation", url_for("/validate_datasets", :full) ) do
LOGGER.info "validating values "+params.inspect
halt 400, "test_dataset_uri missing" unless params[:test_dataset_uri]
halt 400, "prediction_datset_uri missing" unless params[:prediction_dataset_uri]
diff --git a/validation/validation_test.rb b/validation/validation_test.rb
index 53aeeb0..d96c012 100644
--- a/validation/validation_test.rb
+++ b/validation/validation_test.rb
@@ -59,7 +59,7 @@ class ValidationTest < Test::Unit::TestCase
# #:classification=>"true"}
# puts last_response.body
- run_test("1b") #, "http://localhost/validation/crossvalidation/5" )# //localhost/validation/42")#, "http://localhost/validation/report/validation/8") #,"http://localhost/validation/report/validation/36") #, "http://localhost/validation/321")
+ #run_test("1a") #, "http://localhost/validation/crossvalidation/5" )# //localhost/validation/42")#, "http://localhost/validation/report/validation/8") #,"http://localhost/validation/report/validation/36") #, "http://localhost/validation/321")
# run_test("7a","http://localhost/validation/40") #,"http://localhost/validation/crossvalidation/10") #, "http://localhost/validation/321")