diff options
author | Christoph Helma <helma@in-silico.ch> | 2013-07-10 14:36:39 +0200 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2013-07-10 14:36:39 +0200 |
commit | ddb83b4302e8628b333402d24e3e05fc90b3faef (patch) | |
tree | 39c8645d09f6e1ecee1d97ae4faa21e399e17ad4 /lib/model.rb | |
parent | 3262e3cf2ed1ce896dcd11d9c1bde5222ea720ce (diff) |
subjectids partially removed
Diffstat (limited to 'lib/model.rb')
-rw-r--r-- | lib/model.rb | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/model.rb b/lib/model.rb index c2914eb..356f4e4 100644 --- a/lib/model.rb +++ b/lib/model.rb @@ -1,21 +1,11 @@ module OpenTox module Model -=begin - # Run a model with parameters - # @param params [Hash] Parameters for OpenTox model - # @param wait [optional,OpenTox::Task] waiting_task (can be a OpenTox::Subtask as well), progress is updated accordingly - # @return [text/uri-list] Task or resource URI - def run params=nil, wait=true - uri = RestClientWrapper.post @uri, params, { :content_type => "text/uri-list", :subjectid => @subjectid} - wait_for_task uri if wait - end -=end - def feature_type # CH: subjectid is a object variable, no need to pass it as a parameter + def feature_type unless @feature_type bad_request_error "Cannot determine feature type, dependent variable missing in model #{@uri}" unless metadata[RDF::OT.dependentVariables] - @feature_type = OpenTox::Feature.new( metadata[RDF::OT.dependentVariables][0], @subjectid ).feature_type + @feature_type = OpenTox::Feature.new( metadata[RDF::OT.dependentVariables][0]).feature_type end @feature_type end @@ -33,7 +23,7 @@ module OpenTox private def load_predicted_variables metadata[RDF::OT.predictedVariables].each do |f| - feat = OpenTox::Feature.new( f, @subjectid ) + feat = OpenTox::Feature.new( f) if feat.title =~ /confidence/ @predicted_confidence = f else |