diff CorrTable/Corr_wrap.r @ 1:431644dd0d9a draft

Uploaded
author melpetera
date Thu, 01 Aug 2019 11:17:35 -0400
parents ab8bce1e75b0
children f47f08b4b35c
line wrap: on
line diff
--- a/CorrTable/Corr_wrap.r	Mon Jan 14 08:41:33 2019 -0500
+++ b/CorrTable/Corr_wrap.r	Thu Aug 01 11:17:35 2019 -0400
@@ -4,10 +4,12 @@
 # WRAPPER FOR Corr_Script_samples_row.R (CORRELATION TABLE)                                    #
 #                                                                                              #
 # Author: Ophelie BARBET                                                                       #
+# Maintainer: Melanie PETERA                                                                   #
 # User: Galaxy                                                                                 #
 # Original data: used with Corr_Script_samples_row.R                                           #
 # Starting date:                                                                               #
 # V-1: First version of wrapper                                                                #
+# V-2: Corresponds to XML version 1.0.0                                                        #
 #                                                                                              #
 #                                                                                              #
 # Input files: 2 tables with common samples file                                               #
@@ -56,6 +58,7 @@
 type_classes <- NULL
 reg_class_value <- NULL
 irreg_class_vect <- NULL
+if(args$plot_choice == "none"){args$color_heatmap <- "no"; args$heatmap_out <- NULL}
 if(args$color_heatmap == "yes"){
 	type_classes <- args$type_classes
 	if(type_classes == "regular"){
@@ -67,7 +70,7 @@
 
 
 correlation.tab(args$tab1_in, args$tab2_in, args$tab1_samples, args$tab2_samples, args$corr_method, args$test_corr, risk_alpha, correct_multi, args$filter, filters_choice, threshold,
-args$reorder_var, args$color_heatmap, type_classes, reg_class_value, irreg_class_vect, args$tabcorr_out, args$heatmap_out)
+args$reorder_var, args$plot_choice, args$color_heatmap, type_classes, reg_class_value, irreg_class_vect, args$tabcorr_out, args$heatmap_out)
 
 
 cat('\n--------------------------------------------------------------------',