From d27d53d98238ede80fc3b1a0c277ca890a84c736 Mon Sep 17 00:00:00 2001 From: mguetlein Date: Thu, 18 Aug 2011 10:38:51 +0200 Subject: fix ROC stuff, rename weighted_auc to average_auc --- report/validation_data.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'report/validation_data.rb') diff --git a/report/validation_data.rb b/report/validation_data.rb index aa146a6..b6522b6 100755 --- a/report/validation_data.rb +++ b/report/validation_data.rb @@ -1,9 +1,9 @@ # the variance is computed when merging results for these attributes VAL_ATTR_VARIANCE = [ :area_under_roc, :percent_correct, :root_mean_squared_error, :mean_absolute_error, - :r_square, :accuracy, :weighted_area_under_roc, :weighted_accuracy, :weighted_root_mean_squared_error, :weighted_mean_absolute_error, + :r_square, :accuracy, :average_area_under_roc, :weighted_accuracy, :weighted_root_mean_squared_error, :weighted_mean_absolute_error, :weighted_r_square ] -VAL_ATTR_RANKING = [ :area_under_roc, :percent_correct, :true_positive_rate, :true_negative_rate, :weighted_area_under_roc, :accuracy, :f_measure ] +VAL_ATTR_RANKING = [ :area_under_roc, :percent_correct, :true_positive_rate, :true_negative_rate, :average_area_under_roc, :accuracy, :f_measure ] ATTR_NICE_NAME = {} -- cgit v1.2.3 From 32f9e3f97c1a8278cf5022f619d9e969a37fed38 Mon Sep 17 00:00:00 2001 From: mguetlein Date: Thu, 18 Aug 2011 11:25:39 +0200 Subject: fix ROC stuff [2] --- report/validation_data.rb | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'report/validation_data.rb') diff --git a/report/validation_data.rb b/report/validation_data.rb index b6522b6..f5ecae7 100755 --- a/report/validation_data.rb +++ b/report/validation_data.rb @@ -263,6 +263,18 @@ module Reports return unique_value("get_accept_values") end + def get_true_accept_value() + accept_values = get_accept_values() + if accept_values.size==2 + if (accept_values[0] =~ TRUE_REGEXP and !(accept_values[1] =~ TRUE_REGEXP)) + return accept_values[0] + elsif (accept_values[1] =~ TRUE_REGEXP and !(accept_values[0] =~ TRUE_REGEXP)) + return accept_values[1] + end + end + nil + end + def get_accept_values_for_attr( attribute ) if !Validation::Validation.classification_property?(attribute) [] @@ -270,9 +282,8 @@ module Reports accept_values = get_accept_values() if !Validation::Validation.depends_on_class_value?(attribute) [ nil ] - elsif accept_values.size==2 and - Validation::Validation.complement_exists?(attribute) - [ accept_values[0] ] + elsif accept_values.size==2 and get_true_accept_value()!=nil and Validation::Validation.complement_exists?(attribute) + [ get_true_accept_value() ] else accept_values end -- cgit v1.2.3