Mercurial > repos > bgruening > sklearn_generalized_linear

changeset 4:fd6c50f21cd0 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/bgruening/galaxytools/tools/sklearn commit cea052cf3b8dd4f3620253bd222e126de32e7466
author bgruening
date Thu, 22 Mar 2018 13:47:44 -0400
parents be8d2100f07b
children f93e7b870023
files generalized_linear.xml main_macros.xml
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/generalized_linear.xml	Tue Mar 13 06:32:19 2018 -0400
+++ b/generalized_linear.xml	Thu Mar 22 13:47:44 2018 -0400
@@ -33,22 +33,24 @@
 options = params["selected_tasks"]["selected_algorithms"]["options"]
 
 #if $selected_tasks.selected_algorithms.input_options.selected_input=="tabular":
+header = 'infer' if params["selected_tasks"]["selected_algorithms"]["input_options"]["header1"] else None
 X = read_columns(
         "$selected_tasks.selected_algorithms.input_options.infile1",
         "$selected_tasks.selected_algorithms.input_options.col1",
         sep='\t',
-        header=None,
+        header=header,
         parse_dates=True
 )
 #else:
 X = mmread(open("$selected_tasks.selected_algorithms.input_options.infile1", 'r'))
 #end if
 
+header = 'infer' if params["selected_tasks"]["selected_algorithms"]["input_options"]["header2"] else None
 y = read_columns(
         "$selected_tasks.selected_algorithms.input_options.infile2",
         "$selected_tasks.selected_algorithms.input_options.col2",
         sep='\t',
-        header=None,
+        header=header,
         parse_dates=True
 )
 
--- a/main_macros.xml	Tue Mar 13 06:32:19 2018 -0400
+++ b/main_macros.xml	Thu Mar 22 13:47:44 2018 -0400
@@ -336,8 +336,10 @@
 
   <xml name="samples_tabular" token_multiple1="False" token_multiple2="False">
     <param name="infile1" type="data" format="tabular" label="Training samples dataset:"/>
+    <param name="header1" type="boolean" optional="True" truevalue="booltrue" falsevalue="boolfalse" checked="False" label="Does the dataset contain header:" />
     <param name="col1" multiple="@MULTIPLE1@" type="data_column" data_ref="infile1" label="Select target column(s):"/>
     <param name="infile2" type="data" format="tabular" label="Dataset containing class labels:"/>
+    <param name="header2" type="boolean" optional="True" truevalue="booltrue" falsevalue="boolfalse" checked="False" label="Does the dataset contain header:" />
     <param name="col2" multiple="@MULTIPLE2@" type="data_column" data_ref="infile2" label="Select target column(s):"/>
     <yield/>
   </xml>