summaryrefslogtreecommitdiff
path: root/lib/algorithm.rb
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2013-07-10 14:36:39 +0200
committerChristoph Helma <helma@in-silico.ch>2013-07-10 14:36:39 +0200
commitddb83b4302e8628b333402d24e3e05fc90b3faef (patch)
tree39c8645d09f6e1ecee1d97ae4faa21e399e17ad4 /lib/algorithm.rb
parent3262e3cf2ed1ce896dcd11d9c1bde5222ea720ce (diff)
subjectids partially removed
Diffstat (limited to 'lib/algorithm.rb')
-rw-r--r--lib/algorithm.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/algorithm.rb b/lib/algorithm.rb
index 5cffa88..a725141 100644
--- a/lib/algorithm.rb
+++ b/lib/algorithm.rb
@@ -9,7 +9,7 @@ module OpenTox
# @param [optional,Boolean] wait set to false if method should return a task uri instead of the algorithm 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}
+ uri = RestClientWrapper.post @uri, params, { :content_type => "text/uri-list", :subjectid => SUBJECTID}
wait_for_task uri if wait
end
@@ -29,11 +29,11 @@ module OpenTox
when "Array"
klasses = compounds.collect{|c| c.class}.uniq
bad_request_error "First argument contains objects with a different class than OpenTox::Compound or OpenTox::Dataset #{klasses.inspect}" unless klasses.size == 1 and klasses.first == Compound
- JSON.parse(Descriptor.new(File.join(self.service_uri, "descriptor", descriptor.to_s), SUBJECTID).run(:compound_uri => compounds.collect{|c| c.uri}, :descriptors => descriptors))
+ JSON.parse(Descriptor.new(File.join(self.service_uri, "descriptor", descriptor.to_s)).run(:compound_uri => compounds.collect{|c| c.uri}, :descriptors => descriptors))
when "OpenTox::Compound"
- JSON.parse(Descriptor.new(File.join(self.service_uri, "descriptor", descriptor.to_s), SUBJECTID).run(:compound_uri => compounds.uri, :descriptors => descriptors))
+ JSON.parse(Descriptor.new(File.join(self.service_uri, "descriptor", descriptor.to_s)).run(:compound_uri => compounds.uri, :descriptors => descriptors))
when "OpenTox::Dataset"
- task_uri = Descriptor.new(File.join(self.service_uri, "descriptor", descriptor.to_s), SUBJECTID).run(:dataset_uri => compounds.uri, :descriptors => descriptors)
+ task_uri = Descriptor.new(File.join(self.service_uri, "descriptor", descriptor.to_s)).run(:dataset_uri => compounds.uri, :descriptors => descriptors)
Dataset.new(wait_for_task task_uri)
else
bad_request_error "First argument contains objects with a different class than OpenTox::Compound or OpenTox::Dataset"