diff options
| author | Christoph Helma <helma@in-silico.ch> | 2010-06-29 12:21:56 +0200 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2010-06-29 12:21:56 +0200 |
| commit | 80cb52f477870bd78b0f92e69650872da56fb1a5 (patch) | |
| tree | b6c97028d23ebd10ccb550211e5eab8648832301 /application.rb | |
| parent | 01121930d390e849d9102ff0da58236460ca1409 (diff) | |
| parent | b27d0f1e805f2c85194b851cea44c156469df6e6 (diff) | |
Merge branch 'master' into development
Conflicts:
application.rb
Diffstat (limited to 'application.rb')
| -rw-r--r-- | application.rb | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/application.rb b/application.rb index 4f7aadd..fecdb63 100644 --- a/application.rb +++ b/application.rb @@ -127,18 +127,14 @@ post '/upload' do # create a new model # redirect url_for('/create') #end -=begin - unless @@config[:services]["opentox-model"].match(/localhost/) - validation_task_uri = OpenTox::Validation.crossvalidation( - :algorithm_uri => OpenTox::Algorithm::Lazar.uri, - :dataset_uri => parser.dataset_uri, - :prediction_feature => feature_uri, - :algorithm_params => "feature_generation_uri=#{OpenTox::Algorithm::Fminer.uri}" - ).uri - LOGGER.debug "Validation task: " + validation_task_uri - @model.validation_task_uri = validation_task_uri - end -=end + validation_task_uri = OpenTox::Validation.crossvalidation( + :algorithm_uri => OpenTox::Algorithm::Lazar.uri, + :dataset_uri => parser.dataset_uri, + :prediction_feature => feature_uri, + :algorithm_params => "feature_generation_uri=#{OpenTox::Algorithm::Fminer.uri}" + ).uri + LOGGER.debug "Validation task: " + validation_task_uri + @model.validation_task_uri = validation_task_uri =begin if parser.nr_compounds < 10 |