X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=parsimonycommand.h;h=6fa1914f31e320517ff89389a34fc3e5a1cd6dc6;hb=7ae40733a270f73ec8a331540cc7f28fd60b24fc;hp=63980c254545ea07e7a4ffe71b1d9c496407ecf1;hpb=cd37904452dc95b183ff313ff05720c562902487;p=mothur.git

diff --git a/parsimonycommand.h b/parsimonycommand.h
index 63980c2..6fa1914 100644
--- a/parsimonycommand.h
+++ b/parsimonycommand.h
@@ -23,7 +23,7 @@ class ParsimonyCommand : public Command {
 
 public:
 	ParsimonyCommand(string);	
-	~ParsimonyCommand() { delete pars; delete util; delete output; }
+	~ParsimonyCommand() { if (abort == false) { delete pars; delete util; delete output; }  }
 	int execute();	
 	void help();
 
@@ -38,7 +38,7 @@ private:
 	TreeMap* savetmap;
 	Parsimony* pars;
 	vector<string> groupComb; // AB. AC, BC...
-	string sumFile, randomtree, allGroups;
+	string sumFile, randomtree, allGroups, outputDir;
 	int iters, numGroups, numComp, counter;
 	vector<int> numEachGroup; //vector containing the number of sequences in each group the users wants for random distrib.
 	vector< vector<float> > userTreeScores; //scores for users trees for each comb.
@@ -56,10 +56,10 @@ private:
 
 	bool abort;
 	string groups, itersString;
-	vector<string> Groups; //holds groups to be used
+	vector<string> Groups, outputNames; //holds groups to be used
 
 	void printParsimonyFile();  
-	void printUSummaryFile();
+	int printUSummaryFile();
 	void getUserInput();
 	
 };