summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormguetlein <martin.guetlein@gmail.com>2011-05-11 15:35:03 +0200
committermguetlein <martin.guetlein@gmail.com>2011-05-11 15:35:03 +0200
commit221eee5338ea7512bc87ab1209bcf1b955325ec6 (patch)
tree83339ef9857fca4de8138abecdd3532f3b0de776
parent05363717e6a2dd7fb768cd8a8fe8c0c5fda76931 (diff)
fix: subjectid needed for loading acceptValue with a&a
-rwxr-xr-xreport/validation_access.rb4
-rwxr-xr-xreport/validation_data.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/report/validation_access.rb b/report/validation_access.rb
index 22c7146..e9b6e19 100755
--- a/report/validation_access.rb
+++ b/report/validation_access.rb
@@ -74,9 +74,9 @@ class Reports::ValidationDB
validation.predicted_variable, subjectid, task)
end
- def get_accept_values( validation )
+ def get_accept_values( validation, subjectid=nil )
# 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 )
+ d = OpenTox::Dataset.find( validation.test_target_dataset_uri, subjectid )
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
diff --git a/report/validation_data.rb b/report/validation_data.rb
index fcb8fc0..42b179b 100755
--- a/report/validation_data.rb
+++ b/report/validation_data.rb
@@ -105,7 +105,7 @@ module Reports
# returns the predictions feature values (i.e. the domain of the class attribute)
#
def get_accept_values()
- @accept_values = @@validation_access.get_accept_values(self) unless @accept_values
+ @accept_values = @@validation_access.get_accept_values(self, @subjectid) unless @accept_values
@accept_values
end