added root parameter to the unifrac commands so you can choose to include the entire...

[mothur.git] / unifracunweightedcommand.h

diff --git a/unifracunweightedcommand.h b/unifracunweightedcommand.h
index f6f867877620e7e6e69e4e446bdbe8da3815861a..cd46b62b3462a4db2baa57865743d4bb37c198a7 100644 (file)
--- a/unifracunweightedcommand.h
+++ b/unifracunweightedcommand.h
@@ -23,7 +23,12 @@ class UnifracUnweightedCommand : public Command {
        
        public:
                UnifracUnweightedCommand(string);       
+               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,9 +50,10 @@ 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, phylip, random;
-               string groups, itersString, outputDir;
+               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;