X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=phylodiversitycommand.h;h=95276921149b5237a923928bc9f23a5e8e7aed1b;hb=6ede3bf5c0a9eedb23f24577a97da81ab3e1f7df;hp=b44e6caed27037ddb177acdd1416df40550dee5c;hpb=a44542a3c740cf957cff72ac71742f2fe48b0eaf;p=mothur.git

diff --git a/phylodiversitycommand.h b/phylodiversitycommand.h
index b44e6ca..9527692 100644
--- a/phylodiversitycommand.h
+++ b/phylodiversitycommand.h
@@ -12,9 +12,8 @@
 
 #include "command.hpp"
 #include "treemap.h"
-#include "readtree.h"
 #include "sharedutilities.h"
-
+#include "tree.h"
 
 class PhyloDiversityCommand : public Command {
 	
@@ -26,26 +25,26 @@ class PhyloDiversityCommand : public Command {
 		vector<string> setParameters();
 		string getCommandName()			{ return "phylo.diversity";			}
 		string getCommandCategory()		{ return "Hypothesis Testing";		}
-		string getHelpString();	
+		string getOutputFileNameTag(string, string);
+	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:
-		ReadTree* read;
 		TreeMap* tmap;
 		float freq;
 		int iters, processors, numUniquesInName;  
 		bool abort, rarefy, summary, collect, scale;
 		string groups, outputDir, treefile, groupfile, namefile;
 		vector<string> Groups, outputNames; //holds groups to be used, and outputFile names
-		map<string, string> nameMap;
 		
+        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);
-		vector<float> calcBranchLength(Tree*, int, map< string, set<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&);