From 7347d75a4a36d42f8060e11d708291d796b266a5 Mon Sep 17 00:00:00 2001
From: Clayton Turner <clayclay911@gmail.com>
Date: Mon, 10 Feb 2014 16:00:30 -0500
Subject: [PATCH 1/2] Added ignore lines starting with specific characters to
 group tool

---
 tools/stats/grouping.py  | 17 ++++++++++++++++-
 tools/stats/grouping.xml | 19 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/tools/stats/grouping.py b/tools/stats/grouping.py
index 084d5e253b3..0b2487fd0f9 100644
--- a/tools/stats/grouping.py
+++ b/tools/stats/grouping.py
@@ -37,7 +37,22 @@ def main():
     round_val = []
     data_ary = []
     
-    for var in sys.argv[5:]:
+    if sys.argv[5] != "None":
+        oldfile = open(inputfile,'r')
+        oldfilelines = oldfile.readlines()
+        newinputfile = inputfile+'2'
+        newfile = open(newinputfile,'w')
+        asciitodelete = sys.argv[5].split(',')
+        for i in range(len(asciitodelete)):
+            asciitodelete[i] = chr(int(asciitodelete[i]))
+        for line in oldfilelines:
+            if line[0] not in asciitodelete:
+                newfile.write(line)
+        oldfile.close()
+        newfile.close()
+        inputfile = newinputfile
+
+    for var in sys.argv[6:]:
         op, col, do_round = var.split()
         ops.append(op)
         cols.append(col)
diff --git a/tools/stats/grouping.xml b/tools/stats/grouping.xml
index 9d7815ac7a2..252cdc3ece0 100644
--- a/tools/stats/grouping.xml
+++ b/tools/stats/grouping.xml
@@ -6,6 +6,7 @@
       $input1
       $groupcol
       $ignorecase
+      $ignorelines
       #for $op in $operations
        '${op.optype}
         ${op.opcol}
@@ -18,6 +19,24 @@
     <param name="ignorecase" type="boolean" truevalue="1" falsevalue="0">
       <label>Ignore case while grouping?</label>
     </param>
+    <param name="ignorelines" type="select" display="checkboxes" multiple="True" label="Ignore lines beginning with these characters" help="lines beginning with these are not grouped">
+            <option value="62">&gt;</option>
+            <option value="64">@</option>
+            <option value="43">+</option>
+            <option value="60">&lt;</option>
+            <option value="42">*</option>
+            <option value="45">-</option>
+            <option value="61">=</option>
+            <option value="124">|</option>
+            <option value="63">?</option>
+            <option value="36">$</option>
+            <option value="46">.</option>
+            <option value="58">:</option>
+            <option value="38">&amp;</option>
+            <option value="37">%</option>
+            <option value="94">^</option>
+            <option value="35">&#35;</option>
+    </param>
     <repeat name="operations" title="Operation">
       <param name="optype" type="select" label="Type">
         <option value="mean">Mean</option>

From fd85979a8651e0907bebce05cdfb59d77f0d0f64 Mon Sep 17 00:00:00 2001
From: Clayton Turner <clayclay911@gmail.com>
Date: Fri, 14 Feb 2014 12:25:20 -0500
Subject: [PATCH 2/2] Fixed XML versioning and inputfile name

---
 tools/stats/grouping.py  | 2 +-
 tools/stats/grouping.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/stats/grouping.py b/tools/stats/grouping.py
index 0b2487fd0f9..5920e19c0b3 100644
--- a/tools/stats/grouping.py
+++ b/tools/stats/grouping.py
@@ -40,7 +40,7 @@ def main():
     if sys.argv[5] != "None":
         oldfile = open(inputfile,'r')
         oldfilelines = oldfile.readlines()
-        newinputfile = inputfile+'2'
+        newinputfile = "input_cleaned.tsv"
         newfile = open(newinputfile,'w')
         asciitodelete = sys.argv[5].split(',')
         for i in range(len(asciitodelete)):
diff --git a/tools/stats/grouping.xml b/tools/stats/grouping.xml
index 252cdc3ece0..58a9c7524ae 100644
--- a/tools/stats/grouping.xml
+++ b/tools/stats/grouping.xml
@@ -1,4 +1,4 @@
-<tool id="Grouping1" name="Group" version="2.0.0">
+<tool id="Grouping1" name="Group" version="2.1.0">
   <description>data by a column and perform aggregate operation on other columns.</description>
   <command interpreter="python">
     grouping.py