diff options
| author | Christoph Helma <helma@in-silico.ch> | 2013-03-27 17:11:50 +0100 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2013-03-27 17:11:50 +0100 |
| commit | 84417ada7c4d0a3b44ed35a8eee60db2e1e751f6 (patch) | |
| tree | 66ae142b5b8a74a0459062cbd12f3629448f897f /lib/model.rb | |
| parent | a54db46684680d98311631804eca367cc949a715 (diff) | |
validation tests ok
Diffstat (limited to 'lib/model.rb')
| -rw-r--r-- | lib/model.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/model.rb b/lib/model.rb index 144c8c3..a354cfa 100644 --- a/lib/model.rb +++ b/lib/model.rb @@ -13,9 +13,8 @@ module OpenTox def feature_type # CH: subjectid is a object variable, no need to pass it as a parameter unless @feature_type - get unless metadata[OT.dependentVariables.to_s] - bad_request_error "Cannot determine feature type, dependent variable missing in model #{@uri}" unless metadata[OT.dependentVariables.to_s] - @feature_type = OpenTox::Feature.new( metadata[OT.dependentVariables.to_s][0], @subjectid ).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 end @feature_type end @@ -32,8 +31,8 @@ module OpenTox private def load_predicted_variables - metadata[OT.predictedVariables.to_s].each do |f| - feat = OpenTox::Feature.find( f, @subjectid ) + metadata[RDF::OT.predictedVariables].each do |f| + feat = OpenTox::Feature.new( f, @subjectid ) if feat.title =~ /confidence/ @predicted_confidence = f else |