working on parallelizing unifrac.unweighted.

[mothur.git] / unifracunweightedcommand.h

diff --git a/unifracunweightedcommand.h b/unifracunweightedcommand.h
index c98abc48d748be4dcbb8928283d808b118db29b8..3e6d8354af5eda2c21f85c632a09b886962afb37 100644 (file)
--- a/unifracunweightedcommand.h
+++ b/unifracunweightedcommand.h
@@ -23,7 +23,7 @@ class UnifracUnweightedCommand : public Command {
        
        public:
                UnifracUnweightedCommand(string);       
-               ~UnifracUnweightedCommand() { delete unweighted; delete util; }
+               ~UnifracUnweightedCommand() { globaldata->Groups.clear();  if (abort == false) { delete unweighted; delete util; } }
                int execute();
                void help();    
        
@@ -36,7 +36,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 +47,7 @@ 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
 
                ofstream outSum, out;
                ifstream inFile;