# HG changeset patch # User bgruening # Date 1451671097 18000 # Node ID 1d465f2ebfad6d974b2b4a0192bbc3b31ad09435 # Parent d645cdee08ed69c320440df615851e3db77a8866 planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/numeric_clustering commit adf077b912ddebd97b07b947b855cdd2862ed8ef diff -r d645cdee08ed -r 1d465f2ebfad numeric_clustering.xml --- a/numeric_clustering.xml Fri Jan 01 10:42:52 2016 -0500 +++ b/numeric_clustering.xml Fri Jan 01 12:58:17 2016 -0500 @@ -8,9 +8,9 @@ 0.9 - - + + @@ -62,37 +62,46 @@ #set $json_string = json.dumps( $params ) python "$cluster_script" '$json_string' + && + cat "$cluster_script" >&2 + ]]> -= $start_column: +#if $end_column and $start_column: + +if $end_column >= $start_column: data_matrix = data.values[:, $start_column-1:$end_column] else: data_matrix = data.values + +#else: +data_matrix = data.values +#end if prediction = cluster_object.fit_predict( data_matrix ) -data['cluster_label'] = prediction -data.to_csv(path_or_buf = "$outfile",sep="\t") +data[len(data.columns)] = prediction +data.to_csv(path_or_buf = "$outfile", sep="\t") ]]> - - - + + + @@ -105,7 +114,7 @@ - + @@ -129,7 +138,7 @@ - + @@ -148,7 +157,7 @@ - + @@ -162,7 +171,7 @@ - + @@ -184,7 +193,7 @@ - + @@ -205,6 +214,8 @@ + + @@ -213,7 +224,9 @@ - + + + @@ -221,6 +234,8 @@ + + @@ -229,19 +244,25 @@ - + + + + + + + @@ -249,24 +270,32 @@ + + + + + + + + @@ -274,16 +303,20 @@ + + - + + + - + @@ -291,6 +324,8 @@ + + @@ -299,6 +334,8 @@ + + @@ -307,8 +344,10 @@ + + - + @@ -316,10 +355,9 @@ - - - - + + + diff -r d645cdee08ed -r 1d465f2ebfad test-data/cluster_result01.txt --- a/test-data/cluster_result01.txt Fri Jan 01 10:42:52 2016 -0500 +++ b/test-data/cluster_result01.txt Fri Jan 01 12:58:17 2016 -0500 @@ -1,6 +1,6 @@ -0 51 48 -73 cluster_label -0 58 56 -67 0 +0 58 56 -67 3 0 44 64 -76 0 +0 51 48 -73 0 0 58 65 -49 0 0 43 61 -49 0 0 45 43 -79 0 @@ -24,26 +24,26 @@ 1 -67 73 50 2 1 -50 97 45 2 1 -61 111 45 2 -2 -109 23 -92 1 -2 -94 20 -96 1 -2 -85 26 -88 1 -2 -90 33 -114 1 -2 -63 9 -106 1 -2 -79 9 -93 1 -2 -99 26 -108 1 -2 -81 19 -110 1 -2 -108 21 -108 1 -2 -92 27 -106 1 -2 -88 2 -106 1 -2 -88 15 -103 1 -3 54 -74 4 3 -3 42 -92 31 3 -3 39 -99 -7 3 -3 48 -115 -5 3 -3 39 -96 2 3 -3 31 -109 9 3 -3 33 -96 -8 3 -3 23 -102 4 3 -3 38 -90 21 3 -3 34 -107 1 3 -3 35 -78 18 3 +2 -109 23 -92 3 +2 -94 20 -96 3 +2 -85 26 -88 3 +2 -90 33 -114 3 +2 -63 9 -106 3 +2 -79 9 -93 3 +2 -99 26 -108 3 +2 -81 19 -110 3 +2 -108 21 -108 3 +2 -92 27 -106 3 +2 -88 2 -106 3 +2 -88 15 -103 3 +3 54 -74 4 1 +3 42 -92 31 1 +3 39 -99 -7 1 +3 48 -115 -5 1 +3 39 -96 2 1 +3 31 -109 9 1 +3 33 -96 -8 1 +3 23 -102 4 1 +3 38 -90 21 1 +3 34 -107 1 1 +3 35 -78 18 1 diff -r d645cdee08ed -r 1d465f2ebfad test-data/cluster_result02.txt --- a/test-data/cluster_result02.txt Fri Jan 01 10:42:52 2016 -0500 +++ b/test-data/cluster_result02.txt Fri Jan 01 12:58:17 2016 -0500 @@ -1,49 +1,49 @@ -0 51 48 -73 cluster_label 0 58 56 -67 3 -0 44 64 -76 2 -0 58 65 -49 3 -0 43 61 -49 3 -0 45 43 -79 2 -0 42 60 -98 2 -0 50 55 -59 3 -0 53 53 -56 3 -0 45 44 -61 3 -0 43 65 -84 2 -0 35 52 -75 2 -0 56 56 -70 3 -1 -61 86 43 4 -1 -67 93 15 4 -1 -59 94 36 4 -1 -50 92 62 4 -1 -78 91 70 4 -1 -35 87 47 4 -1 -56 91 52 4 -1 -61 81 46 4 -1 -83 78 34 4 -1 -50 87 45 4 -1 -67 73 50 4 -1 -50 97 45 4 -1 -61 111 45 4 -2 -109 23 -92 5 -2 -94 20 -96 5 -2 -85 26 -88 5 -2 -90 33 -114 5 -2 -63 9 -106 5 -2 -79 9 -93 5 -2 -99 26 -108 5 -2 -81 19 -110 5 -2 -108 21 -108 5 -2 -92 27 -106 5 -2 -88 2 -106 5 -2 -88 15 -103 5 -3 54 -74 4 0 -3 42 -92 31 0 -3 39 -99 -7 1 -3 48 -115 -5 1 -3 39 -96 2 1 -3 31 -109 9 1 -3 33 -96 -8 1 -3 23 -102 4 1 -3 38 -90 21 0 -3 34 -107 1 1 -3 35 -78 18 0 +0 44 64 -76 1 +0 51 48 -73 1 +0 58 65 -49 1 +0 43 61 -49 1 +0 45 43 -79 1 +0 42 60 -98 1 +0 50 55 -59 1 +0 53 53 -56 1 +0 45 44 -61 1 +0 43 65 -84 1 +0 35 52 -75 1 +0 56 56 -70 1 +1 -61 86 43 0 +1 -67 93 15 0 +1 -59 94 36 0 +1 -50 92 62 0 +1 -78 91 70 0 +1 -35 87 47 0 +1 -56 91 52 0 +1 -61 81 46 0 +1 -83 78 34 0 +1 -50 87 45 0 +1 -67 73 50 0 +1 -50 97 45 0 +1 -61 111 45 0 +2 -109 23 -92 2 +2 -94 20 -96 2 +2 -85 26 -88 2 +2 -90 33 -114 2 +2 -63 9 -106 2 +2 -79 9 -93 2 +2 -99 26 -108 2 +2 -81 19 -110 2 +2 -108 21 -108 2 +2 -92 27 -106 2 +2 -88 2 -106 2 +2 -88 15 -103 2 +3 54 -74 4 3 +3 42 -92 31 3 +3 39 -99 -7 3 +3 48 -115 -5 3 +3 39 -96 2 3 +3 31 -109 9 3 +3 33 -96 -8 3 +3 23 -102 4 3 +3 38 -90 21 3 +3 34 -107 1 3 +3 35 -78 18 3 diff -r d645cdee08ed -r 1d465f2ebfad test-data/cluster_result03.txt --- a/test-data/cluster_result03.txt Fri Jan 01 10:42:52 2016 -0500 +++ b/test-data/cluster_result03.txt Fri Jan 01 12:58:17 2016 -0500 @@ -1,6 +1,6 @@ -0 51 48 -73 cluster_label -0 58 56 -67 -1 +0 58 56 -67 3 0 44 64 -76 -1 +0 51 48 -73 -1 0 58 65 -49 -1 0 43 61 -49 -1 0 45 43 -79 -1 diff -r d645cdee08ed -r 1d465f2ebfad test-data/cluster_result04.txt --- a/test-data/cluster_result04.txt Fri Jan 01 10:42:52 2016 -0500 +++ b/test-data/cluster_result04.txt Fri Jan 01 12:58:17 2016 -0500 @@ -1,16 +1,16 @@ -0 51 48 -73 cluster_label -0 58 56 -67 0 -0 44 64 -76 0 -0 58 65 -49 0 -0 43 61 -49 0 -0 45 43 -79 0 -0 42 60 -98 0 -0 50 55 -59 0 -0 53 53 -56 0 -0 45 44 -61 0 -0 43 65 -84 0 -0 35 52 -75 0 -0 56 56 -70 0 +0 58 56 -67 3 +0 44 64 -76 1 +0 51 48 -73 1 +0 58 65 -49 1 +0 43 61 -49 1 +0 45 43 -79 1 +0 42 60 -98 1 +0 50 55 -59 1 +0 53 53 -56 1 +0 45 44 -61 1 +0 43 65 -84 1 +0 35 52 -75 1 +0 56 56 -70 1 1 -61 86 43 2 1 -67 93 15 2 1 -59 94 36 2 @@ -24,26 +24,26 @@ 1 -67 73 50 2 1 -50 97 45 2 1 -61 111 45 2 -2 -109 23 -92 1 -2 -94 20 -96 1 -2 -85 26 -88 1 -2 -90 33 -114 1 -2 -63 9 -106 1 -2 -79 9 -93 1 -2 -99 26 -108 1 -2 -81 19 -110 1 -2 -108 21 -108 1 -2 -92 27 -106 1 -2 -88 2 -106 1 -2 -88 15 -103 1 -3 54 -74 4 3 -3 42 -92 31 3 -3 39 -99 -7 4 -3 48 -115 -5 4 -3 39 -96 2 4 -3 31 -109 9 4 -3 33 -96 -8 4 -3 23 -102 4 4 -3 38 -90 21 3 -3 34 -107 1 4 -3 35 -78 18 3 +2 -109 23 -92 3 +2 -94 20 -96 3 +2 -85 26 -88 3 +2 -90 33 -114 3 +2 -63 9 -106 3 +2 -79 9 -93 3 +2 -99 26 -108 3 +2 -81 19 -110 3 +2 -108 21 -108 3 +2 -92 27 -106 3 +2 -88 2 -106 3 +2 -88 15 -103 3 +3 54 -74 4 0 +3 42 -92 31 0 +3 39 -99 -7 0 +3 48 -115 -5 0 +3 39 -96 2 0 +3 31 -109 9 0 +3 33 -96 -8 0 +3 23 -102 4 0 +3 38 -90 21 0 +3 34 -107 1 0 +3 35 -78 18 0 diff -r d645cdee08ed -r 1d465f2ebfad test-data/cluster_result05.txt --- a/test-data/cluster_result05.txt Fri Jan 01 10:42:52 2016 -0500 +++ b/test-data/cluster_result05.txt Fri Jan 01 12:58:17 2016 -0500 @@ -1,41 +1,41 @@ -0 51 48 -73 cluster_label -0 58 56 -67 6 -0 44 64 -76 5 -0 58 65 -49 6 -0 43 61 -49 6 -0 45 43 -79 5 -0 42 60 -98 5 -0 50 55 -59 6 -0 53 53 -56 6 -0 45 44 -61 6 -0 43 65 -84 5 -0 35 52 -75 5 +0 58 56 -67 3 +0 44 64 -76 6 +0 51 48 -73 6 +0 58 65 -49 5 +0 43 61 -49 5 +0 45 43 -79 6 +0 42 60 -98 6 +0 50 55 -59 5 +0 53 53 -56 5 +0 45 44 -61 5 +0 43 65 -84 6 +0 35 52 -75 6 0 56 56 -70 6 -1 -61 86 43 0 -1 -67 93 15 0 -1 -59 94 36 2 +1 -61 86 43 3 +1 -67 93 15 7 +1 -59 94 36 3 1 -50 92 62 2 -1 -78 91 70 0 -1 -35 87 47 2 -1 -56 91 52 2 -1 -61 81 46 0 -1 -83 78 34 0 -1 -50 87 45 2 -1 -67 73 50 0 -1 -50 97 45 2 +1 -78 91 70 2 +1 -35 87 47 3 +1 -56 91 52 3 +1 -61 81 46 3 +1 -83 78 34 3 +1 -50 87 45 3 +1 -67 73 50 3 +1 -50 97 45 3 1 -61 111 45 2 -2 -109 23 -92 7 -2 -94 20 -96 3 -2 -85 26 -88 3 -2 -90 33 -114 7 -2 -63 9 -106 3 -2 -79 9 -93 3 -2 -99 26 -108 7 -2 -81 19 -110 3 -2 -108 21 -108 7 -2 -92 27 -106 7 -2 -88 2 -106 3 -2 -88 15 -103 3 +2 -109 23 -92 0 +2 -94 20 -96 0 +2 -85 26 -88 0 +2 -90 33 -114 0 +2 -63 9 -106 0 +2 -79 9 -93 0 +2 -99 26 -108 0 +2 -81 19 -110 0 +2 -108 21 -108 0 +2 -92 27 -106 0 +2 -88 2 -106 0 +2 -88 15 -103 0 3 54 -74 4 1 3 42 -92 31 1 3 39 -99 -7 4 diff -r d645cdee08ed -r 1d465f2ebfad test-data/cluster_result06.txt --- a/test-data/cluster_result06.txt Fri Jan 01 10:42:52 2016 -0500 +++ b/test-data/cluster_result06.txt Fri Jan 01 12:58:17 2016 -0500 @@ -1,6 +1,6 @@ -0 51 48 -73 cluster_label -0 58 56 -67 0 +0 58 56 -67 3 0 44 64 -76 0 +0 51 48 -73 0 0 58 65 -49 0 0 43 61 -49 0 0 45 43 -79 0 diff -r d645cdee08ed -r 1d465f2ebfad test-data/cluster_result07.txt --- a/test-data/cluster_result07.txt Fri Jan 01 10:42:52 2016 -0500 +++ b/test-data/cluster_result07.txt Fri Jan 01 12:58:17 2016 -0500 @@ -1,6 +1,6 @@ -0 51 48 -73 cluster_label -0 58 56 -67 0 +0 58 56 -67 3 0 44 64 -76 0 +0 51 48 -73 0 0 58 65 -49 0 0 43 61 -49 0 0 45 43 -79 0 @@ -24,26 +24,26 @@ 1 -67 73 50 1 1 -50 97 45 1 1 -61 111 45 1 -2 -109 23 -92 2 -2 -94 20 -96 2 -2 -85 26 -88 2 -2 -90 33 -114 2 -2 -63 9 -106 2 -2 -79 9 -93 2 -2 -99 26 -108 2 -2 -81 19 -110 2 -2 -108 21 -108 2 -2 -92 27 -106 2 -2 -88 2 -106 2 -2 -88 15 -103 2 -3 54 -74 4 3 -3 42 -92 31 3 -3 39 -99 -7 3 -3 48 -115 -5 3 -3 39 -96 2 3 -3 31 -109 9 3 -3 33 -96 -8 3 -3 23 -102 4 3 -3 38 -90 21 3 -3 34 -107 1 3 -3 35 -78 18 3 +2 -109 23 -92 0 +2 -94 20 -96 0 +2 -85 26 -88 0 +2 -90 33 -114 0 +2 -63 9 -106 0 +2 -79 9 -93 0 +2 -99 26 -108 0 +2 -81 19 -110 0 +2 -108 21 -108 0 +2 -92 27 -106 0 +2 -88 2 -106 0 +2 -88 15 -103 0 +3 54 -74 4 2 +3 42 -92 31 2 +3 39 -99 -7 2 +3 48 -115 -5 2 +3 39 -96 2 2 +3 31 -109 9 2 +3 33 -96 -8 2 +3 23 -102 4 2 +3 38 -90 21 2 +3 34 -107 1 2 +3 35 -78 18 2 diff -r d645cdee08ed -r 1d465f2ebfad test-data/cluster_result08.txt --- a/test-data/cluster_result08.txt Fri Jan 01 10:42:52 2016 -0500 +++ b/test-data/cluster_result08.txt Fri Jan 01 12:58:17 2016 -0500 @@ -1,6 +1,6 @@ -0 51 48 -73 cluster_label -0 58 56 -67 0 +0 58 56 -67 3 0 44 64 -76 0 +0 51 48 -73 0 0 58 65 -49 0 0 43 61 -49 0 0 45 43 -79 0 @@ -11,19 +11,19 @@ 0 43 65 -84 0 0 35 52 -75 0 0 56 56 -70 0 -1 -61 86 43 0 -1 -67 93 15 0 -1 -59 94 36 0 -1 -50 92 62 0 -1 -78 91 70 0 -1 -35 87 47 0 -1 -56 91 52 0 -1 -61 81 46 0 -1 -83 78 34 0 -1 -50 87 45 0 -1 -67 73 50 0 -1 -50 97 45 0 -1 -61 111 45 0 +1 -61 86 43 1 +1 -67 93 15 1 +1 -59 94 36 1 +1 -50 92 62 1 +1 -78 91 70 1 +1 -35 87 47 1 +1 -56 91 52 1 +1 -61 81 46 1 +1 -83 78 34 1 +1 -50 87 45 1 +1 -67 73 50 1 +1 -50 97 45 1 +1 -61 111 45 1 2 -109 23 -92 0 2 -94 20 -96 0 2 -85 26 -88 0 @@ -36,14 +36,14 @@ 2 -92 27 -106 0 2 -88 2 -106 0 2 -88 15 -103 0 -3 54 -74 4 1 -3 42 -92 31 1 -3 39 -99 -7 1 -3 48 -115 -5 1 -3 39 -96 2 1 -3 31 -109 9 1 -3 33 -96 -8 1 -3 23 -102 4 1 -3 38 -90 21 1 -3 34 -107 1 1 -3 35 -78 18 1 +3 54 -74 4 2 +3 42 -92 31 2 +3 39 -99 -7 2 +3 48 -115 -5 2 +3 39 -96 2 2 +3 31 -109 9 2 +3 33 -96 -8 2 +3 23 -102 4 2 +3 38 -90 21 2 +3 34 -107 1 2 +3 35 -78 18 2 diff -r d645cdee08ed -r 1d465f2ebfad test-data/cluster_result09.txt --- a/test-data/cluster_result09.txt Fri Jan 01 10:42:52 2016 -0500 +++ b/test-data/cluster_result09.txt Fri Jan 01 12:58:17 2016 -0500 @@ -1,6 +1,6 @@ -0 51 48 -73 cluster_label -0 58 56 -67 0 +0 58 56 -67 3 0 44 64 -76 0 +0 51 48 -73 0 0 58 65 -49 0 0 43 61 -49 0 0 45 43 -79 0 @@ -11,19 +11,19 @@ 0 43 65 -84 0 0 35 52 -75 0 0 56 56 -70 0 -1 -61 86 43 0 -1 -67 93 15 0 -1 -59 94 36 0 -1 -50 92 62 0 -1 -78 91 70 0 -1 -35 87 47 0 -1 -56 91 52 0 -1 -61 81 46 0 -1 -83 78 34 0 -1 -50 87 45 0 -1 -67 73 50 0 -1 -50 97 45 0 -1 -61 111 45 0 +1 -61 86 43 1 +1 -67 93 15 1 +1 -59 94 36 1 +1 -50 92 62 1 +1 -78 91 70 1 +1 -35 87 47 1 +1 -56 91 52 1 +1 -61 81 46 1 +1 -83 78 34 1 +1 -50 87 45 1 +1 -67 73 50 1 +1 -50 97 45 1 +1 -61 111 45 1 2 -109 23 -92 0 2 -94 20 -96 0 2 -85 26 -88 0 @@ -36,14 +36,14 @@ 2 -92 27 -106 0 2 -88 2 -106 0 2 -88 15 -103 0 -3 54 -74 4 1 -3 42 -92 31 1 -3 39 -99 -7 1 -3 48 -115 -5 1 -3 39 -96 2 1 -3 31 -109 9 1 -3 33 -96 -8 1 -3 23 -102 4 1 -3 38 -90 21 1 -3 34 -107 1 1 -3 35 -78 18 1 +3 54 -74 4 2 +3 42 -92 31 2 +3 39 -99 -7 2 +3 48 -115 -5 2 +3 39 -96 2 2 +3 31 -109 9 2 +3 33 -96 -8 2 +3 23 -102 4 2 +3 38 -90 21 2 +3 34 -107 1 2 +3 35 -78 18 2 diff -r d645cdee08ed -r 1d465f2ebfad test-data/cluster_result10.txt --- a/test-data/cluster_result10.txt Fri Jan 01 10:42:52 2016 -0500 +++ b/test-data/cluster_result10.txt Fri Jan 01 12:58:17 2016 -0500 @@ -1,41 +1,41 @@ -0 51 48 -73 cluster_label -0 58 56 -67 7 -0 44 64 -76 3 -0 58 65 -49 7 -0 43 61 -49 7 -0 45 43 -79 3 -0 42 60 -98 3 -0 50 55 -59 7 -0 53 53 -56 7 -0 45 44 -61 7 -0 43 65 -84 3 -0 35 52 -75 3 -0 56 56 -70 7 -1 -61 86 43 4 -1 -67 93 15 0 -1 -59 94 36 4 -1 -50 92 62 4 -1 -78 91 70 5 -1 -35 87 47 4 -1 -56 91 52 4 -1 -61 81 46 4 -1 -83 78 34 0 -1 -50 87 45 4 -1 -67 73 50 4 -1 -50 97 45 4 -1 -61 111 45 4 -2 -109 23 -92 1 -2 -94 20 -96 1 -2 -85 26 -88 1 -2 -90 33 -114 1 -2 -63 9 -106 1 -2 -79 9 -93 1 -2 -99 26 -108 1 -2 -81 19 -110 1 -2 -108 21 -108 1 -2 -92 27 -106 1 -2 -88 2 -106 1 -2 -88 15 -103 1 +0 58 56 -67 3 +0 44 64 -76 0 +0 51 48 -73 0 +0 58 65 -49 0 +0 43 61 -49 0 +0 45 43 -79 0 +0 42 60 -98 5 +0 50 55 -59 0 +0 53 53 -56 0 +0 45 44 -61 0 +0 43 65 -84 0 +0 35 52 -75 0 +0 56 56 -70 0 +1 -61 86 43 1 +1 -67 93 15 4 +1 -59 94 36 1 +1 -50 92 62 1 +1 -78 91 70 1 +1 -35 87 47 1 +1 -56 91 52 1 +1 -61 81 46 1 +1 -83 78 34 1 +1 -50 87 45 1 +1 -67 73 50 1 +1 -50 97 45 1 +1 -61 111 45 7 +2 -109 23 -92 3 +2 -94 20 -96 3 +2 -85 26 -88 3 +2 -90 33 -114 3 +2 -63 9 -106 3 +2 -79 9 -93 3 +2 -99 26 -108 3 +2 -81 19 -110 3 +2 -108 21 -108 3 +2 -92 27 -106 3 +2 -88 2 -106 3 +2 -88 15 -103 3 3 54 -74 4 2 3 42 -92 31 2 3 39 -99 -7 6 diff -r d645cdee08ed -r 1d465f2ebfad test-data/cluster_result11.txt --- a/test-data/cluster_result11.txt Fri Jan 01 10:42:52 2016 -0500 +++ b/test-data/cluster_result11.txt Fri Jan 01 12:58:17 2016 -0500 @@ -1,49 +1,49 @@ -0 51 48 -73 cluster_label -0 58 56 -67 0 -0 44 64 -76 0 -0 58 65 -49 0 -0 43 61 -49 0 -0 45 43 -79 0 -0 42 60 -98 0 -0 50 55 -59 0 -0 53 53 -56 0 -0 45 44 -61 0 -0 43 65 -84 0 -0 35 52 -75 0 -0 56 56 -70 0 -1 -61 86 43 4 -1 -67 93 15 2 -1 -59 94 36 2 -1 -50 92 62 2 -1 -78 91 70 4 -1 -35 87 47 2 -1 -56 91 52 2 -1 -61 81 46 4 -1 -83 78 34 4 -1 -50 87 45 2 -1 -67 73 50 4 -1 -50 97 45 2 -1 -61 111 45 2 -2 -109 23 -92 1 -2 -94 20 -96 1 -2 -85 26 -88 1 -2 -90 33 -114 1 -2 -63 9 -106 1 -2 -79 9 -93 1 -2 -99 26 -108 1 -2 -81 19 -110 1 -2 -108 21 -108 1 -2 -92 27 -106 1 -2 -88 2 -106 1 -2 -88 15 -103 1 -3 54 -74 4 3 -3 42 -92 31 3 -3 39 -99 -7 3 -3 48 -115 -5 3 -3 39 -96 2 3 -3 31 -109 9 3 -3 33 -96 -8 3 -3 23 -102 4 3 -3 38 -90 21 3 -3 34 -107 1 3 -3 35 -78 18 3 +0 58 56 -67 3 +0 44 64 -76 2 +0 51 48 -73 2 +0 58 65 -49 2 +0 43 61 -49 2 +0 45 43 -79 2 +0 42 60 -98 2 +0 50 55 -59 2 +0 53 53 -56 2 +0 45 44 -61 2 +0 43 65 -84 2 +0 35 52 -75 2 +0 56 56 -70 2 +1 -61 86 43 0 +1 -67 93 15 0 +1 -59 94 36 0 +1 -50 92 62 0 +1 -78 91 70 0 +1 -35 87 47 0 +1 -56 91 52 0 +1 -61 81 46 0 +1 -83 78 34 0 +1 -50 87 45 0 +1 -67 73 50 0 +1 -50 97 45 0 +1 -61 111 45 0 +2 -109 23 -92 3 +2 -94 20 -96 3 +2 -85 26 -88 3 +2 -90 33 -114 3 +2 -63 9 -106 3 +2 -79 9 -93 3 +2 -99 26 -108 3 +2 -81 19 -110 3 +2 -108 21 -108 3 +2 -92 27 -106 3 +2 -88 2 -106 3 +2 -88 15 -103 3 +3 54 -74 4 1 +3 42 -92 31 1 +3 39 -99 -7 1 +3 48 -115 -5 1 +3 39 -96 2 1 +3 31 -109 9 1 +3 33 -96 -8 1 +3 23 -102 4 1 +3 38 -90 21 1 +3 34 -107 1 1 +3 35 -78 18 1 diff -r d645cdee08ed -r 1d465f2ebfad test-data/cluster_result12.txt --- a/test-data/cluster_result12.txt Fri Jan 01 10:42:52 2016 -0500 +++ b/test-data/cluster_result12.txt Fri Jan 01 12:58:17 2016 -0500 @@ -1,49 +1,49 @@ -0 51 48 -73 cluster_label -0 58 56 -67 0 +0 58 56 -67 3 0 44 64 -76 3 -0 58 65 -49 0 -0 43 61 -49 6 -0 45 43 -79 2 -0 42 60 -98 6 +0 51 48 -73 0 +0 58 65 -49 3 +0 43 61 -49 3 +0 45 43 -79 0 +0 42 60 -98 3 0 50 55 -59 3 0 53 53 -56 3 0 45 44 -61 0 0 43 65 -84 3 -0 35 52 -75 2 +0 35 52 -75 0 0 56 56 -70 0 1 -61 86 43 1 -1 -67 93 15 6 -1 -59 94 36 6 -1 -50 92 62 6 -1 -78 91 70 0 -1 -35 87 47 0 -1 -56 91 52 6 +1 -67 93 15 3 +1 -59 94 36 1 +1 -50 92 62 1 +1 -78 91 70 1 +1 -35 87 47 1 +1 -56 91 52 1 1 -61 81 46 1 -1 -83 78 34 6 -1 -50 87 45 6 -1 -67 73 50 6 -1 -50 97 45 6 -1 -61 111 45 0 -2 -109 23 -92 0 -2 -94 20 -96 4 -2 -85 26 -88 6 -2 -90 33 -114 4 +1 -83 78 34 3 +1 -50 87 45 1 +1 -67 73 50 3 +1 -50 97 45 1 +1 -61 111 45 3 +2 -109 23 -92 1 +2 -94 20 -96 1 +2 -85 26 -88 1 +2 -90 33 -114 3 2 -63 9 -106 0 -2 -79 9 -93 6 -2 -99 26 -108 4 -2 -81 19 -110 4 -2 -108 21 -108 4 -2 -92 27 -106 4 +2 -79 9 -93 3 +2 -99 26 -108 1 +2 -81 19 -110 1 +2 -108 21 -108 1 +2 -92 27 -106 1 2 -88 2 -106 0 -2 -88 15 -103 4 -3 54 -74 4 0 +2 -88 15 -103 0 +3 54 -74 4 3 3 42 -92 31 0 -3 39 -99 -7 1 +3 39 -99 -7 2 3 48 -115 -5 0 -3 39 -96 2 1 -3 31 -109 9 1 -3 33 -96 -8 1 -3 23 -102 4 6 +3 39 -96 2 0 +3 31 -109 9 0 +3 33 -96 -8 2 +3 23 -102 4 0 3 38 -90 21 0 -3 34 -107 1 1 +3 34 -107 1 0 3 35 -78 18 0 diff -r d645cdee08ed -r 1d465f2ebfad test-data/cluster_result13.txt --- a/test-data/cluster_result13.txt Fri Jan 01 10:42:52 2016 -0500 +++ b/test-data/cluster_result13.txt Fri Jan 01 12:58:17 2016 -0500 @@ -1,49 +1,49 @@ -0 51 48 -73 cluster_label -0 58 56 -67 0 +0 58 56 -67 3 0 44 64 -76 3 -0 58 65 -49 3 -0 43 61 -49 3 -0 45 43 -79 2 -0 42 60 -98 3 -0 50 55 -59 4 -0 53 53 -56 4 -0 45 44 -61 0 +0 51 48 -73 6 +0 58 65 -49 0 +0 43 61 -49 0 +0 45 43 -79 6 +0 42 60 -98 1 +0 50 55 -59 7 +0 53 53 -56 7 +0 45 44 -61 6 0 43 65 -84 3 -0 35 52 -75 2 -0 56 56 -70 0 -1 -61 86 43 3 -1 -67 93 15 3 -1 -59 94 36 3 -1 -50 92 62 0 -1 -78 91 70 3 -1 -35 87 47 3 -1 -56 91 52 0 -1 -61 81 46 3 -1 -83 78 34 3 -1 -50 87 45 0 -1 -67 73 50 3 -1 -50 97 45 0 -1 -61 111 45 3 -2 -109 23 -92 0 -2 -94 20 -96 1 -2 -85 26 -88 3 -2 -90 33 -114 5 -2 -63 9 -106 0 -2 -79 9 -93 3 +0 35 52 -75 6 +0 56 56 -70 6 +1 -61 86 43 2 +1 -67 93 15 1 +1 -59 94 36 7 +1 -50 92 62 1 +1 -78 91 70 1 +1 -35 87 47 2 +1 -56 91 52 2 +1 -61 81 46 2 +1 -83 78 34 1 +1 -50 87 45 2 +1 -67 73 50 2 +1 -50 97 45 7 +1 -61 111 45 1 +2 -109 23 -92 5 +2 -94 20 -96 5 +2 -85 26 -88 5 +2 -90 33 -114 1 +2 -63 9 -106 7 +2 -79 9 -93 1 2 -99 26 -108 5 -2 -81 19 -110 1 +2 -81 19 -110 5 2 -108 21 -108 5 2 -92 27 -106 5 -2 -88 2 -106 0 -2 -88 15 -103 1 -3 54 -74 4 3 -3 42 -92 31 6 -3 39 -99 -7 1 -3 48 -115 -5 0 -3 39 -96 2 1 -3 31 -109 9 4 -3 33 -96 -8 1 -3 23 -102 4 0 -3 38 -90 21 6 -3 34 -107 1 4 -3 35 -78 18 6 +2 -88 2 -106 7 +2 -88 15 -103 7 +3 54 -74 4 2 +3 42 -92 31 7 +3 39 -99 -7 4 +3 48 -115 -5 7 +3 39 -96 2 7 +3 31 -109 9 7 +3 33 -96 -8 4 +3 23 -102 4 7 +3 38 -90 21 7 +3 34 -107 1 7 +3 35 -78 18 7 diff -r d645cdee08ed -r 1d465f2ebfad test-data/cluster_result14.txt --- a/test-data/cluster_result14.txt Fri Jan 01 10:42:52 2016 -0500 +++ b/test-data/cluster_result14.txt Fri Jan 01 12:58:17 2016 -0500 @@ -1,49 +1,49 @@ -0 51 48 -73 cluster_label -0 58 56 -67 4 -0 44 64 -76 1 -0 58 65 -49 4 -0 43 61 -49 4 -0 45 43 -79 1 -0 42 60 -98 1 -0 50 55 -59 4 -0 53 53 -56 4 -0 45 44 -61 4 -0 43 65 -84 1 -0 35 52 -75 1 -0 56 56 -70 1 -1 -61 86 43 5 -1 -67 93 15 2 -1 -59 94 36 5 -1 -50 92 62 5 -1 -78 91 70 5 -1 -35 87 47 5 -1 -56 91 52 5 -1 -61 81 46 5 -1 -83 78 34 2 -1 -50 87 45 5 -1 -67 73 50 5 -1 -50 97 45 5 -1 -61 111 45 5 -2 -109 23 -92 7 -2 -94 20 -96 7 -2 -85 26 -88 7 -2 -90 33 -114 7 -2 -63 9 -106 3 -2 -79 9 -93 3 -2 -99 26 -108 7 -2 -81 19 -110 3 -2 -108 21 -108 7 -2 -92 27 -106 7 -2 -88 2 -106 3 -2 -88 15 -103 3 -3 54 -74 4 6 -3 42 -92 31 6 -3 39 -99 -7 0 -3 48 -115 -5 0 -3 39 -96 2 0 -3 31 -109 9 0 -3 33 -96 -8 0 -3 23 -102 4 0 -3 38 -90 21 6 -3 34 -107 1 0 -3 35 -78 18 6 +0 58 56 -67 3 +0 44 64 -76 3 +0 51 48 -73 6 +0 58 65 -49 5 +0 43 61 -49 5 +0 45 43 -79 6 +0 42 60 -98 3 +0 50 55 -59 5 +0 53 53 -56 5 +0 45 44 -61 6 +0 43 65 -84 3 +0 35 52 -75 6 +0 56 56 -70 6 +1 -61 86 43 0 +1 -67 93 15 0 +1 -59 94 36 0 +1 -50 92 62 7 +1 -78 91 70 7 +1 -35 87 47 0 +1 -56 91 52 0 +1 -61 81 46 0 +1 -83 78 34 0 +1 -50 87 45 0 +1 -67 73 50 0 +1 -50 97 45 0 +1 -61 111 45 0 +2 -109 23 -92 1 +2 -94 20 -96 1 +2 -85 26 -88 1 +2 -90 33 -114 1 +2 -63 9 -106 1 +2 -79 9 -93 1 +2 -99 26 -108 1 +2 -81 19 -110 1 +2 -108 21 -108 1 +2 -92 27 -106 1 +2 -88 2 -106 1 +2 -88 15 -103 1 +3 54 -74 4 4 +3 42 -92 31 4 +3 39 -99 -7 2 +3 48 -115 -5 2 +3 39 -96 2 2 +3 31 -109 9 2 +3 33 -96 -8 2 +3 23 -102 4 2 +3 38 -90 21 4 +3 34 -107 1 2 +3 35 -78 18 4 diff -r d645cdee08ed -r 1d465f2ebfad test-data/cluster_result15.txt --- a/test-data/cluster_result15.txt Fri Jan 01 10:42:52 2016 -0500 +++ b/test-data/cluster_result15.txt Fri Jan 01 12:58:17 2016 -0500 @@ -1,16 +1,16 @@ -0 51 48 -73 cluster_label -0 58 56 -67 0 -0 44 64 -76 0 -0 58 65 -49 0 -0 43 61 -49 0 -0 45 43 -79 0 -0 42 60 -98 0 -0 50 55 -59 0 -0 53 53 -56 0 -0 45 44 -61 0 -0 43 65 -84 0 -0 35 52 -75 0 -0 56 56 -70 0 +0 58 56 -67 3 +0 44 64 -76 1 +0 51 48 -73 1 +0 58 65 -49 1 +0 43 61 -49 1 +0 45 43 -79 1 +0 42 60 -98 1 +0 50 55 -59 1 +0 53 53 -56 1 +0 45 44 -61 1 +0 43 65 -84 1 +0 35 52 -75 1 +0 56 56 -70 1 1 -61 86 43 2 1 -67 93 15 2 1 -59 94 36 2 @@ -24,18 +24,18 @@ 1 -67 73 50 2 1 -50 97 45 2 1 -61 111 45 2 -2 -109 23 -92 1 -2 -94 20 -96 1 -2 -85 26 -88 1 -2 -90 33 -114 1 -2 -63 9 -106 1 -2 -79 9 -93 1 -2 -99 26 -108 1 -2 -81 19 -110 1 -2 -108 21 -108 1 -2 -92 27 -106 1 -2 -88 2 -106 1 -2 -88 15 -103 1 +2 -109 23 -92 3 +2 -94 20 -96 3 +2 -85 26 -88 3 +2 -90 33 -114 3 +2 -63 9 -106 3 +2 -79 9 -93 3 +2 -99 26 -108 3 +2 -81 19 -110 3 +2 -108 21 -108 3 +2 -92 27 -106 3 +2 -88 2 -106 3 +2 -88 15 -103 3 3 54 -74 4 0 3 42 -92 31 0 3 39 -99 -7 0 diff -r d645cdee08ed -r 1d465f2ebfad test-data/cluster_result16.txt --- a/test-data/cluster_result16.txt Fri Jan 01 10:42:52 2016 -0500 +++ b/test-data/cluster_result16.txt Fri Jan 01 12:58:17 2016 -0500 @@ -1,49 +1,49 @@ -0 51 48 -73 cluster_label 0 58 56 -67 3 -0 44 64 -76 3 -0 58 65 -49 4 -0 43 61 -49 4 -0 45 43 -79 3 -0 42 60 -98 0 -0 50 55 -59 4 -0 53 53 -56 4 -0 45 44 -61 4 -0 43 65 -84 3 +0 44 64 -76 1 +0 51 48 -73 1 +0 58 65 -49 1 +0 43 61 -49 1 +0 45 43 -79 1 +0 42 60 -98 1 +0 50 55 -59 1 +0 53 53 -56 1 +0 45 44 -61 1 +0 43 65 -84 1 0 35 52 -75 3 -0 56 56 -70 3 -1 -61 86 43 2 -1 -67 93 15 5 -1 -59 94 36 5 -1 -50 92 62 2 +0 56 56 -70 1 +1 -61 86 43 0 +1 -67 93 15 0 +1 -59 94 36 0 +1 -50 92 62 0 1 -78 91 70 2 -1 -35 87 47 2 -1 -56 91 52 2 -1 -61 81 46 2 -1 -83 78 34 5 -1 -50 87 45 2 -1 -67 73 50 2 -1 -50 97 45 2 -1 -61 111 45 2 -2 -109 23 -92 0 -2 -94 20 -96 0 -2 -85 26 -88 3 -2 -90 33 -114 0 +1 -35 87 47 0 +1 -56 91 52 0 +1 -61 81 46 0 +1 -83 78 34 2 +1 -50 87 45 0 +1 -67 73 50 0 +1 -50 97 45 0 +1 -61 111 45 0 +2 -109 23 -92 2 +2 -94 20 -96 2 +2 -85 26 -88 2 +2 -90 33 -114 2 2 -63 9 -106 0 -2 -79 9 -93 0 -2 -99 26 -108 0 -2 -81 19 -110 0 -2 -108 21 -108 0 -2 -92 27 -106 0 -2 -88 2 -106 0 -2 -88 15 -103 0 +2 -79 9 -93 2 +2 -99 26 -108 2 +2 -81 19 -110 2 +2 -108 21 -108 2 +2 -92 27 -106 2 +2 -88 2 -106 2 +2 -88 15 -103 2 3 54 -74 4 1 -3 42 -92 31 5 -3 39 -99 -7 1 +3 42 -92 31 1 +3 39 -99 -7 3 3 48 -115 -5 1 -3 39 -96 2 1 -3 31 -109 9 1 -3 33 -96 -8 1 -3 23 -102 4 1 -3 38 -90 21 5 -3 34 -107 1 1 -3 35 -78 18 5 +3 39 -96 2 3 +3 31 -109 9 3 +3 33 -96 -8 3 +3 23 -102 4 3 +3 38 -90 21 3 +3 34 -107 1 3 +3 35 -78 18 3 diff -r d645cdee08ed -r 1d465f2ebfad test-data/numeric_values.tabular --- a/test-data/numeric_values.tabular Fri Jan 01 10:42:52 2016 -0500 +++ b/test-data/numeric_values.tabular Fri Jan 01 12:58:17 2016 -0500 @@ -1,6 +1,6 @@ -0 51 48 -73 0 58 56 -67 0 44 64 -76 +0 51 48 -73 0 58 65 -49 0 43 61 -49 0 45 43 -79