X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=phylodiversitycommand.h;h=52cd3e27953ebac12619df1148e0e9bf932c8261;hb=a5d3e10e24e503483d8e85b54f0fd34b9308d31b;hp=76c996c405a92fdb7f5c51d67728c46cf9c902b0;hpb=1d18c13c5d71e92ee850a0d8d7cda4f0ef530bf7;p=mothur.git

diff --git a/phylodiversitycommand.h b/phylodiversitycommand.h
index 76c996c..52cd3e2 100644
--- a/phylodiversitycommand.h
+++ b/phylodiversitycommand.h
@@ -12,28 +12,41 @@
 
 #include "command.hpp"
 #include "treemap.h"
-#include "globaldata.hpp"
+#include "sharedutilities.h"
+#include "tree.h"
 
 class PhyloDiversityCommand : public Command {
 	
 	public:
 		PhyloDiversityCommand(string);
-		~PhyloDiversityCommand();
-		int execute();	
-		void help();
+		PhyloDiversityCommand();
+		~PhyloDiversityCommand(){}
 	
-	private:
-		GlobalData* globaldata;
-		
+		vector<string> setParameters();
+		string getCommandName()			{ return "phylo.diversity";			}
+		string getCommandCategory()		{ return "Hypothesis Testing";		}
+		string getHelpString();	
+		string getCitation() { return "Faith DP (1994). Phylogenetic pattern and the quantification of organismal biodiversity. Philos Trans R Soc Lond B Biol Sci 345: 45-58. \nhttp://www.mothur.org/wiki/Phylo.diversity"; }
+		string getDescription()		{ return "phylo.diversity"; }
+
+		int execute();
+		void help() { m->mothurOut(getHelpString()); }
+private:
+		TreeMap* tmap;
 		float freq;
-		int iters;  
+		int iters, processors, numUniquesInName;  
 		bool abort, rarefy, summary, collect, scale;
-		string groups, outputDir;
+		string groups, outputDir, treefile, groupfile, namefile;
 		vector<string> Groups, outputNames; //holds groups to be used, and outputFile names
 		
+        map<string, int> getRootForGroups(Tree* t);
+		int readNamesFile();
 		void printData(set<int>&, map< string, vector<float> >&, ofstream&, int);
 		void printSumData(map< string, vector<float> >&, ofstream&, int);
-		float calcBranchLength(Tree*, int);
+        vector<float> calcBranchLength(Tree*, int, vector< map<string, bool> >&, map<string, int>);
+		int driver(Tree*, map< string, vector<float> >&, map<string, vector<float> >&, int, int, vector<int>&, set<int>&, ofstream&, ofstream&, bool);
+		int createProcesses(vector<int>&, Tree*, map< string, vector<float> >&, map<string, vector<float> >&, int, int, vector<int>&, set<int>&, ofstream&, ofstream&);
+
 };
 
 #endif