From 187385b9eaaf227d068ed727e9cbce1c55adfcaa Mon Sep 17 00:00:00 2001 From: mguetlein Date: Fri, 19 Oct 2012 23:48:03 +0200 Subject: next contra split method --- validation/validation_application.rb | 4 ++-- validation/validation_service.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/validation/validation_application.rb b/validation/validation_application.rb index 31ca44c..862ba49 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|super5|super_bin|contra_eucl|contra_bin, is #{params[:stratified]}" unless - params[:stratified]=~/^(true|false|super|super4|super5|super_bin|contra_eucl|contra_bin)$/ + raise OpenTox::BadRequestError.new "stratified != true|false|super|super4|super5|super_bin|contra_eucl2|contra_bin2, is #{params[:stratified]}" unless + params[:stratified]=~/^(true|false|super|super4|super5|super_bin|contra_eucl2|contra_bin2)$/ end end diff --git a/validation/validation_service.rb b/validation/validation_service.rb index b5439a2..6d3258c 100755 --- a/validation/validation_service.rb +++ b/validation/validation_service.rb @@ -653,13 +653,13 @@ module Validation meta = { DC.creator => $url_provider.url_for('/training_test_split',:full) } case stratified - when /^(true|super|super4|super5|super_bin|contra_eucl|contra_bin)$/ + when /^(true|super|super4|super5|super_bin|contra_eucl2|contra_bin2)$/ 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 LOGGER.warn "split features are ignored for stratified splits (use super instead)" if features features = [prediction_feature] - elsif stratified=="contra_eucl" or stratified=="contra_bin" + elsif stratified=="contra_eucl2" or stratified=="contra_bin2" raise OpenTox::BadRequestError.new "prediction feature required for anti-stratified splits" unless prediction_feature LOGGER.debug "prediction feature is removed for anti-stratified splits" features = orig_dataset.features.keys-[prediction_feature] @@ -711,7 +711,7 @@ module Validation end LOGGER.debug "split done, training dataset: '"+result[:training_dataset_uri].to_s+"', test dataset: '"+result[:test_dataset_uri].to_s+"'" else - raise OpenTox::BadRequestError.new "stratified != false|true|super|contra_eucl|contra_bin, is #{stratified}" + raise OpenTox::BadRequestError.new "stratified != false|true|super|contra_eucl2|contra_bin2, is #{stratified}" end result end -- cgit v1.2.3