# HG changeset patch
# User bgruening
# Date 1520931443 14400
# Node ID 504ea7ea42b148d8e5b15ce5f43da81c9c1b0f67
# Parent  813b38053344b1f6e91575084c437c1b36e265d1
planemo upload for repository https://github.com/bgruening/galaxytools/tools/sklearn commit 641ac64ded23fbb6fe85d5f13926da12dcce4e76

diff -r 813b38053344 -r 504ea7ea42b1 clf_metrics.xml
--- a/clf_metrics.xml	Fri Feb 16 14:56:35 2018 -0500
+++ b/clf_metrics.xml	Tue Mar 13 04:57:23 2018 -0400
@@ -27,8 +27,20 @@
 params = json.load(open(input_json_path, "r"))
 
 
-y_t = columns("$clf_metrics.infile1","$clf_metrics.col1")
-y_p = columns("$clf_metrics.infile2","$clf_metrics.col2")
+y_t = read_columns(
+        "$clf_metrics.infile1",
+        "$clf_metrics.col1",
+        sep='\t',
+        header=None,
+        parse_dates=True
+)
+y_p = read_columns(
+        "$clf_metrics.infile2",
+        "$clf_metrics.col2",
+        sep='\t',
+        header=None,
+        parse_dates=True
+)
 
 options = params["clf_metrics"].get("options", {})
 print(options)
diff -r 813b38053344 -r 504ea7ea42b1 main_macros.xml
--- a/main_macros.xml	Fri Feb 16 14:56:35 2018 -0500
+++ b/main_macros.xml	Tue Mar 13 04:57:23 2018 -0400
@@ -2,8 +2,8 @@
   <token name="@VERSION@">0.9</token>
 
   <token name="@COLUMNS_FUNCTION@">
-def columns(f,c):
-  data = pandas.read_csv(f, sep='\t', header=None, index_col=None, parse_dates=True, encoding=None, tupleize_cols=False)
+def read_columns(f, c, **args):
+  data = pandas.read_csv(f, **args)
   cols = c.split (',')
   cols = map(int, cols)
   cols = list(map(lambda x: x - 1, cols))