summaryrefslogtreecommitdiff
path: root/validation.rb
diff options
context:
space:
mode:
Diffstat (limited to 'validation.rb')
-rw-r--r--validation.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/validation.rb b/validation.rb
index fbfa76d..06254c3 100644
--- a/validation.rb
+++ b/validation.rb
@@ -372,12 +372,16 @@ 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,
:subjectid => @@subjectid}).to_s
assert model_uri.uri?
+ # test search in cvs with model uri
+ cv_uris = OpenTox::RestClientWrapper.get(File.join(CONFIG[:services]["opentox-validation"],"/crossvalidation?model="+model_uri),
+ {:subjectid => @@subjectid}).chomp.split("\n")
+ assert cv_uris.size>0 and cv_uris.include?(cv.uri)
# validations = cv.metadata[OT.validation]
# assert_kind_of Array,validations
# assert validations.size==cv.metadata[OT.numFolds].to_i,validations.size.to_s+"!="+cv.metadata[OT.numFolds].to_s
@@ -389,6 +393,10 @@ class ValidationTest < Test::Unit::TestCase
# OpenTox::QMRFReport.find_for_model(model_uri, @@subjectid)
#end
qmrfReport = OpenTox::QMRFReport.create(model_uri, @@subjectid)
+ # test search in qmrf reports with model uri
+ qmrf_uris = OpenTox::RestClientWrapper.get(File.join(CONFIG[:services]["opentox-validation"],"/reach_report/QMRF?model="+model_uri),
+ {:subjectid => @@subjectid}).chomp.split("\n")
+ assert qmrf_uris.size==1 and qmrf_uris[0]==qmrfReport.uri
puts qmrfReport.uri unless @@delete
@@qmrfReports << qmrfReport
end