summaryrefslogtreecommitdiff
path: root/dataset.rb
diff options
context:
space:
mode:
Diffstat (limited to 'dataset.rb')
-rw-r--r--dataset.rb34
1 files changed, 2 insertions, 32 deletions
diff --git a/dataset.rb b/dataset.rb
index 5483ee4..30d59e6 100644
--- a/dataset.rb
+++ b/dataset.rb
@@ -4,7 +4,8 @@ require 'test/unit'
require 'validate-owl'
class DatasetTest < Test::Unit::TestCase
-
+ include TestUtil
+
def setup
@datasets = {
@@regression_training_dataset.uri => nil,
@@ -261,38 +262,7 @@ class DatasetTest < Test::Unit::TestCase
OpenTox::RestClientWrapper.delete(d.uri,{:subjectid => @@subjectid})
end
end
-
- def dataset_equal(d,d2)
- assert d.compounds.sort==d2.compounds.sort,
- d.compounds.sort.to_yaml+"\n!=\n"+d2.compounds.sort.to_yaml
- assert d.features.keys.size==d2.features.keys.size,
- d.features.keys.to_yaml+"\n!=\n"+d2.features.keys.to_yaml
- assert d.features.keys.sort==d2.features.keys.sort,
- d.features.keys.sort.to_yaml+"\n!=\n"+d2.features.keys.sort.to_yaml
- d.compounds.each do |c|
- d.features.keys.each do |f|
- assert_array_about_equal d.data_entries[c][f],d2.data_entries[c][f]
- end
- end
- end
-
- def assert_array_about_equal(a,a2)
- if (a!=nil || a2!=nil)
- raise "no arrays #{a.class} #{a2.class}" unless a.is_a?(Array) and a2.is_a?(Array)
- assert a.size==a2.size
- a.sort!
- a2.sort!
- a.size.times do |i|
- if (a[i].is_a?(Float) and a2[i].is_a?(Float))
- assert (a[i]-a2[i]).abs<0.0000001,"#{a[i]}(#{a[i].class}) != #{a2[i]}(#{a2[i].class})"
- else
- assert a[i]==a2[i],"#{a[i]}(#{a[i].class}) != #{a2[i]}(#{a2[i].class})"
- end
- end
- end
- end
-
def validate(data)
assert_kind_of OpenTox::Dataset, @dataset
assert_equal @dataset.data_entries.size, data[:nr_data_entries] if data