changeset 11:6cf4b82c72bc draft

planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/sklearn commit 64158f357e708f0b60d2669d92d614f7aee34c0e

--- a/generalized_linear.xml	Tue Jun 05 06:47:46 2018 -0400
+++ b/generalized_linear.xml	Wed Jun 06 17:44:20 2018 -0400
@@ -35,7 +35,7 @@
 #if $selected_tasks.selected_algorithms.input_options.selected_input=="tabular":
 header = 'infer' if params["selected_tasks"]["selected_algorithms"]["input_options"]["header1"] else None
 column_option = params["selected_tasks"]["selected_algorithms"]["input_options"]["column_selector_options_1"]["selected_column_selector_option"]
-if column_option == "by_index_number":
+if column_option in ["by_index_number", "all_but_by_index_number"]:
     c = params["selected_tasks"]["selected_algorithms"]["input_options"]["column_selector_options_1"]["col1"]
 else:
     c = None
@@ -53,7 +53,7 @@
 
 header = 'infer' if params["selected_tasks"]["selected_algorithms"]["input_options"]["header2"] else None
 column_option = params["selected_tasks"]["selected_algorithms"]["input_options"]["column_selector_options_2"]["selected_column_selector_option2"]
-if column_option == "by_index_number":
+if column_option in ["by_index_number", "all_but_by_index_number"]:
     c = params["selected_tasks"]["selected_algorithms"]["input_options"]["column_selector_options_2"]["col2"]
 else:
     c = None
@@ -240,7 +240,8 @@
         <test>
             <param name="infile1" value="regression_train.tabular" ftype="tabular"/>
             <param name="infile2" value="regression_train.tabular" ftype="tabular"/>
-            <param name="col1" value="1,2,3,4,5"/>
+            <param name="selected_column_selector_option" value="all_but_by_index_number"/>
+            <param name="col1" value="6"/>
             <param name="col2" value="6"/>
             <param name="selected_task" value="train"/>
             <param name="selected_algorithm" value="SGDRegressor"/>

--- a/main_macros.xml	Tue Jun 05 06:47:46 2018 -0400
+++ b/main_macros.xml	Wed Jun 06 17:44:20 2018 -0400
@@ -7,6 +7,9 @@
   if c_option == 'by_index_number':
     cols = list(map(lambda x: x - 1, c))
     data = data.iloc[:,cols]
+  if c_option == 'all_but_by_index_number':
+    cols = list(map(lambda x: x - 1, c))
+    data.drop(data.columns[cols], axis=1, inplace=True)
   y = data.values
   if return_df:
     return y, data
@@ -443,16 +446,17 @@
   <xml name="samples_column_selector_options" token_column_option="selected_column_selector_option" token_col_name="col1" token_multiple="False" token_infile="infile1">
     <param name="@COLUMN_OPTION@" type="select" label="Choose how to select data by column:">
       <option value="by_index_number" selected="true">Select columns by column index number(s)</option>
-      <!--
-      <option value="by_header_name">Select columns by column header name(s)</option>
+      <!--<option value="by_header_name">Select columns by column header name(s)</option>-->
       <option value="all_but_by_index_number">All columns but by column index number(s)</option>
-      <option value="all_but_by_header_name">All columns but by column header name(s)</option> 
-      -->
+      <!--<option value="all_but_by_header_name">All columns but by column header name(s)</option> -->
       <option value="all_columns">All columns</option>
     </param>
     <when value="by_index_number">
       <param name="@COL_NAME@" multiple="@MULTIPLE@" type="data_column" data_ref="@INFILE@" label="Select target column(s):"/>
     </when>
+    <when value="all_but_by_index_number">
+      <param name="@COL_NAME@" multiple="@MULTIPLE@" type="data_column" data_ref="@INFILE@" label="Select target column(s):"/>
+    </when>
     <when value="all_columns">
     </when>
   </xml>