Mercurial > repos > bgruening > sklearn_feature_selection

changeset 5:2d681d0f9393 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/tree/master/tools/sklearn commit 64158f357e708f0b60d2669d92d614f7aee34c0e
author bgruening
date Wed, 06 Jun 2018 17:43:13 -0400
parents 44e26f8a82c6
children b0d554b38770
files feature_selection.xml main_macros.xml
diffstat 2 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/feature_selection.xml	Tue Jun 05 06:46:40 2018 -0400
+++ b/feature_selection.xml	Wed Jun 06 17:43:13 2018 -0400
@@ -36,7 +36,7 @@
 if input_type=="tabular":
     header = 'infer' if features_has_header else None
     column_option = params["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["input_options"]["column_selector_options_1"]["col1"]
     else:
         c = None
@@ -55,7 +55,7 @@
 ## Read labels
 header = 'infer' if params["input_options"]["header2"] else None
 column_option = params["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["input_options"]["column_selector_options_2"]["col2"]
 else:
     c = None
--- a/main_macros.xml	Tue Jun 05 06:46:40 2018 -0400
+++ b/main_macros.xml	Wed Jun 06 17:43:13 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>