1 files changed, 17 insertions, 10 deletions
diff --git a/test/lazar-fminer.rb b/test/lazar-fminer.rb
index 6c0ee41..04d1704 100644
--- a/test/lazar-fminer.rb
+++ b/test/lazar-fminer.rb
@@ -6,7 +6,6 @@ class LazarFminerTest < MiniTest::Test
     training_dataset = Dataset.from_csv_file File.join(DATA_DIR,"hamster_carcinogenicity.csv")
     feature_dataset = Algorithm::Fminer.bbrc(training_dataset)
     model = Model::Lazar.create training_dataset, feature_dataset
-    #feature_dataset = OpenTox::Dataset.find model.feature_dataset_id
     assert_equal training_dataset.compounds.size, feature_dataset.compounds.size
     assert_equal 54, feature_dataset.features.size
     feature_dataset.data_entries.each do |e|
@@ -17,25 +16,33 @@ class LazarFminerTest < MiniTest::Test
     [ {
       :compound => OpenTox::Compound.from_inchi("InChI=1S/C6H6/c1-2-4-6-5-3-1/h1-6H"),
       :prediction => "false",
-      :confidence => 0.25281385281385277
+      :confidence => 0.25281385281385277,
+      :nr_neighbors => 11
     },{
       :compound => OpenTox::Compound.from_smiles("c1ccccc1NN"),
       :prediction => "false",
-      :confidence => 0.3639589577089577
-    } ].each do |example|
-      prediction_dataset = model.predict :compound => example[:compound]
+      :confidence => 0.3639589577089577,
+      :nr_neighbors => 14
+    }, {
+      :compound => Compound.from_smiles('OCCCCCCCC\C=C/CCCCCCCC'),
+      :prediction => "false",
+      :confidence => 0.5555555555555556,
+      :nr_neighbors => 1
+    }].each do |example|
+      prediction = model.predict example[:compound]
 
-      prediction = prediction_dataset.data_entries.first.first
-      confidence = prediction_dataset.data_entries.first.last
-      assert_equal example[:prediction], prediction
-      assert_equal example[:confidence], confidence
+      assert_equal example[:prediction], prediction[:value]
+      assert_equal example[:confidence], prediction[:confidence]
+      assert_equal example[:nr_neighbors], prediction[:neighbors].size
     end
 
     # make a dataset prediction
     compound_dataset = OpenTox::Dataset.from_csv_file File.join(DATA_DIR,"EPAFHM.mini.csv")
-    prediction = model.predict :dataset => compound_dataset
+    prediction = model.predict compound_dataset
     assert_equal compound_dataset.compounds, prediction.compounds
 
+    assert_match /No neighbors/, prediction.data_entries[7][2]
+    assert_equal "measured", prediction.data_entries[14][1]
     # cleanup
     [training_dataset,model,feature_dataset,compound_dataset].each{|o| o.delete}
   end