generalised fingerprints

1 files changed, 12 insertions, 9 deletions

diff --git a/test/prediction_models.rb b/test/prediction_models.rb
index 001ebcd..1b9e788 100644
--- a/test/prediction_models.rb
+++ b/test/prediction_models.rb
@@ -3,21 +3,24 @@ require_relative "setup.rb"
 class PredictionModelTest < MiniTest::Test
 
   def test_prediction_model
-    dataset = Dataset.from_csv_file "#{DATA_DIR}/hamster_carcinogenicity.csv"
-    model = Model::LazarFminerClassification.create dataset
-    cv = ClassificationCrossValidation.create model
-    metadata = JSON.parse(File.read("#{DATA_DIR}/hamster_carcinogenicity.json"))
+    pm = Model::Prediction.from_csv_file "#{DATA_DIR}/hamster_carcinogenicity.csv"
+    #dataset = Dataset.from_csv_file "#{DATA_DIR}/hamster_carcinogenicity.csv"
+    #model = Model::LazarFminerClassification.create dataset
+    #cv = ClassificationCrossValidation.create model
+    #metadata = JSON.parse(File.read("#{DATA_DIR}/hamster_carcinogenicity.json"))
 
-    metadata[:model_id] = model.id
-    metadata[:crossvalidation_id] = cv.id
-    pm = Model::Prediction.new(metadata)
-    pm.save
+    #metadata[:model_id] = model.id
+    #metadata[:crossvalidation_id] = cv.id
+    #pm = Model::Prediction.new(metadata)
+    #pm.save
     [:endpoint,:species,:source].each do |p|
       refute_empty pm[p]
     end
     assert pm.classification?
     refute pm.regression?
-    assert pm.crossvalidation.accuracy > 0.8
+    pm.crossvalidations.each do |cv|
+      assert cv.accuracy > 0.75
+    end
     prediction = pm.predict Compound.from_smiles("CCCC(NN)C")
     assert_equal "true", prediction[:value]
     pm.delete