Mercurial > repos > bgruening > sklearn_ensemble

changeset 4:0431274c367d 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:46:46 -0400
parents 968863bd9008
children f1761288587e
files ensemble.xml main_macros.xml
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ensemble.xml	Tue Mar 13 06:30:55 2018 -0400
+++ b/ensemble.xml	Thu Mar 22 13:46:46 2018 -0400
@@ -22,32 +22,34 @@
 import pickle
 from scipy.io import mmread
 
+@COLUMNS_FUNCTION@
+
 input_json_path = sys.argv[1]
 params = json.load(open(input_json_path, "r"))
 
-@COLUMNS_FUNCTION@
-
 #if $selected_tasks.selected_task == "train":
 
 algorithm = params["selected_tasks"]["selected_algorithms"]["selected_algorithm"]
 options = params["selected_tasks"]["selected_algorithms"]["options"]
 input_type = params["selected_tasks"]["selected_algorithms"]["input_options"]["selected_input"]
 if input_type=="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'))
 
+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:30:55 2018 -0400
+++ b/main_macros.xml	Thu Mar 22 13:46:46 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>