summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2016-06-01 10:37:00 +0200
committerChristoph Helma <helma@in-silico.ch>2016-06-01 10:37:00 +0200
commit65b69d4c35890a7a2d2992108f0cf4eb5202dd1b (patch)
treed8583d3e745cc21a6897081d28e157f5c0c16024 /test
parentb515a0cfedb887a2af753db6e4a08ae1af430cad (diff)
validation tests fixed
Diffstat (limited to 'test')
-rw-r--r--test/all.rb2
-rw-r--r--test/validation.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/all.rb b/test/all.rb
index a10bcaa..8e137b4 100644
--- a/test/all.rb
+++ b/test/all.rb
@@ -1,5 +1,5 @@
# "./default_environment.rb" has to be executed separately
-exclude = ["./setup.rb","./all.rb", "./default_environment.rb","./nanoparticles.rb"]
+exclude = ["./setup.rb","./all.rb", "./default_environment.rb",]
(Dir[File.join(File.dirname(__FILE__),"*.rb")]-exclude).each do |test|
require_relative test
end
diff --git a/test/validation.rb b/test/validation.rb
index a259472..4d0c372 100644
--- a/test/validation.rb
+++ b/test/validation.rb
@@ -59,6 +59,7 @@ class ValidationTest < MiniTest::Test
}
}
model = Model::LazarRegression.create dataset.features.first, dataset, params
+ assert_equal params[:neighbor_algorithm_parameters][:type], model[:neighbor_algorithm_parameters][:type]
cv = RegressionCrossValidation.create model
cv.validation_ids.each do |vid|
model = Model::Lazar.find(Validation.find(vid).model_id)
@@ -74,7 +75,6 @@ class ValidationTest < MiniTest::Test
end
def test_physchem_regression_crossvalidation
-
training_dataset = OpenTox::Dataset.from_csv_file File.join(DATA_DIR,"EPAFHM.medi_log10.csv")
model = Model::LazarRegression.create(training_dataset.features.first, training_dataset, :prediction_algorithm => "OpenTox::Algorithm::Regression.local_physchem_regression")
cv = RegressionCrossValidation.create model