added tree reader class to handle reading trees. Reworked the tree map to tree class...

[mothur.git] / unifracunweightedcommand.h

diff --git a/unifracunweightedcommand.h b/unifracunweightedcommand.h
index 7707df4126172061cef898db12a2a10352dee7a8..8b243964fe4c427768a7c8076f58daf975caa99f 100644 (file)
--- a/unifracunweightedcommand.h
+++ b/unifracunweightedcommand.h
@@ -15,28 +15,33 @@
 #include "treemap.h"
 #include "sharedutilities.h"
 #include "fileoutput.h"
-
-
-class GlobalData;
+#include "readtree.h"
 
 class UnifracUnweightedCommand : public Command {
        
        public:
                UnifracUnweightedCommand(string);       
-               ~UnifracUnweightedCommand() { delete unweighted; delete util; }
+               UnifracUnweightedCommand();
+               ~UnifracUnweightedCommand() {}
+       
+               vector<string> setParameters();
+               string getCommandName()                 { return "unifrac.unweighted";          }
+               string getCommandCategory()             { return "Hypothesis Testing";          }
+               string getHelpString(); 
+               string getCitation() { return "Lozupone C, Knight R (2005). UniFrac: a new phylogenetic method for comparing microbial communities. Appl Environ Microbiol 71: 8228-35. \nhttp://www.mothur.org/wiki/Unifrac.unweighted"; }
+               string getDescription()         { return "generic tests that describes whether two or more communities have the same structure"; }
+
                int execute();
-               void help();    
+               void help() { m->mothurOut(getHelpString()); }
+       
        
        private:
-               GlobalData* globaldata;
-               SharedUtil* util;
                FileOutput* output;
                vector<Tree*> T;           //user trees
                TreeMap* tmap;
-               Unweighted* unweighted;
                string sumFile, allGroups;
                vector<string> groupComb; // AB. AC, BC...
-               int iters, numGroups, numComp, counter;
+               int iters, numGroups, numComp, counter, processors, numUniquesInName;
                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,19 +50,17 @@ 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;
-               string groups, itersString;
-               vector<string> Groups; //holds groups to be used
+               bool abort, phylip, random, includeRoot;
+               string groups, itersString, outputDir, outputForm, treefile, groupfile, namefile;
+               vector<string> Groups, outputNames; //holds groups to be used
 
                ofstream outSum, out;
                ifstream inFile;
                
                void printUWSummaryFile(int);
                void printUnweightedFile();
-                
+               void createPhylipFile(int);
                
 };
 
-
-
-#endif
\ No newline at end of file
+#endif