fix ROC stuff [2]

2 files changed, 24 insertions, 11 deletions

diff --git a/report/report_factory.rb b/report/report_factory.rb
index 1cf7b94..e3e0f3c 100755
--- a/report/report_factory.rb
+++ b/report/report_factory.rb
@@ -78,10 +78,11 @@ module Reports::ReportFactory
       report.add_section("Plots")
       report.add_confidence_plot(validation_set)
       if (validation_set.get_accept_values.size == 2)
-         report.add_roc_plot(validation_set, validation_set.get_accept_values[0])
-      else
-        validation_set.get_accept_values.each do |accept_value|
-          report.add_roc_plot(validation_set, accept_value)
+        if validation_set.get_true_accept_value!=nil
+          report.add_roc_plot(validation_set, validation_set.get_true_accept_value)
+        else
+          report.add_roc_plot(validation_set, validation_set.get_accept_values[0])
+          report.add_roc_plot(validation_set, validation_set.get_accept_values[1])
         end
       end
       report.end_section
@@ -132,10 +133,11 @@ module Reports::ReportFactory
         
         report.add_confidence_plot(validation_set,nil,split_attribute)
         if (validation_set.get_accept_values.size == 2)
-           report.add_roc_plot(validation_set, validation_set.get_accept_values[0], split_attribute)
-        else
-          validation_set.get_accept_values.each do |accept_value|
-            report.add_roc_plot(validation_set, accept_value, split_attribute)
+          if validation_set.get_true_accept_value!=nil
+            report.add_roc_plot(validation_set, validation_set.get_true_accept_value,split_attribute)
+          else
+            report.add_roc_plot(validation_set, validation_set.get_accept_values[0],split_attribute)
+            report.add_roc_plot(validation_set, validation_set.get_accept_values[1],split_attribute)
           end
         end
       end
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