diff options
author | Andreas Maunz <andreas@maunz.de> | 2012-10-30 16:51:22 +0100 |
---|---|---|
committer | Andreas Maunz <andreas@maunz.de> | 2012-10-30 16:51:22 +0100 |
commit | 3c7161c8c7ff4193245eb4a7b428712def99b22e (patch) | |
tree | 90aab511a6d938889bca03274895ed090fdc7c5d /lib/dataset.rb | |
parent | 6c680de98c58ab1628adbf851741f59433cb130e (diff) |
rdf tools turned to dynamic
Diffstat (limited to 'lib/dataset.rb')
-rw-r--r-- | lib/dataset.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/dataset.rb b/lib/dataset.rb index 8d135a6..4351dc5 100644 --- a/lib/dataset.rb +++ b/lib/dataset.rb @@ -38,14 +38,14 @@ module OpenTox # AM: read ordered dataset from RDF if ordered @uri = s[0].uri.to_s if have_rdf # AM: must rewrite URI - @compounds = OpenTox::Dataset.find_compounds_rdf(@rdf) - @features = OpenTox::Dataset.find_features_rdf(@rdf) + @compounds = find_compounds_rdf + @features = find_features_rdf numeric_features = @features.collect{|f| f.get f[RDF.type].include?(RDF::OT.NumericFeature) or f[RDF.type].include?(RDF::OT.Substructure) } if have_rdf - table = OpenTox::Dataset.find_data_entries_rdf(@rdf) + table = find_data_entries_rdf else values = OpenTox::Dataset.find_data_entries_sparql(@uri) table = values + Array.new(@compounds.size*@features.size-values.size, "") |