summaryrefslogtreecommitdiff
path: root/report
diff options
context:
space:
mode:
authormguetlein <martin.guetlein@gmail.com>2012-10-12 10:27:15 +0200
committermguetlein <martin.guetlein@gmail.com>2012-10-12 10:27:15 +0200
commitba9d3e628e424a84d8c892c4fdf49c2258a95352 (patch)
tree4dbbf4269e6e3dc1dd94024921255a506a5fa921 /report
parentcd8800cf377b5b8c07dc25f3629e503f01bc9112 (diff)
add contra splitting, provide access to dataset-splits, minor stuff
Diffstat (limited to 'report')
-rw-r--r--report/plot_factory.rb2
-rw-r--r--report/report_service.rb2
-rwxr-xr-xreport/validation_access.rb3
3 files changed, 5 insertions, 2 deletions
diff --git a/report/plot_factory.rb b/report/plot_factory.rb
index 61c3eea..a2be092 100644
--- a/report/plot_factory.rb
+++ b/report/plot_factory.rb
@@ -125,7 +125,7 @@ module Reports
else
Reports::r_util.feature_value_plot(out_files, validation_set.validations[0].training_feature_dataset_uri,
validation_set.validations[0].test_feature_dataset_uri, "Training Data", "Test Data",
- nil, validation_set.validations[0].subjectid, waiting_task )
+ validation_set.validations[0].prediction_feature, validation_set.validations[0].subjectid, waiting_task )
end
end
diff --git a/report/report_service.rb b/report/report_service.rb
index f315b04..f11a7a8 100644
--- a/report/report_service.rb
+++ b/report/report_service.rb
@@ -25,7 +25,7 @@ module Reports
def initialize(home_uri)
raise "supposed to be a singleton" if defined?@@instance
raise "plz specify home_uri" unless home_uri
- LOGGER.info "init report service"
+ #LOGGER.info "init report service"
@home_uri = home_uri
@@instance = self
end
diff --git a/report/validation_access.rb b/report/validation_access.rb
index 4d9ed9f..463337b 100755
--- a/report/validation_access.rb
+++ b/report/validation_access.rb
@@ -158,6 +158,9 @@ class Reports::ValidationDB
if features_found
LOGGER.debug "all training-features found in test-datset"
uri = test_dataset.uri
+ elsif validation.model_uri=~/superservice/
+ uri = OpenTox::RestClientWrapper.post(validation.model_uri+"/test_dataset_features",
+ {:dataset_uri=>validation.test_dataset_uri}).to_s
else
m = OpenTox::Model::Generic.find(validation.model_uri, subjectid)
feat_gen = nil