Merge branch 'development' of github.com:opentox/test into development

1 files changed, 11 insertions, 10 deletions

diff --git a/fminer.rb b/fminer.rb
index 781fb91..1f99f77 100644
--- a/fminer.rb
+++ b/fminer.rb
@@ -16,10 +16,10 @@ class FminerTest < Test::Unit::TestCase
 
   def test_regression_bbrc
     feature = File.join @@regression_training_dataset.uri,"feature/LC50_mmol" 
-    dataset_uri = OpenTox::Algorithm::Fminer::BBRC.new.run({:dataset_uri => @@regression_training_dataset.uri, :prediction_feature => feature, :subjectid => @@subjectid}).to_s
+    dataset_uri = OpenTox::Algorithm::Fminer::BBRC.new.run({:dataset_uri => @@regression_training_dataset.uri, :prediction_feature => feature, :subjectid => @@subjectid, :feature_type=>"paths"}).to_s
     d =OpenTox::Dataset.new dataset_uri, @@subjectid
     d.load_features(@@subjectid)
-    assert_equal 1356, d.features.size
+    assert_equal 185, d.features.size
     d.delete(@@subjectid)
   end
 
@@ -32,13 +32,14 @@ class FminerTest < Test::Unit::TestCase
     d.delete(@@subjectid)
   end
 
-  def test_regression_last
-    feature = File.join @@regression_training_dataset.uri,"feature/LC50_mmol" 
-    dataset_uri = OpenTox::Algorithm::Fminer::LAST.new.run({:dataset_uri => @@regression_training_dataset.uri, :prediction_feature => feature, :subjectid => @@subjectid}).to_s
-    d =OpenTox::Dataset.new dataset_uri, @@subjectid
-    d.load_features(@@subjectid)
-    assert_equal 4, d.features.size
-    d.delete(@@subjectid)
-  end
+# Deactivated by AM because of efficiency problems (does not return)
+#  def test_regression_last
+#    feature = File.join @@regression_training_dataset.uri,"feature/LC50_mmol" 
+#    dataset_uri = OpenTox::Algorithm::Fminer::LAST.new.run({:dataset_uri => @@regression_training_dataset.uri, :prediction_feature => feature, :subjectid => @@subjectid}).to_s
+#    d =OpenTox::Dataset.new dataset_uri, @@subjectid
+#    d.load_features(@@subjectid)
+#    assert_equal 4, d.features.size
+#    d.delete(@@subjectid)
+#  end
 
 end