From cc08e6beda7f7d70ebf6c6929a22d1a0cd7c1a20 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Tue, 24 May 2016 15:41:24 +0200 Subject: tests fixed. DescriptorTest#test_compound_all may fail within all.rb --- test/regression.rb | 2 +- test/validation.rb | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/regression.rb b/test/regression.rb index 799650f..c0782c4 100644 --- a/test/regression.rb +++ b/test/regression.rb @@ -17,7 +17,7 @@ class LazarRegressionTest < MiniTest::Test model.neighbor_algorithm_parameters[:type] = "MP2D" compound = Compound.from_smiles "CCCSCCSCC" prediction = model.predict compound - assert_equal 1.26, prediction[:value].round(2) + assert_equal 1.37, prediction[:value].round(2) assert_equal 3, prediction[:neighbors].size end diff --git a/test/validation.rb b/test/validation.rb index ed19fee..39314da 100644 --- a/test/validation.rb +++ b/test/validation.rb @@ -34,13 +34,16 @@ class ValidationTest < MiniTest::Test model.save cv = ClassificationCrossValidation.create model params = model.neighbor_algorithm_parameters - params.delete :training_dataset_id params = Hash[params.map{ |k, v| [k.to_s, v] }] # convert symbols to string cv.validations.each do |validation| validation_params = validation.model.neighbor_algorithm_parameters - validation_params.delete "training_dataset_id" - assert_equal params, validation_params + refute_nil params["dataset_id"] + refute_nil validation_params[:dataset_id] + refute_equal params["dataset_id"], validation_params[:dataset_id] + ["min_sim","type","prediction_feature_id"].each do |k| + assert_equal params[k], validation_params[k] + end end end @@ -55,13 +58,14 @@ class ValidationTest < MiniTest::Test } } model = Model::LazarRegression.create dataset.features.first, dataset, params - p model cv = RegressionCrossValidation.create model cv.validation_ids.each do |vid| model = Model::Lazar.find(Validation.find(vid).model_id) assert_equal params[:neighbor_algorithm_parameters][:type], model[:neighbor_algorithm_parameters][:type] assert_equal params[:neighbor_algorithm_parameters][:min_sim], model[:neighbor_algorithm_parameters][:min_sim] - refute_equal params[:neighbor_algorithm_parameters][:training_dataset_id], model[:neighbor_algorithm_parameters][:training_dataset_id] + refute_nil model[:neighbor_algorithm_parameters][:dataset_id] + refute_equal dataset.id, model[:neighbor_algorithm_parameters][:dataset_id] + assert_equal model.training_dataset_id, model[:neighbor_algorithm_parameters][:dataset_id] end refute_nil cv.rmse -- cgit v1.2.3