Previous changeset 3:968863bd9008 (2018-03-13) Next changeset 5:f1761288587e (2018-04-10) |
Commit message:
planemo upload for repository https://github.com/bgruening/galaxytools/tools/sklearn commit cea052cf3b8dd4f3620253bd222e126de32e7466 |
modified:
ensemble.xml main_macros.xml |
b |
diff -r 968863bd9008 -r 0431274c367d ensemble.xml --- 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 ) |
b |
diff -r 968863bd9008 -r 0431274c367d main_macros.xml --- a/main_macros.xml Tue Mar 13 06:30:55 2018 -0400 +++ b/main_macros.xml Thu Mar 22 13:46:46 2018 -0400 |
b |
@@ -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> |