diff options
author | Christoph Helma <helma@in-silico.ch> | 2013-05-29 15:12:52 +0200 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2013-05-29 15:12:52 +0200 |
commit | f2ef6216ef785656d799c880f22013f6c7e900e7 (patch) | |
tree | fa7d72d434c9cb70483222aa4bc7f580e0bd8fa9 /lib/algorithm.rb | |
parent | 0f770837cbfe17fe17fc86aa0d360c55e281c7f7 (diff) | |
parent | ef122484598a8979de915344cdeff475cff752c5 (diff) |
Merge branch 'development' of github.com:opentox/opentox-client into development
Conflicts:
lib/compound.rb
Diffstat (limited to 'lib/algorithm.rb')
-rw-r--r-- | lib/algorithm.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/algorithm.rb b/lib/algorithm.rb index 455e9ad..530296a 100644 --- a/lib/algorithm.rb +++ b/lib/algorithm.rb @@ -5,7 +5,7 @@ module OpenTox # Execute algorithm with parameters, please consult the OpenTox API and the webservice documentation for acceptable parameters # @param [optional,Hash] params Algorithm parameters - # @param [optional,OpenTox::Task] waiting_task (can be a OpenTox::Subtask as well), progress is updated accordingly + # @param [optional,Boolean] set to true if method should wait for task result # @return [String] URI of new resource (dataset, model, ...) def run params=nil, wait=true uri = RestClientWrapper.post @uri, params, { :content_type => "text/uri-list", :subjectid => @subjectid} |