summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormguetlein <martin.guetlein@gmail.com>2012-10-13 14:09:29 +0200
committermguetlein <martin.guetlein@gmail.com>2012-10-13 14:09:29 +0200
commit93cceaf0aa128088b5b2ef3640b84ae3cfe30fe7 (patch)
tree573ea972c09e94b0cd34ee43b737836ef3ab5820
parenta3e8fa8561ea2c7a8863c82c2e47966e2fd22edd (diff)
super6 -> super5 and super-bin
-rwxr-xr-xvalidation/validation_application.rb4
-rwxr-xr-xvalidation/validation_service.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/validation/validation_application.rb b/validation/validation_application.rb
index 95ebe50..ac23800 100755
--- a/validation/validation_application.rb
+++ b/validation/validation_application.rb
@@ -9,8 +9,8 @@ require 'validation/validation_service.rb'
helpers do
def check_stratified(params)
params[:stratified] = "false" unless params[:stratified]
- raise OpenTox::BadRequestError.new "stratified != true|false|super|super4|super6|contra, is #{params[:stratified]}" unless
- params[:stratified]=~/^(true|false|super|super4|super6|contra)$/
+ raise OpenTox::BadRequestError.new "stratified != true|false|super|super4|super5|super_bin|contra, is #{params[:stratified]}" unless
+ params[:stratified]=~/^(true|false|super|super4|super5|super_bin|contra)$/
end
end
diff --git a/validation/validation_service.rb b/validation/validation_service.rb
index b81c92a..e30fd50 100755
--- a/validation/validation_service.rb
+++ b/validation/validation_service.rb
@@ -502,7 +502,7 @@ module Validation
meta, self.subjectid ).uri
test_dataset_uris << test_dataset_uri
end
- when /^(true|super|super4|super6)$/
+ when /^(true|super|super4|super5|super_bin)$/
raise "DO NOT USED SUPER-STRATIFICATION FOR VAL-EXPERIMENTS AND CV, IF SO SOLVE _MISSING_VAULE_NA_ PROBLEM" if stratified=~/super/
if stratified=="true"
features = [ self.prediction_feature ]
@@ -653,7 +653,7 @@ module Validation
meta = { DC.creator => $url_provider.url_for('/training_test_split',:full) }
case stratified
- when /^(true|super|super4|super6|contra)$/
+ when /^(true|super|super4|super5|super_bin|contra)$/
raise "store split clusters not available for true stratified splits" if store_split_clusters and stratified=="true"
if stratified=="true"
raise OpenTox::BadRequestError.new "prediction feature required for stratified splits" unless prediction_feature