lazar model from ambit datasets

1 files changed, 12 insertions, 11 deletions

diff --git a/fminer.rb b/fminer.rb
index 362bde9..3e6dd0d 100644
--- a/fminer.rb
+++ b/fminer.rb
@@ -12,27 +12,29 @@ class FminerTest < Test::Unit::TestCase
     dataset_uri = OpenTox::Algorithm::Fminer::BBRC.new.run({:dataset_uri => @@classification_training_dataset.uri, :prediction_feature => feature, :subjectid => @@subjectid}).to_s
     d =OpenTox::Dataset.new dataset_uri, @@subjectid
     d.load_features(@@subjectid)
-    assert_equal 41, d.features.size
+    #puts dataset_uri
+    assert_equal 52, d.features.size
     #validate_owl
     d.delete(@@subjectid)
   end
 
-  def test_last
-    feature = @@classification_training_dataset.features.keys.first
-    dataset_uri = OpenTox::Algorithm::Fminer::LAST.new.run({:dataset_uri => @@classification_training_dataset.uri, :prediction_feature => feature, :subjectid => @@subjectid}).to_s
+  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
     d =OpenTox::Dataset.new dataset_uri, @@subjectid
     d.load_features(@@subjectid)
-    assert_equal 35, d.features.size
-    #validate_owl
+    assert_equal 1354, d.features.size
     d.delete(@@subjectid)
   end
 
-  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
+=begin
+  def test_last
+    feature = @@classification_training_dataset.features.keys.first
+    dataset_uri = OpenTox::Algorithm::Fminer::LAST.new.run({:dataset_uri => @@classification_training_dataset.uri, :prediction_feature => feature, :subjectid => @@subjectid}).to_s
     d =OpenTox::Dataset.new dataset_uri, @@subjectid
     d.load_features(@@subjectid)
-    assert_equal 225, d.features.size
+    assert_equal 35, d.features.size
+    #validate_owl
     d.delete(@@subjectid)
   end
 
@@ -44,7 +46,6 @@ class FminerTest < Test::Unit::TestCase
     assert_equal 16, d.features.size
     d.delete(@@subjectid)
   end
-=begin
 =end
 
 end