Mercurial > repos > greg > ideas

changeset 158:c996089f1747 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Fri, 12 Jan 2018 14:14:19 -0500
parents b63f2ae4261a
children 04db93e8566b
files ideas.xml
diffstat 1 files changed, 14 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ideas.xml	Fri Jan 12 14:02:27 2018 -0500
+++ b/ideas.xml	Fri Jan 12 14:14:19 2018 -0500
@@ -179,21 +179,27 @@
     #end if
 #end if
 #if str($perform_training) == "yes":
-    #set heatmaps_input_dir = $output_training_dir
     && mv ./*.para0 '$output_training_dir'
     && mv ./*.profile0 '$output_training_dir'
+    #if str($output_heatmaps) == "yes":
+        && Rscript '$__tool_directory__/create_heatmaps.R'
+        --input_dir 'input_training_dir'
+        --output_dir '$output_pdf_dir'
+        --script_dir '$__tool_directory__'
+        --training_mode true
+    #end if
+#end if
 #else:
-    #set heatmaps_input_dir = $output_txt_dir
     && mv ./*.cluster '$output_txt_dir'
     && mv ./*.para '$output_txt_dir'
     && mv ./*.profile '$output_txt_dir'
     && mv ./*.state '$output_txt_dir'
-#end if
-#if str($output_heatmaps) == "yes":
-    && Rscript '$__tool_directory__/create_heatmaps.R'
-    --input_dir '$heatmaps_input_dir'
-    --output_dir '$output_pdf_dir'
-    --script_dir '$__tool_directory__'
+    #if str($output_heatmaps) == "yes":
+        && Rscript '$__tool_directory__/create_heatmaps.R'
+        --input_dir '$output_txt_dir'
+        --output_dir '$output_pdf_dir'
+        --script_dir '$__tool_directory__'
+    #end if
 #end if
     ]]></command>
     <configfiles>