X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=unifracunweightedcommand.h;h=91f005c2500b9011b9149f3b7a18996c00af5c6f;hb=8bc3e5b38c2317a1715f53be22fa96455868c281;hp=c98abc48d748be4dcbb8928283d808b118db29b8;hpb=315e38cf393c82be238da5b32574f225a020d25c;p=mothur.git

diff --git a/unifracunweightedcommand.h b/unifracunweightedcommand.h
index c98abc4..91f005c 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.
@@ -47,7 +52,8 @@ class UnifracUnweightedCommand : public Command {
 		
 		bool abort, phylip, random;
 		string groups, itersString, outputDir;
-		vector<string> Groups; //holds groups to be used
+		vector<string> Groups, outputNames; //holds groups to be used
+		map<string, vector<string> > outputTypes;
 
 		ofstream outSum, out;
 		ifstream inFile;