summaryrefslogtreecommitdiff
path: root/validation
diff options
context:
space:
mode:
authormguetlein <martin.guetlein@gmail.com>2011-02-23 12:14:04 +0100
committermguetlein <martin.guetlein@gmail.com>2011-02-23 12:14:04 +0100
commite57856a3c2cd10df207e722301c24a022e9fd802 (patch)
tree8d66572b851affa4cc963ceb779992c073a06e95 /validation
parent84b787bf6d99f6b8cce56df2bc45a8b93ada4d64 (diff)
extend limit to 512 from 255, plus minor fix
Diffstat (limited to 'validation')
-rwxr-xr-xvalidation/validation_service.rb6
-rwxr-xr-xvalidation/validation_test.rb12
2 files changed, 15 insertions, 3 deletions
diff --git a/validation/validation_service.rb b/validation/validation_service.rb
index d917a96..a1efba5 100755
--- a/validation/validation_service.rb
+++ b/validation/validation_service.rb
@@ -228,7 +228,11 @@ module Validation
:num_unpredicted => prediction.num_unpredicted,
:percent_unpredicted => prediction.percent_unpredicted,
:finished => true}
- self.save
+ begin
+ self.save
+ rescue DataMapper::SaveFailureError => e
+ raise "could not save validation: "+e.resource.errors.inspect
+ end
end
task.progress(100) if task
diff --git a/validation/validation_test.rb b/validation/validation_test.rb
index 3f10ca2..ffb25c4 100755
--- a/validation/validation_test.rb
+++ b/validation/validation_test.rb
@@ -115,6 +115,14 @@ class ValidationTest < Test::Unit::TestCase
# get "/crossvalidation/2",nil,'HTTP_ACCEPT' => "application/rdf+xml"
#puts last_response.body
#exit
+
+# OpenTox::Crossvalidation.create(
+# :dataset_uri=>"http://local-ot/dataset/1874",
+# :algorithm_uri=>"http://local-ot/algorithm/lazar",
+# :prediction_feature=>"http://local-ot/dataset/1874/feature/Hamster%20Carcinogenicity",
+# :algorithm_params=>"feature_generation_uri=http://local-ot/algorithm/fminer/bbrc")
+
+#http://local-ot/dataset/1878
#get "/crossvalidation?model_uri=lazar"
# post "/test_validation",:select=>"6d" #,:report=>"yes,please"
@@ -209,7 +217,7 @@ class ValidationTest < Test::Unit::TestCase
# d2 = d.split(d.compounds[0..5], d.features.keys[0..1], {}, SUBJECTID)
# puts d2.to_yaml
- run_test("1b")#,:validation_uri=>"http://local-ot/validation/253") #,"http://local-ot/validation/28")#,"http://local-ot/validation/394");
+ # run_test("1b")#,:validation_uri=>"http://local-ot/validation/253") #,"http://local-ot/validation/28")#,"http://local-ot/validation/394");
#run_test("3b",:validation_uri=>"http://local-ot/validation/crossvalidation/45") #,{:dataset_uri => "http://local-ot/dataset/773", :prediction_feature => "http://local-ot/dataset/773/feature/Hamster%20Carcinogenicity"})
@@ -249,7 +257,7 @@ class ValidationTest < Test::Unit::TestCase
#delete "/1",:subjectid=>SUBJECTID
- #run_test("7b","http://local-ot/validation/21")
+ run_test("19i")
#run_test("3a","http://local-ot/validation/crossvalidation/4")
#run_test("3b","http://local-ot/validation/crossvalidation/3")