diff options
author | Martin Gütlein <martin.guetlein@gmail.com> | 2010-04-27 12:07:28 +0200 |
---|---|---|
committer | Martin Gütlein <martin.guetlein@gmail.com> | 2010-04-27 12:07:28 +0200 |
commit | d611b4c8e4d0a7e414afb55bb716d3d34969e7de (patch) | |
tree | c35d05ef78913ed7d53ba1679c431e5641af1233 | |
parent | 131a58b5f51a093b79161d2bf85e33fe3f974f76 (diff) |
small changes
-rw-r--r-- | lib/test_util.rb | 2 | ||||
-rw-r--r-- | nightly/nightly.rb | 4 | ||||
-rw-r--r-- | validation/validation_application.rb | 6 | ||||
-rw-r--r-- | validation/validation_test.rb | 6 |
4 files changed, 6 insertions, 12 deletions
diff --git a/lib/test_util.rb b/lib/test_util.rb index d7eda52..2d10b6b 100644 --- a/lib/test_util.rb +++ b/lib/test_util.rb @@ -13,7 +13,7 @@ module Lib if OpenTox::Utils.task_uri?(uri) task = OpenTox::Task.find(uri) task.wait_for_completion - raise "task failed: "+uri.to_s if task.error? + raise "task failed: "+uri.to_s+", error is:\n"+task.description if task.error? uri = task.resultURI end return uri diff --git a/nightly/nightly.rb b/nightly/nightly.rb index e2a1ea0..08f33e4 100644 --- a/nightly/nightly.rb +++ b/nightly/nightly.rb @@ -16,12 +16,12 @@ class Nightly end def self.build_nightly - OpenTox::Task.as_task do + OpenTox::Task.as_task() do LOGGER.info("Building nightly report") benchmarks = [ HamsterTrainingTestBenchmark.new, MiniRegressionBenchmark.new, - FatheadRegressionBenchmark.new, + #FatheadRegressionBenchmark.new, ] running = [] diff --git a/validation/validation_application.rb b/validation/validation_application.rb index cde7e4b..755d056 100644 --- a/validation/validation_application.rb +++ b/validation/validation_application.rb @@ -6,12 +6,6 @@ end require 'validation/validation_service.rb' require 'lib/merge.rb' -# hack: store self in $sinatra to make url_for method accessible in validation_service -# (before is executed in every rest call, problem is that the request object is not set, until the first rest-call ) -before {$sinatra = self unless $sinatra} - - - get '/crossvalidation/?' do LOGGER.info "list all crossvalidations" diff --git a/validation/validation_test.rb b/validation/validation_test.rb index b941b33..ddfcc1c 100644 --- a/validation/validation_test.rb +++ b/validation/validation_test.rb @@ -19,14 +19,14 @@ 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" #puts last_response.body #prepare_examples - do_test_examples # USES CURL, DO NOT FORGET TO RESTART VALIDATION SERVICE + #do_test_examples # USES CURL, DO NOT FORGET TO RESTART VALIDATION SERVICE #ex = ex_ntua #ex = ex_ntua2 @@ -441,7 +441,7 @@ class ValidationTest < Test::Unit::TestCase # post '/training_test_split', { :dataset_uri => data_uri, :algorithm_uri => WS_CLASS_ALG, :prediction_feature => FEATURE_URI, # :algorithm_params => "feature_generation_uri="+WS_FEATURE_ALG, :split_ratio=>0.75, :random_seed=>6} post '/training_test_split', { :dataset_uri => ex.orig_data, :algorithm_uri => ex.alg, :prediction_feature => ex.act_feat, - :algorithm_params => ex.alg_params, :split_ratio=>0.75, :random_seed=>6} + :algorithm_params => ex.alg_params, :split_ratio=>0.75, :random_seed=>6 } puts last_response.body |