diff options
author | mguetlein <martin.guetlein@gmail.com> | 2012-10-15 14:33:46 +0200 |
---|---|---|
committer | mguetlein <martin.guetlein@gmail.com> | 2012-10-15 14:33:46 +0200 |
commit | 416c67d283f4a072903327e0648b6acd036c098b (patch) | |
tree | 55d254d3b8b4770f955bb4457892bb1f259885ee /validation/validation_service.rb | |
parent | 93cceaf0aa128088b5b2ef3640b84ae3cfe30fe7 (diff) |
contra -> contra-bin and contra-eucl
Diffstat (limited to 'validation/validation_service.rb')
-rwxr-xr-x | validation/validation_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/validation/validation_service.rb b/validation/validation_service.rb index e30fd50..b5439a2 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)$/ + when /^(true|super|super4|super5|super_bin|contra_eucl|contra_bin)$/ 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" + elsif stratified=="contra_eucl" or stratified=="contra_bin" 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, is #{stratified}" + raise OpenTox::BadRequestError.new "stratified != false|true|super|contra_eucl|contra_bin, is #{stratified}" end result end |