X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=kruskalwalliscommand.h;h=73ef6434de6d6edcd6449e8824aae2d7f099b289;hp=003ea91c37fa29eb5f46825f12f898a6b842ad55;hb=d1c97b8c04bb75faca1e76ffad60b37a4d789d3d;hpb=f954b4d65ce86218f9f7262737f36d1e7faf58d6

diff --git a/kruskalwalliscommand.h b/kruskalwalliscommand.h
index 003ea91..73ef643 100644
--- a/kruskalwalliscommand.h
+++ b/kruskalwalliscommand.h
@@ -9,12 +9,8 @@
 #define	KRUSKALWALLISCOMMAND_H
 
 #include "command.hpp"
-
-    struct groupRank {
-        sstring group;
-        double value;
-        double rank;        
-    };
+#include "inputdata.h"
+#include "designmap.h"
 
 class KruskalWallisCommand : public Command {
    
@@ -25,31 +21,32 @@ public:
 	~KruskalWallisCommand(){}
 	
 	vector<string> setParameters();
-	string getCommandName()			{ return "kruskalwallis";			}
+	string getCommandName()			{ return "kruskal.wallis";			}
 	string getCommandCategory()		{ return "Hypothesis Testing";	}
-	string getOutputFileNameTag(string, string);
+    string getOutputPattern(string);	
 	string getHelpString();	
-	string getCitation() { return "http://www.mothur.org/wiki/kruskalwallis"; }
+	string getCitation() { return "http://www.mothur.org/wiki/Kruskal.wallis"; }
 	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>&);
+    void assignValue(vector<groupRank>&);
     
-private:
-    string outputDir;
-    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; }
+private:
+    bool abort, allLines;
+    string outputDir, sharedfile, designfile, mclass;
+    vector<string> outputNames;
+    set<string> labels;
     
+    int process(vector<SharedRAbundVector*>&, DesignMap&);    
 };
 
 #endif	/* KRUSKALWALLISCOMMAND_H */