Merge branch 'jl' into development

Conflicts:
	cv/data/datasets.yaml
	lazar.rb

1 files changed, 4 insertions, 4 deletions

diff --git a/lazar.rb b/lazar.rb
index ee8e072..1a19b61 100644
--- a/lazar.rb
+++ b/lazar.rb
@@ -63,11 +63,11 @@ class LazarTest < Test::Unit::TestCase
 
 ## Regression
 def test_create_regression_svm_pc_model
-  create_model :dataset_uri => @@regression_training_dataset.uri, :feature_dataset_uri => @@regression_feature_dataset.uri, :pc_type => "constitutional"
+  create_model :dataset_uri => @@regression_training_dataset.uri, :feature_dataset_uri => @@regression_feature_dataset.uri, :pc_type => "constitutional", :lib => "cdk"
   predict_compound OpenTox::Compound.from_smiles("c1ccccc1NN")
-  assert_in_delta @predictions.first.value(@compounds.first), 7.6, 0.3
-  assert_equal 0.603, @predictions.first.confidence(@compounds.first).round_to(3)
-  assert_equal 74, @predictions.first.neighbors(@compounds.first).size
+  assert_in_delta @predictions.first.value(@compounds.first), 17.13, 0.3
+  assert_equal 0.531, @predictions.first.confidence(@compounds.first).round_to(3)
+  assert_equal 91, @predictions.first.neighbors(@compounds.first).size
   cleanup
 end