From 398a59885845a49cfda4b37b7058f8a47d11c6d2 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Fri, 7 Oct 2016 13:34:22 +0200 Subject: remaining tests fixed --- test/dataset.rb | 2 +- test/feature.rb | 1 - test/nanoparticles.rb | 8 +++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/dataset.rb b/test/dataset.rb index 05759a7..2c0aa01 100644 --- a/test/dataset.rb +++ b/test/dataset.rb @@ -63,7 +63,7 @@ class DatasetTest < MiniTest::Test f = File.join DATA_DIR, "multi_cell_call.csv" d = OpenTox::Dataset.from_csv_file f csv = CSV.read f - assert_equal true, d.features.first.nominal + assert_equal true, d.features.first.nominal? assert_equal 1056, d.compounds.size assert_equal csv.first.size-1, d.features.size errors.each do |smi| diff --git a/test/feature.rb b/test/feature.rb index 1e640ad..533ac0f 100644 --- a/test/feature.rb +++ b/test/feature.rb @@ -32,7 +32,6 @@ class FeatureTest < MiniTest::Test def test_duplicated_features metadata = { :name => "feature duplication test", - :nominal => true, } feature = NumericFeature.find_or_create_by metadata dup_feature = NumericFeature.find_or_create_by metadata diff --git a/test/nanoparticles.rb b/test/nanoparticles.rb index 074a429..c489cb7 100644 --- a/test/nanoparticles.rb +++ b/test/nanoparticles.rb @@ -19,7 +19,7 @@ class NanoparticleTest < MiniTest::Test prediction = model.predict nanoparticle refute_nil prediction[:value] assert_includes nanoparticle.dataset_ids, @training_dataset.id - asser_true @prediction_feature.measured + assert true, @prediction_feature.measured model.delete end @@ -39,7 +39,8 @@ class NanoparticleTest < MiniTest::Test :prediction => {:parameters => 'pls' }, } model = Model::Lazar.create prediction_feature: @prediction_feature, training_dataset: @training_dataset, algorithms: algorithms - assert_equal "pls", model.algorithms[:prediction][:method] + assert_equal "pls", model.algorithms[:prediction][:parameters] + assert_equal "Algorithm::Caret.regression", model.algorithms[:prediction][:method] cv = CrossValidation.create model p cv.rmse p cv.r_squared @@ -53,7 +54,8 @@ class NanoparticleTest < MiniTest::Test :prediction => { :parameters => 'pls' } } model = Model::Lazar.create prediction_feature: @prediction_feature, training_dataset: @training_dataset, algorithms: algorithms - assert_equal "pls", model.algorithms[:prediction][:method] + assert_equal "pls", model.algorithms[:prediction][:parameters] + assert_equal "Algorithm::Caret.regression", model.algorithms[:prediction][:method] cv = CrossValidation.create model p cv.rmse p cv.r_squared -- cgit v1.2.3