From c1be8fe66f640d44dbbc9bfe5212733994bfb9c5 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Mon, 9 May 2016 15:44:29 +0200 Subject: physchem crossvalidation fixed, test_compound_descriptor_parameters assertions fixed --- test/descriptor.rb | 13 ++++++++++++- test/validation.rb | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/descriptor.rb b/test/descriptor.rb index 7c2cf8b..cd0c1ff 100644 --- a/test/descriptor.rb +++ b/test/descriptor.rb @@ -63,10 +63,21 @@ class DescriptorTest < MiniTest::Test end def test_compound_descriptor_parameters + PhysChem.descriptors c = OpenTox::Compound.from_smiles "CC(=O)CC(C)C#N" result = c.physchem [ "Openbabel.logP", "Cdk.AtomCount.nAtom", "Joelib.LogP" ].collect{|d| PhysChem.find_or_create_by(:name => d)} assert_equal 3, result.size - assert_equal [1.12518, 17.0, 2.65908], result.values.collect{|v| v.round 5} + result.each do |fid,v| + feature = Feature.find(fid) + case feature.name + when "Openbabel.logP" + assert_equal 1.12518, v.round(5) + when "Cdk.AtomCount.nAtom" + assert_equal 17.0, v.round(5) + when "Joelib.LogP" + assert_equal 2.65908, v.round(5) + end + end end end diff --git a/test/validation.rb b/test/validation.rb index 8ebb52c..ed19fee 100644 --- a/test/validation.rb +++ b/test/validation.rb @@ -17,7 +17,7 @@ class ValidationTest < MiniTest::Test model = Model::LazarRegression.create dataset.features.first, dataset cv = RegressionCrossValidation.create model assert cv.rmse < 1.5, "RMSE #{cv.rmse} should be larger than 1.5, this may occur due to an unfavorable training/test set split" - assert cv.mae < 1, "MAE #{cv.mae} should be larger than 1, this may occur due to an unfavorable training/test set split" + assert cv.mae < 1, "MAE #{cv.mae} should be smaller than 1, this may occur due to an unfavorable training/test set split" end # parameters -- cgit v1.2.3