validation utilizes/requires acceptValue for classification

3 files changed, 38 insertions, 31 deletions

diff --git a/report/report_content.rb b/report/report_content.rb
index 1345e6f..36f9955 100755
--- a/report/report_content.rb
+++ b/report/report_content.rb
@@ -189,9 +189,9 @@ class Reports::ReportContent
       end
       @xml_report.add_paragraph(section_roc, section_text) if section_text
 
-      class_domain = validation_set.get_class_domain
-      class_domain.size.times do |i|
-        class_value = class_domain[i]
+      accept_values = validation_set.get_accept_values
+      accept_values.size.times do |i|
+        class_value = accept_values[i]
         image_title = image_titles ? image_titles[i] : "ROC Plot for class-value '"+class_value.to_s+"'"
         image_caption = image_captions ? image_captions[i] : nil
         plot_file_name = "roc_plot"+@tmp_file_count.to_s+".svg"
@@ -236,11 +236,11 @@ class Reports::ReportContent
                         image_titles=nil,
                         image_captions=nil)
 
-    class_domain = validation_set.get_domain_for_attr(rank_attribute)
-    puts "ranking plot for "+rank_attribute.to_s+", class values: "+class_domain.to_s
+    accept_values = validation_set.get_class_values_for(rank_attribute)
+    puts "ranking plot for "+rank_attribute.to_s+", class values: "+accept_values.to_s
     
-    class_domain.size.times do |i|  
-      class_value = class_domain[i]
+    accept_values.size.times do |i|  
+      class_value = accept_values[i]
       if image_titles
         image_title = image_titles[i]
       else
diff --git a/report/validation_access.rb b/report/validation_access.rb
index 96dfbf3..22c7146 100755
--- a/report/validation_access.rb
+++ b/report/validation_access.rb
@@ -74,8 +74,13 @@ class Reports::ValidationDB
       validation.predicted_variable, subjectid, task)
   end
   
-  def get_class_domain( validation )
-    OpenTox::Feature.new( validation.prediction_feature ).domain
+  def get_accept_values( validation )
+    # PENDING So far, one has to load the whole dataset to get the accept_value from ambit
+    d = OpenTox::Dataset.find( validation.test_target_dataset_uri )
+    accept_values = d.features[validation.prediction_feature][OT.acceptValue]
+    raise "cannot get accept values from dataset "+validation.test_target_dataset_uri.to_s+" for feature "+
+      validation.prediction_feature+":\n"+d.features[validation.prediction_feature].to_yaml unless accept_values!=nil
+    accept_values
   end
   
   def feature_type( validation, subjectid=nil )
diff --git a/report/validation_data.rb b/report/validation_data.rb
index 9212c98..fcb8fc0 100755
--- a/report/validation_data.rb
+++ b/report/validation_data.rb
@@ -104,9 +104,9 @@ module Reports
     
     # returns the predictions feature values (i.e. the domain of the class attribute)
     #
-    def get_class_domain()
-      @class_domain = @@validation_access.get_class_domain(self) unless @class_domain
-      @class_domain
+    def get_accept_values()
+      @accept_values = @@validation_access.get_accept_values(self) unless @accept_values
+      @accept_values
     end
     
     # is classification/regression validation? cache to save rest-calls
@@ -233,7 +233,7 @@ module Reports
     
 #    def get_true_prediction_feature_value
 #      if all_classification?
-#        class_values = get_class_domain
+#        class_values = get_accept_values
 #        if class_values.size == 2
 #          (0..1).each do |i|
 #            return class_values[i] if (class_values[i].to_s.downcase == "true" || class_values[i].to_s.downcase == "active")
@@ -243,21 +243,23 @@ module Reports
 #      return nil
 #    end
     
-    def get_class_domain( )
-      return unique_value("get_class_domain")
+    def get_accept_values( )
+      return unique_value("get_accept_values")
     end
     
-    def get_domain_for_attr( attribute )
-      class_domain = get_class_domain()
-      if Validation::Validation.classification_property?(attribute) and 
-        !Validation::Validation.depends_on_class_value?(attribute)
-        [ nil ]
-      elsif Validation::Validation.classification_property?(attribute) and 
-          class_domain.size==2 and 
-          Validation::Validation.complement_exists?(attribute)
-        [ class_domain[0] ]
+    def get_accept_values_for_attr( attribute )
+      if !Validation::Validation.classification_property?(attribute)
+        []
       else
-        class_domain
+        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] ]
+        else
+          accept_values
+        end
       end
     end
     
@@ -298,10 +300,10 @@ module Reports
       #puts col_values.inspect
       
       # get domain for classification attribute, i.e. ["true","false"]
-      class_domain = get_domain_for_attr(attribute_val)
+      accept_values = get_accept_values_for_attr(attribute_val)
       # or the attribute has a complementary value, i.e. true_positive_rate
       # -> domain is reduced to one class value
-      first_value_elem = (class_domain.size==1 && class_domain[0]!=nil)
+      first_value_elem = (accept_values.size==1 && accept_values[0]!=nil)
       
       cell_values = {}
       row_values.each do |row|
@@ -311,7 +313,7 @@ module Reports
             if v.send(attribute_row)==row and v.send(attribute_col)==col
               raise "two validation have equal row and column values"if val!=nil
               val = v.send(attribute_val)
-              val = val[class_domain[0]] if first_value_elem
+              val = val[accept_values[0]] if first_value_elem
               val = val.to_nice_s
             end
           end
@@ -357,13 +359,13 @@ module Reports
           else
             attribute_not_nil[index] = true if remove_nil_attributes
             
-            class_domain = get_domain_for_attr(a)
+            accept_values = get_accept_values_for_attr(a)
             # get domain for classification attribute, i.e. ["true","false"]
-            if class_domain.size==1 && class_domain[0]!=nil
+            if accept_values.size==1 && accept_values[0]!=nil
               # or the attribute has a complementary value, i.e. true_positive_rate
               # -> domain is reduced to one class value
               raise "illegal state, value for "+a.to_s+" is no hash: '"+val.to_s+"'" unless (val.is_a?(Hash))
-              val = val[class_domain[0]]
+              val = val[accept_values[0]]
             end
             
             if variance