# HG changeset patch # User bgruening # Date 1528321189 14400 # Node ID ef365d71514e8f55027a40d7360160635ec79893 # Parent c5feb1a67e9bed9caf2e93cb20aa1f62b0f33768 planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/sklearn commit 64158f357e708f0b60d2669d92d614f7aee34c0e diff -r c5feb1a67e9b -r ef365d71514e main_macros.xml --- a/main_macros.xml Tue Jun 05 06:42:21 2018 -0400 +++ b/main_macros.xml Wed Jun 06 17:39:49 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 @@ - - - --> + + + + diff -r c5feb1a67e9b -r ef365d71514e regression_metrics.xml --- a/regression_metrics.xml Tue Jun 05 06:42:21 2018 -0400 +++ b/regression_metrics.xml Wed Jun 06 17:39:49 2018 -0400 @@ -28,7 +28,7 @@ header='infer' if params["regression_metrics"]["header1"] else None column_option = params["regression_metrics"]["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["regression_metrics"]["column_selector_options_1"]["col1"] else: c = None @@ -43,7 +43,7 @@ header='infer' if params["regression_metrics"]["header2"] else None column_option = params["regression_metrics"]["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["regression_metrics"]["column_selector_options_2"]["col2"] else: c = None @@ -167,7 +167,8 @@ - + + @@ -180,7 +181,8 @@ - + +