Merge branch 'release/v3.0.0'v3.0.0

1 files changed, 16 insertions, 5 deletions

diff --git a/report/validation_data.rb b/report/validation_data.rb
index aa146a6..f5ecae7 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 = {}
 
@@ -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