From 48234554ea99b972a01718ac36c4e8332dd9159b Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Sat, 7 May 2016 10:34:03 +0200 Subject: -log10 for regression datasets, test cleanups --- test/dataset.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/dataset.rb') diff --git a/test/dataset.rb b/test/dataset.rb index f028dbe..d167558 100644 --- a/test/dataset.rb +++ b/test/dataset.rb @@ -32,7 +32,7 @@ class DatasetTest < MiniTest::Test csv.shift csv.each do |row| c = Compound.from_smiles row.shift - assert_equal c.toxicities[d.feature_ids.first.to_s], row + assert_equal row, c.toxicities[d.feature_ids.first.to_s] end d.delete end @@ -88,14 +88,14 @@ class DatasetTest < MiniTest::Test end def test_upload_epafhm - f = File.join DATA_DIR, "EPAFHM.csv" + f = File.join DATA_DIR, "EPAFHM_log10.csv" d = OpenTox::Dataset.from_csv_file f assert_equal Dataset, d.class csv = CSV.read f assert_equal csv.size-1, d.compounds.size assert_equal csv.first.size-1, d.features.size - assert_match "EPAFHM.csv", d.source - assert_equal "EPAFHM", d.name + assert_match "EPAFHM_log10.csv", d.source + assert_equal "EPAFHM_log10", d.name refute_nil d.warnings assert_equal 74, d.warnings.size feature = d.features.first @@ -209,7 +209,7 @@ class DatasetTest < MiniTest::Test csv.shift csv.each do |row| c = Compound.from_smiles row.shift - assert_equal c.toxicities[d.feature_ids.first.to_s], row + assert_equal row, c.toxicities[d.feature_ids.first.to_s] end d.delete end -- cgit v1.2.3