From c0aa3b2dcdcf6f4590b4608d3f1a73361306f59b Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Wed, 24 Nov 2010 15:04:23 +0100
Subject: tests adapted for external services

---
 dataset.rb | 6 +-----
 fminer.rb  | 2 +-
 lazar.rb   | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dataset.rb b/dataset.rb
index 26abe4c..9cf8e63 100644
--- a/dataset.rb
+++ b/dataset.rb
@@ -6,11 +6,7 @@ require 'validate-owl'
 class DatasetTest < Test::Unit::TestCase
 
   def setup
-    #@new_dataset = OpenTox::Dataset.from_csv(File.open("data/hamster_carcinogenicity.csv").read)
-    #@new_dataset.add_metadata( OT.hasSource => "data/hamster_carcinogenicity.csv", DC.creator => "opentox-test", DC.title => "Hamster Carcinogenicity" )
-    #@new_dataset.save
     @datasets = {
-      #@new_dataset.uri => {
       @@classification_training_dataset.uri => {
         :nr_compounds => 85,
         :nr_features => 1,
@@ -132,7 +128,7 @@ class DatasetTest < Test::Unit::TestCase
     @datasets.each do |uri,data|
       @dataset = OpenTox::Dataset.new(uri)
       @dataset.load_all
-      @dataset = YAML.load @dataset.to_yaml
+      #@dataset = YAML.load @dataset.to_yaml
       validate data
     end
   end
diff --git a/fminer.rb b/fminer.rb
index 2fcade1..3b22c64 100644
--- a/fminer.rb
+++ b/fminer.rb
@@ -22,7 +22,7 @@ class FminerTest < Test::Unit::TestCase
     dataset_uri = OpenTox::Algorithm::Fminer::LAST.new.run({:dataset_uri => @@classification_training_dataset.uri, :prediction_feature => feature}).to_s
     d =OpenTox::Dataset.new dataset_uri
     d.load_features
-    assert_equal 36, d.features.size
+    assert_equal 35, d.features.size
     #validate_owl
     d.delete
   end
diff --git a/lazar.rb b/lazar.rb
index 4779c4f..e3c6908 100644
--- a/lazar.rb
+++ b/lazar.rb
@@ -13,7 +13,7 @@ class LazarTest < Test::Unit::TestCase
     compound = OpenTox::Compound.from_smiles("c1ccccc1NN")
     prediction_uri = lazar.run(:compound_uri => compound.uri)
     prediction = OpenTox::LazarPrediction.find(prediction_uri)
-    assert_equal prediction.value(compound), 0.149518871336721
+    assert_equal prediction.value(compound), 0.149480050002539
     assert_equal prediction.confidence(compound), 0.615246530364447
     assert_equal prediction.neighbors(compound).size, 81
     prediction.delete
-- 
cgit v1.2.3