From 416c67d283f4a072903327e0648b6acd036c098b Mon Sep 17 00:00:00 2001 From: mguetlein Date: Mon, 15 Oct 2012 14:33:46 +0200 Subject: contra -> contra-bin and contra-eucl --- validation/validation_application.rb | 4 ++-- validation/validation_service.rb | 6 +++--- validation/validation_test.rb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/validation/validation_application.rb b/validation/validation_application.rb index ac23800..157090e 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, is #{params[:stratified]}" unless - params[:stratified]=~/^(true|false|super|super4|super5|super_bin|contra)$/ + 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)$/ end end 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 diff --git a/validation/validation_test.rb b/validation/validation_test.rb index a7fae88..905d1cb 100755 --- a/validation/validation_test.rb +++ b/validation/validation_test.rb @@ -114,7 +114,7 @@ class ValidationTest < Test::Unit::TestCase dataset_uri = "http://local-ot/dataset/12084" prediction_feature = "http://local-ot/dataset/12084/feature/bbrc/1" - post "/plain_training_test_split",{:dataset_uri=>dataset_uri, :stratified=>"contra", :split_ratio=>0.25, :missing_values=>"0", + post "/plain_training_test_split",{:dataset_uri=>dataset_uri, :stratified=>"contra_bin", :split_ratio=>0.25, :missing_values=>"0", :prediction_feature => prediction_feature} #get '31355/median_confidence' -- cgit v1.2.3