X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=unifracunweightedcommand.h;h=cd46b62b3462a4db2baa57865743d4bb37c198a7;hb=fca3f55d5ded10c3dc77856f3cc4a1c53b02bb6f;hp=7707df4126172061cef898db12a2a10352dee7a8;hpb=cd37904452dc95b183ff313ff05720c562902487;p=mothur.git

diff --git a/unifracunweightedcommand.h b/unifracunweightedcommand.h
index 7707df4..cd46b62 100644
--- a/unifracunweightedcommand.h
+++ b/unifracunweightedcommand.h
@@ -23,7 +23,12 @@ class UnifracUnweightedCommand : public Command {
 	
 	public:
 		UnifracUnweightedCommand(string);	
-		~UnifracUnweightedCommand() { delete unweighted; delete util; }
+		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; }
 		int execute();
 		void help();	
 	
@@ -36,7 +41,7 @@ class UnifracUnweightedCommand : public Command {
 		Unweighted* unweighted;
 		string sumFile, allGroups;
 		vector<string> groupComb; // AB. AC, BC...
-		int iters, numGroups, numComp, counter;
+		int iters, numGroups, numComp, counter, processors;
 		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.
@@ -45,19 +50,19 @@ class UnifracUnweightedCommand : public Command {
 		vector< map<float, float> > rscoreFreq;  //map <unweighted score, number of random trees with that score.> -vector entry for each combination.
 		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;
-		string groups, itersString;
-		vector<string> Groups; //holds groups to be used
+		bool abort, phylip, random, includeRoot;
+		string groups, itersString, outputDir, outputForm;
+		vector<string> Groups, outputNames; //holds groups to be used
+		map<string, vector<string> > outputTypes;
 
 		ofstream outSum, out;
 		ifstream inFile;
 		
 		void printUWSummaryFile(int);
 		void printUnweightedFile();
+		void createPhylipFile(int);
 		 
 		
 };
 
-
-
-#endif
\ No newline at end of file
+#endif