From d182e4f3d666ad2586161c2ae84775148d3c11ad Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Fri, 19 Oct 2012 15:57:11 +0200 Subject: Support for subgraphs as numeric values --- lib/dataset.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/dataset.rb') diff --git a/lib/dataset.rb b/lib/dataset.rb index c52952f..85b942a 100644 --- a/lib/dataset.rb +++ b/lib/dataset.rb @@ -48,7 +48,10 @@ module OpenTox pattern [:uri, RDF::OLO.index, :idx] end @features = query.execute(@rdf).sort_by{|s| s.idx}.collect{|s| OpenTox::Feature.new(s.uri.to_s)} - numeric_features = @features.collect{|f| f.get; f[RDF.type].include? RDF::OT.NumericFeature} + numeric_features = @features.collect{|f| + f.get + f[RDF.type].include?(RDF::OT.NumericFeature) or f[RDF.type].include?(RDF::OT.Substructure) + } @compounds.each_with_index do |compound,i| query = RDF::Query.new do pattern [:data_entry, RDF::OLO.index, i] @@ -58,7 +61,7 @@ module OpenTox pattern [:values, RDF::OT.value, :value] end values = query.execute(@rdf).sort_by{|s| s.feature_idx}.collect do |s| - (numeric_features[s.feature_idx] and s.value.to_s != "") ? s.value.to_s.to_f : s.value.to_s + (numeric_features[s.feature_idx] and s.value.to_s != "") ? s.value.to_s.to_f : s.value.to_s end @data_entries << values.collect{|v| v == "" ? nil : v} end -- cgit v1.2.3