fixed bug in phylo.diversity rooting. added filename patterns and create filename...

[mothur.git] / kruskalwalliscommand.h

diff --git a/kruskalwalliscommand.h b/kruskalwalliscommand.h
index 3b5fdcea8975ecc774116fc4f8a824d0db8e64aa..da1166ed16a787adfaaf8a2e183afc8724f6f0a0 100644 (file)
--- a/kruskalwalliscommand.h
+++ b/kruskalwalliscommand.h
@@ -9,7 +9,8 @@
 #define        KRUSKALWALLISCOMMAND_H
 
 #include "command.hpp"
-
+#include "inputdata.h"
+#include "sharedrabundvector.h"
 
 
 class KruskalWallisCommand : public Command {
@@ -29,28 +30,33 @@ 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>&);
+    void assignValue(vector<groupRank>&);
+    
     
 private:
-    string outputDir;
+    string outputDir, sharedfile, groups;
+    bool abort;
+    set<string> labels;
+    vector<string> outputNames, Groups;
     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; }
     
 };