cleaned up code

[mothur.git] / kruskalwalliscommand.h

diff --git a/kruskalwalliscommand.h b/kruskalwalliscommand.h
index 003ea91c37fa29eb5f46825f12f898a6b842ad55..e3bf100bd2c8b468701f4aaee17c3807758d3f56 100644 (file)
--- a/kruskalwalliscommand.h
+++ b/kruskalwalliscommand.h
@@ -10,11 +10,6 @@
 
 #include "command.hpp"
 
-    struct groupRank {
-        sstring group;
-        double value;
-        double rank;        
-    };
 
 class KruskalWallisCommand : public Command {
    
@@ -32,23 +27,31 @@ public:
        string getCitation() { return "http://www.mothur.org/wiki/kruskalwallis"; }
        string getDescription()         { return "Non-parametric method for testing whether samples originate from the same distribution."; }
     
+    struct groupRank {
+        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; }
     
 };