summaryrefslogtreecommitdiff
path: root/lib/utils/rdf/dataset.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/utils/rdf/dataset.rb')
-rw-r--r--lib/utils/rdf/dataset.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/utils/rdf/dataset.rb b/lib/utils/rdf/dataset.rb
index ab720d7..e101b67 100644
--- a/lib/utils/rdf/dataset.rb
+++ b/lib/utils/rdf/dataset.rb
@@ -11,29 +11,29 @@ module OpenTox
# Load features via RDF (slow)
# @param [String] uri Dataset URI
# @return [Array] features Features in order
- def self.find_features_rdf(rdf)
+ def find_features_rdf
query = RDF::Query.new do
pattern [:uri, RDF.type, RDF::OT.Feature]
pattern [:uri, RDF::OLO.index, :idx]
end
- query.execute(rdf).sort_by{|s| s.idx}.collect{|s| OpenTox::Feature.new(s.uri.to_s)}
+ query.execute(@rdf).sort_by{|s| s.idx}.collect{|s| OpenTox::Feature.new(s.uri.to_s)}
end
# Load compounds via RDF (slow)
# @param [String] uri Dataset URI
# @return [Array] compounds Compounds in order
- def self.find_compounds_rdf(rdf)
+ def find_compounds_rdf
query = RDF::Query.new do
pattern [:uri, RDF.type, RDF::OT.Compound]
pattern [:uri, RDF::OLO.index, :idx]
end
- query.execute(rdf).sort_by{|s| s.idx}.collect{|s| OpenTox::Compound.new(s.uri.to_s)}
+ query.execute(@rdf).sort_by{|s| s.idx}.collect{|s| OpenTox::Compound.new(s.uri.to_s)}
end
# Load data entries via RDF (slow)
# @param [String] uri Dataset uri
# @return [Array] entries Data entries, ordered primarily over cols and secondarily over rows
- def self.find_data_entries_rdf(rdf)
+ def find_data_entries_rdf
query = RDF::Query.new do
pattern [:data_entry, RDF::OLO.index, :cidx] # compound index: now a free variable
pattern [:data_entry, RDF::OT.values, :vals]
@@ -41,7 +41,7 @@ module OpenTox
pattern [:f, RDF::OLO.index, :fidx]
pattern [:vals, RDF::OT.value, :val]
end
- query.execute(rdf).order_by(:fidx, :cidx).collect { |s| s.val.to_s }
+ query.execute(@rdf).order_by(:fidx, :cidx).collect { |s| s.val.to_s }
end
# Query a dataset URI for ordered status