From 5d4e5e463c2b87241bbb56e4658e1e26c0ed084f Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Wed, 5 Oct 2016 13:22:12 +0200 Subject: substance and nanoparticle model creation and predictions --- lib/algorithm.rb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'lib/algorithm.rb') diff --git a/lib/algorithm.rb b/lib/algorithm.rb index 113f847..0e4b93a 100644 --- a/lib/algorithm.rb +++ b/lib/algorithm.rb @@ -2,18 +2,9 @@ module OpenTox module Algorithm - # Generic method to execute algorithms - # Algorithms should: - # - accept a Compound, an Array of Compounds or a Dataset as first argument - # - optional parameters as second argument - # - return an object corresponding to the input type as result (eg. Compound -> value, Array of Compounds -> Array of values, Dataset -> Dataset with values - # @param [OpenTox::Compound,Array,OpenTox::Dataset] Input object - # @param [Hash] Algorithm parameters - # @return Algorithm result - def self.run algorithm, object, parameters=nil - bad_request_error "Cannot run '#{algorithm}' algorithm. Please provide an OpenTox::Algorithm." unless algorithm =~ /^OpenTox::Algorithm/ + def self.run algorithm, parameters=nil klass,method = algorithm.split('.') - parameters.nil? ? Object.const_get(klass).send(method,object) : Object.const_get(klass).send(method,object, parameters) + Object.const_get(klass).send(method,parameters) end end -- cgit v1.2.3