X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=unifracunweightedcommand.h;fp=unifracunweightedcommand.h;h=f462d51f9b5b7022d61b0a521f2526475350b034;hb=ca9ac1d80c62f57270b0dcd49410ebe08a8aecd6;hp=cd46b62b3462a4db2baa57865743d4bb37c198a7;hpb=36a867cbd85d9c276d3c8d13f25a150bbbe2466b;p=mothur.git

diff --git a/unifracunweightedcommand.h b/unifracunweightedcommand.h
index cd46b62..f462d51 100644
--- a/unifracunweightedcommand.h
+++ b/unifracunweightedcommand.h
@@ -15,25 +15,26 @@
 #include "treemap.h"
 #include "sharedutilities.h"
 #include "fileoutput.h"
-
-
-class GlobalData;
+#include "readtree.h"
 
 class UnifracUnweightedCommand : public Command {
 	
 	public:
 		UnifracUnweightedCommand(string);	
 		UnifracUnweightedCommand();
-		~UnifracUnweightedCommand() { globaldata->Groups.clear();  if (abort == false) { delete unweighted; delete util; } }
-		vector<string> getRequiredParameters();
-		vector<string> getValidParameters();
-		vector<string> getRequiredFiles();
-		map<string, vector<string> > getOutputFiles() { return outputTypes; }
+		~UnifracUnweightedCommand() {}
+	
+		vector<string> setParameters();
+		string getCommandName()			{ return "unifrac.unweighted";		}
+		string getCommandCategory()		{ return "Hypothesis Testing";		}
+		string getHelpString();	
+	
 		int execute();
-		void help();	
+		void help() { m->mothurOut(getHelpString()); }
+	
 	
 	private:
-		GlobalData* globaldata;
+		ReadTree* read;
 		SharedUtil* util;
 		FileOutput* output;
 		vector<Tree*> T;	   //user trees
@@ -41,7 +42,7 @@ class UnifracUnweightedCommand : public Command {
 		Unweighted* unweighted;
 		string sumFile, allGroups;
 		vector<string> groupComb; // AB. AC, BC...
-		int iters, numGroups, numComp, counter, processors;
+		int iters, numGroups, numComp, counter, processors, numUniquesInName;
 		EstOutput userData;			//unweighted score info for user tree
 		EstOutput randomData;		//unweighted score info for random trees
 		vector< vector<float> > utreeScores; //scores for users trees for each comb.
@@ -51,16 +52,17 @@ class UnifracUnweightedCommand : public Command {
 		vector< map<float, float> > rCumul;  //map <unweighted score, cumulative percentage of number of random trees with that score or higher.> -vector entry for each combination.
 		
 		bool abort, phylip, random, includeRoot;
-		string groups, itersString, outputDir, outputForm;
+		string groups, itersString, outputDir, outputForm, treefile, groupfile, namefile;
 		vector<string> Groups, outputNames; //holds groups to be used
-		map<string, vector<string> > outputTypes;
 
 		ofstream outSum, out;
 		ifstream inFile;
+		map<string, string> nameMap;
 		
 		void printUWSummaryFile(int);
 		void printUnweightedFile();
 		void createPhylipFile(int);
+		int readNamesFile();
 		 
 		
 };