From 4662e845c12e3e623ec9bec208c42cd4b1886047 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Fri, 15 Apr 2016 14:58:17 +0200 Subject: enm study import --- lib/dataset.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'lib/dataset.rb') diff --git a/lib/dataset.rb b/lib/dataset.rb index fdf1bfc..b51d74b 100644 --- a/lib/dataset.rb +++ b/lib/dataset.rb @@ -88,22 +88,21 @@ module OpenTox # @return [String] def to_csv(inchi=false) CSV.generate() do |csv| - compound = Substance.find(data_entries.first.first).is_a? Compound + compound = Substance.find(substance_ids.first).is_a? Compound if compound csv << [inchi ? "InChI" : "SMILES"] + features.collect{|f| f.name} else csv << ["Name"] + features.collect{|f| f.name} end - data_entries.each do |sid,f| - substance = Substance.find sid - features.each do |feature| - f[feature.id.to_s].each do |v| + substances.each do |substance| + features.each do |f| + substance.toxicities[f.id.to_s].each do |v| if compound csv << [inchi ? substance.inchi : substance.smiles , v] else csv << [substance.name , v] end - end if f[feature.id.to_s] + end if substance.toxicities[f.id.to_s] end end end -- cgit v1.2.3