fixed phylo.diversity

[mothur.git] / unifracweightedcommand.h

diff --git a/unifracweightedcommand.h b/unifracweightedcommand.h
index 2d78d57fe827a0678421f39a44c0d2e6fe4cedf0..77dd10d3490999def3789b91d405ac76e470f360 100644 (file)
--- a/unifracweightedcommand.h
+++ b/unifracweightedcommand.h
@@ -23,8 +23,8 @@ class GlobalData;
 class UnifracWeightedCommand : public Command {
        
        public:
-               UnifracWeightedCommand(string); 
-               ~UnifracWeightedCommand() { delete weighted; delete util; }
+               UnifracWeightedCommand(string);
+               ~UnifracWeightedCommand() { if (abort == false) {  delete weighted; delete util; } }
                int execute();  
                void help();
        
@@ -39,7 +39,7 @@ class UnifracWeightedCommand : public Command {
                Tree* randT;  //random tree
                TreeMap* tmap;
                Weighted* weighted;
-               string sumFile;
+               string sumFile, outputDir;
                int iters, numGroups, numComp, counter;
                EstOutput userData;                     //weighted score info for user tree
                EstOutput randomData;           //weighted score info for random trees
@@ -48,22 +48,17 @@ class UnifracWeightedCommand : public Command {
                vector< map<float, float> > rScoreFreq;  //map <weighted score, number of random trees with that score.> -vector entry for each combination.
                vector< map<float, float> > rCumul;  //map <weighted score, cumulative percentage of number of random trees with that score or higher.> -vector entry for each c                                                                
                map<float, float>  validScores;  //map contains scores from random
-               map<float, float>::iterator it2;
-               map<float, float>::iterator it;
                
-               OptionParser* parser;
-               map<string, string> parameters;
-               map<string, string>::iterator it4;
-               bool abort;
+               bool abort, phylip, random;
                string groups, itersString;
-               vector<string> Groups; //holds groups to be used
+               vector<string> Groups, outputNames; //holds groups to be used
 
                
-               ofstream outSum, out;
-               ifstream inFile;
+               ofstream outSum;
                
                void printWSummaryFile();
                void printWeightedFile();  
+               void createPhylipFile();
                //void removeValidScoresDuplicates();
                int findIndex(float, int);
                void calculateFreqsCumuls();