X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=phylodiversitycommand.h;h=df04b35d66f1c0dc36893074f6c840711395c49b;hb=0571957d68cbbc0e425af1db8e808f826010b9e2;hp=7d4b2d89484a88e4bc5016f19e2e24c89ab07a4e;hpb=f663afa231c9bc1b5e18e0ea3bdd2b2ee784f5b2;p=mothur.git

diff --git a/phylodiversitycommand.h b/phylodiversitycommand.h
index 7d4b2d8..df04b35 100644
--- a/phylodiversitycommand.h
+++ b/phylodiversitycommand.h
@@ -12,28 +12,38 @@
 
 #include "command.hpp"
 #include "treemap.h"
-#include "globaldata.hpp"
+#include "readtree.h"
+#include "sharedutilities.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();	
+	
+		int execute();
+		void help() { m->mothurOut(getHelpString()); }
+private:
+		ReadTree* read;
+		TreeMap* tmap;
 		float freq;
-		int iters, processors;  
+		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, string> nameMap;
 		
+		int readNamesFile();
 		void printData(set<int>&, map< string, vector<float> >&, ofstream&, int);
 		void printSumData(map< string, vector<float> >&, ofstream&, int);
-		float calcBranchLength(Tree*, int, map< string, set<int> >&);
+		vector<float> calcBranchLength(Tree*, int, map< string, set<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&);