cleaned up code2

[mothur.git] / kruskalwalliscommand.h

diff --git a/kruskalwalliscommand.h b/kruskalwalliscommand.h
index 3b5fdcea8975ecc774116fc4f8a824d0db8e64aa..e3bf100bd2c8b468701f4aaee17c3807758d3f56 100644 (file)
--- a/kruskalwalliscommand.h
+++ b/kruskalwalliscommand.h
@@ -11,7 +11,6 @@
 #include "command.hpp"
 
 
-
 class KruskalWallisCommand : public Command {
    
 public:
@@ -29,28 +28,30 @@ public:
        string getDescription()         { return "Non-parametric method for testing whether samples originate from the same distribution."; }
     
     struct groupRank {
-        sstring group;
+        string group;
         double value;
         double rank;        
     };
     
     int execute(); 
        void help() { m->mothurOut(getHelpString()); }
-    void assignRank(vector<groupRank>);
+    void assignRank(vector<groupRank>&);
+    
     
 private:
     string outputDir;
+    bool abort;
     vector<int> counts;
     vector<double> rankSums;
     vector<double> rankMeans;
     
   
         
-    bool comparevalue(const groupRank &a, const groupRank &b) { return a.value < b.value; }
-    bool equalvalue(const groupRank &a, const groupRank &b) { return a.value == b.value; }
-    bool comparerank(const groupRank &a, const groupRank &b) { return a.rank < b.rank; }
-    bool equalrank(const groupRank &a, const groupRank &b) { return a.rank == b.rank; }
-    bool equalgroup(const groupRank &a, const groupRank &b) { return a.group == b.group; }
+    static bool comparevalue(const groupRank &a, const groupRank &b) { return a.value < b.value; }
+    static bool equalvalue(const groupRank &a, const groupRank &b) { return a.value == b.value; }
+    static bool comparerank(const groupRank &a, const groupRank &b) { return a.rank < b.rank; }
+    static bool equalrank(const groupRank &a, const groupRank &b) { return a.rank == b.rank; }
+    static bool equalgroup(const groupRank &a, const groupRank &b) { return a.group == b.group; }
     
 };