diff options
Diffstat (limited to 'reach_reports')
| -rwxr-xr-x | reach_reports/reach_application.rb | 11 | ||||
| -rwxr-xr-x | reach_reports/reach_service.rb | 14 |
2 files changed, 17 insertions, 8 deletions
diff --git a/reach_reports/reach_application.rb b/reach_reports/reach_application.rb index e35df7b..b380c92 100755 --- a/reach_reports/reach_application.rb +++ b/reach_reports/reach_application.rb @@ -48,6 +48,7 @@ end get '/reach_report/:type' do type = extract_type(params) LOGGER.info "list all "+type+" reports" + uris = ReachReports.list_reports(type,params[:model] || params[:model_uri]) if request.env['HTTP_ACCEPT'] =~ /text\/html/ content_type "text/html" related_links = @@ -66,10 +67,10 @@ get '/reach_report/:type' do when /(?i)QPRF/ #TODO end - OpenTox.text_to_html ReachReports.list_reports(type),@subjectid,related_links,description,post_command + OpenTox.text_to_html uris,@subjectid,related_links,description,post_command else content_type "text/uri-list" - ReachReports.list_reports(type) + uris end end @@ -181,6 +182,12 @@ get '/reach_report/:type/:id/editor' do <j2se version="1.6+" java-vm-args="-Xincgc"/> <jar href="qmrfedit/OT_QMRFEditor.jar" download="eager" main="true"/> +<jar href="qmrfedit/OT_QMRFEditor_lib/xercesImpl.jar" download="eager"/> +<jar href="qmrfedit/OT_QMRFEditor_lib/itext-1.4.5.jar" download="lazy"/> +<jar href="qmrfedit/OT_QMRFEditor_lib/poi-3.0.jar" download="lazy"/> +<jar href="qmrfedit/OT_QMRFEditor_lib/poi-contrib.jar" download="lazy"/> +<jar href="qmrfedit/OT_QMRFEditor_lib/poi-scratchpad.jar" download="lazy"/> +<jar href="qmrfedit/OT_QMRFEditor_lib/commons-lang-2.3.jar" download="lazy"/> <jar href="qmrfedit/OT_QMRFEditor_lib/cdk-applications.jar" download="lazy" /> <jar href="qmrfedit/OT_QMRFEditor_lib/cdk-builder3d.jar" download="lazy" /> <jar href="qmrfedit/OT_QMRFEditor_lib/cdk-charges.jar" download="lazy" /> diff --git a/reach_reports/reach_service.rb b/reach_reports/reach_service.rb index fa4c0d7..5dd68e1 100755 --- a/reach_reports/reach_service.rb +++ b/reach_reports/reach_service.rb @@ -12,10 +12,12 @@ end module ReachReports - def self.list_reports(type) + def self.list_reports(type, model_uri=nil) case type when /(?i)QMRF/ - ReachReports::QmrfReport.all.collect{ |r| r.report_uri }.join("\n")+"\n" + params = {} + params[:model_uri]=model_uri if model_uri + ReachReports::QmrfReport.all(params).collect{ |r| r.report_uri }.join("\n")+"\n" when /(?i)QPRF/ ReachReports::QprfReport.all.collect{ |r| r.report_uri }.join("\n")+"\n" end @@ -108,8 +110,8 @@ module ReachReports # TODO app_domain_description, app_domain_method, app_domain_software, applicability_limits #training_dataset = model.trainingDataset ? OpenTox::Dataset.find(model.trainingDataset+"/metadata") : nil - if ( OpenTox::Dataset.exist?(model.metadata[OT.trainingDataset]) ) - training_dataset = OpenTox::Dataset.new( model.metadata[OT.trainingDataset] ) + if ( OpenTox::Dataset.exist?(model.metadata[OT.trainingDataset], r.subjectid) ) + training_dataset = OpenTox::Dataset.new( model.metadata[OT.trainingDataset], r.subjectid ) training_dataset.load_metadata( r.subjectid ) else training_dataset = nil @@ -227,7 +229,7 @@ module ReachReports case feature_type when "classification" v << "percent_correct: "+validation.classification_statistics[:percent_correct].to_s - v << "weighted AUC: "+validation.classification_statistics[:weighted_area_under_roc].to_s + v << "average AUC: "+validation.classification_statistics[:average_area_under_roc].to_s when "regression" v << "root_mean_squared_error: "+validation.regression_statistics[:root_mean_squared_error].to_s v << "r_square "+validation.regression_statistics[:r_square].to_s @@ -270,7 +272,7 @@ module ReachReports val_datasets.each do |data_uri| if OpenTox::Dataset.exist?(data_uri, r.subjectid) - d = OpenTox::Dataset.new(data_uri) + d = OpenTox::Dataset.new(data_uri, r.subjectid) d.load_metadata( r.subjectid) r.qsar_miscellaneous.attachment_validation_data << AttachmentValidationData.new( { :description => d.title, |