summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormr <mr@mrautenberg.de>2011-08-17 14:26:37 +0200
committermr <mr@mrautenberg.de>2011-08-17 14:26:37 +0200
commit13832c4fa41d50eac7e12c22fa7668553dfbf081 (patch)
tree0e7886a62385c5b934db56dc68f559a46b7f5c1b
parent29c0e9c17948fcae61f49406cb74a486e94ce146 (diff)
add subjectids for A&A
-rw-r--r--dataset.rb1
-rw-r--r--validation.rb2
2 files changed, 1 insertions, 2 deletions
diff --git a/dataset.rb b/dataset.rb
index 077530b..fe249b2 100644
--- a/dataset.rb
+++ b/dataset.rb
@@ -6,7 +6,6 @@ require 'validate-owl'
class DatasetTest < Test::Unit::TestCase
def setup
- @@subjectid = nil
@datasets = {
@@regression_training_dataset.uri => nil,
@@classification_training_dataset.uri => {
diff --git a/validation.rb b/validation.rb
index 28ca973..06254c3 100644
--- a/validation.rb
+++ b/validation.rb
@@ -372,7 +372,7 @@ class ValidationTest < Test::Unit::TestCase
assert defined?cv,"no crossvalidation defined"
assert cv.metadata[OT.validation].is_a?(Array)
assert cv.metadata[OT.validation].first.uri?
- validation = OpenTox::Validation.find(cv.metadata[OT.validation].first)
+ validation = OpenTox::Validation.find(cv.metadata[OT.validation].first, @@subjectid)
prediction_feature_uri = validation.metadata[OT.predictionFeature]
assert prediction_feature_uri.uri?
model_uri = OpenTox::Algorithm::Lazar.new.run({:dataset_uri => cv.metadata[OT.dataset], :prediction_feature => prediction_feature_uri,