Mercurial > repos > melpetera > utilitaires

changeset 27:e1b75c764ffe draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author melpetera
date Tue, 30 Jul 2019 12:31:21 -0400
parents 24d086f27a49
children f24d5a9c11ac
files CorrTable/Corr.xml CorrTable/Corr_Script_samples_row.R
diffstat 2 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/CorrTable/Corr.xml	Tue Jul 30 12:19:28 2019 -0400
+++ b/CorrTable/Corr.xml	Tue Jul 30 12:31:21 2019 -0400
@@ -210,10 +210,7 @@
 	<outputs>
 		<data name="tabcorr_out" label="CorrTable" format="tabular" />
 		<data name="heatmap_out" label="CT_plot" format="pdf" >
-			<filter>options['plot_choice'] == 'auto'</filter>
-		</data>
-		<data name="heatmap_out" label="CT_plot" format="pdf" >
-			<filter>options['plot_choice'] == 'forced'</filter>
+			<filter>out_section.plot_cond['plot_choice'] == 'auto' or out_section.plot_cond['plot_choice'] == 'forced'</filter>
 		</data>
 	</outputs>
 	
--- a/CorrTable/Corr_Script_samples_row.R	Tue Jul 30 12:19:28 2019 -0400
+++ b/CorrTable/Corr_Script_samples_row.R	Tue Jul 30 12:31:21 2019 -0400
@@ -136,7 +136,7 @@
   if((ncol(tab1)==ncol(tab2))&&(sum(tab1!=tab2,na.rm=TRUE)==0)){
     autocor <- TRUE
 	err.msg <- c(err.msg, "\nYou chose the same table for the two dataset inputs. \nTo allow filtering options,",
-	             "we will turn the diagonal to 0 in the correlation matrix during the filtering process.\n\n")
+	             "we will turn the diagonal to 0 in the correlation matrix during the filtering process.\n")
   }else{
     autocor <- FALSE
   }