# HG changeset patch
# User bgruening
# Date 1527031568 14400
# Node ID ec9bf05517634acbcfb59974038944ec4906f630
# Parent 9399daff63142970361d8f7a1c49e1f1c16292fc
planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/sklearn commit 79fe42239dcf077b13f85cbcd6c6e30d7e1e4832
diff -r 9399daff6314 -r ec9bf0551763 main_macros.xml
--- a/main_macros.xml Sat Apr 28 18:02:22 2018 -0400
+++ b/main_macros.xml Tue May 22 19:26:08 2018 -0400
@@ -2,12 +2,17 @@
0.9
-def read_columns(f, c, **args):
+def read_columns(f, c, return_df=False, **args):
data = pandas.read_csv(f, **args)
cols = c.split (',')
cols = map(int, cols)
cols = list(map(lambda x: x - 1, cols))
- y = data.iloc[:,cols].values
+ data = data.iloc[:,cols]
+ y = data.values
+ if return_df:
+ return y, data
+ else:
+ return y
return y
@@ -789,6 +794,128 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 9399daff6314 -r ec9bf0551763 test-data/feature_selection_result01
--- a/test-data/feature_selection_result01 Sat Apr 28 18:02:22 2018 -0400
+++ b/test-data/feature_selection_result01 Tue May 22 19:26:08 2018 -0400
@@ -1,4 +1,4 @@
-0 1
+temp_1 average
69.0 69.7
59.0 58.1
88.0 77.3
diff -r 9399daff6314 -r ec9bf0551763 test-data/feature_selection_result02
--- a/test-data/feature_selection_result02 Sat Apr 28 18:02:22 2018 -0400
+++ b/test-data/feature_selection_result02 Tue May 22 19:26:08 2018 -0400
@@ -1,4 +1,4 @@
-0 1 2 3
+temp_2 temp_1 forecast_noaa friend
68.0 69.0 65.0 88.0
60.0 59.0 57.0 66.0
85.0 88.0 75.0 70.0
diff -r 9399daff6314 -r ec9bf0551763 test-data/feature_selection_result03
--- a/test-data/feature_selection_result03 Sat Apr 28 18:02:22 2018 -0400
+++ b/test-data/feature_selection_result03 Tue May 22 19:26:08 2018 -0400
@@ -1,4 +1,4 @@
-0 1
+temp_1 friend
69.0 88.0
59.0 66.0
88.0 70.0
diff -r 9399daff6314 -r ec9bf0551763 test-data/feature_selection_result04
--- a/test-data/feature_selection_result04 Sat Apr 28 18:02:22 2018 -0400
+++ b/test-data/feature_selection_result04 Tue May 22 19:26:08 2018 -0400
@@ -1,4 +1,4 @@
-0 1 2 3 4 5 6 7 8 9
+month day temp_2 temp_1 average forecast_noaa forecast_acc forecast_under friend week_Mon
9.0 19.0 68.0 69.0 69.7 65.0 74.0 71.0 88.0 1.0
4.0 14.0 60.0 59.0 58.1 57.0 63.0 58.0 66.0 0.0
7.0 30.0 85.0 88.0 77.3 75.0 79.0 77.0 70.0 0.0
diff -r 9399daff6314 -r ec9bf0551763 test-data/feature_selection_result05
--- a/test-data/feature_selection_result05 Sat Apr 28 18:02:22 2018 -0400
+++ b/test-data/feature_selection_result05 Tue May 22 19:26:08 2018 -0400
@@ -1,4 +1,4 @@
-0 1 2 3 4 5 6 7 8
+month day temp_2 temp_1 average forecast_noaa forecast_acc forecast_under friend
9.0 19.0 68.0 69.0 69.7 65.0 74.0 71.0 88.0
4.0 14.0 60.0 59.0 58.1 57.0 63.0 58.0 66.0
7.0 30.0 85.0 88.0 77.3 75.0 79.0 77.0 70.0
diff -r 9399daff6314 -r ec9bf0551763 test-data/feature_selection_result06
--- a/test-data/feature_selection_result06 Sat Apr 28 18:02:22 2018 -0400
+++ b/test-data/feature_selection_result06 Tue May 22 19:26:08 2018 -0400
@@ -1,4 +1,4 @@
-0 1 2 3 4 5 6 7 8
+month day temp_2 temp_1 average forecast_noaa forecast_acc forecast_under friend
9.0 19.0 68.0 69.0 69.7 65.0 74.0 71.0 88.0
4.0 14.0 60.0 59.0 58.1 57.0 63.0 58.0 66.0
7.0 30.0 85.0 88.0 77.3 75.0 79.0 77.0 70.0
diff -r 9399daff6314 -r ec9bf0551763 test-data/feature_selection_result07
--- a/test-data/feature_selection_result07 Sat Apr 28 18:02:22 2018 -0400
+++ b/test-data/feature_selection_result07 Tue May 22 19:26:08 2018 -0400
@@ -1,4 +1,4 @@
-0 1 2 3 4 5 6 7 8
+month day temp_2 temp_1 average forecast_noaa forecast_acc forecast_under friend
9.0 19.0 68.0 69.0 69.7 65.0 74.0 71.0 88.0
4.0 14.0 60.0 59.0 58.1 57.0 63.0 58.0 66.0
7.0 30.0 85.0 88.0 77.3 75.0 79.0 77.0 70.0
diff -r 9399daff6314 -r ec9bf0551763 test-data/feature_selection_result08
--- a/test-data/feature_selection_result08 Sat Apr 28 18:02:22 2018 -0400
+++ b/test-data/feature_selection_result08 Tue May 22 19:26:08 2018 -0400
@@ -1,4 +1,4 @@
-0 1 2 3 4 5 6 7
+day temp_2 temp_1 average forecast_noaa forecast_acc forecast_under friend
19.0 68.0 69.0 69.7 65.0 74.0 71.0 88.0
14.0 60.0 59.0 58.1 57.0 63.0 58.0 66.0
30.0 85.0 88.0 77.3 75.0 79.0 77.0 70.0
diff -r 9399daff6314 -r ec9bf0551763 test-data/feature_selection_result09
--- a/test-data/feature_selection_result09 Sat Apr 28 18:02:22 2018 -0400
+++ b/test-data/feature_selection_result09 Tue May 22 19:26:08 2018 -0400
@@ -1,4 +1,4 @@
-0 1 2 3 4 5 6 7 8 9 10 11 12 13
+month day temp_2 temp_1 average forecast_noaa forecast_acc forecast_under friend week_Fri week_Mon week_Sat week_Sun week_Tues
9.0 19.0 68.0 69.0 69.7 65.0 74.0 71.0 88.0 0.0 1.0 0.0 0.0 0.0
4.0 14.0 60.0 59.0 58.1 57.0 63.0 58.0 66.0 0.0 0.0 0.0 0.0 0.0
7.0 30.0 85.0 88.0 77.3 75.0 79.0 77.0 70.0 0.0 0.0 1.0 0.0 0.0
diff -r 9399daff6314 -r ec9bf0551763 test-data/feature_selection_result10
--- a/test-data/feature_selection_result10 Sat Apr 28 18:02:22 2018 -0400
+++ b/test-data/feature_selection_result10 Tue May 22 19:26:08 2018 -0400
@@ -1,4 +1,4 @@
-0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
+month day temp_2 temp_1 average forecast_noaa forecast_acc forecast_under friend week_Fri week_Mon week_Sat week_Sun week_Thurs week_Tues week_Wed
9.0 19.0 68.0 69.0 69.7 65.0 74.0 71.0 88.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0
4.0 14.0 60.0 59.0 58.1 57.0 63.0 58.0 66.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0
7.0 30.0 85.0 88.0 77.3 75.0 79.0 77.0 70.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0