fixed phylo.diversity

[mothur.git] / phylodiversitycommand.h

diff --git a/phylodiversitycommand.h b/phylodiversitycommand.h
index bd26173bfd5a2780ca745173dab40b53167b508c..a7e0d2e5d090f3e567446fe4e76d9ee3dd7d776b 100644 (file)
--- a/phylodiversitycommand.h
+++ b/phylodiversitycommand.h
@@ -24,13 +24,16 @@ class PhyloDiversityCommand : public Command {
        
        private:
                GlobalData* globaldata;
-       
-               int iters, freq;  
-               bool abort, rarefy;
+               
+               float freq;
+               int iters;  
+               bool abort, rarefy, summary, collect, scale;
                string groups, outputDir;
                vector<string> Groups, outputNames; //holds groups to be used, and outputFile names
                
-               void printData(vector<int>&, vector< vector<float> >&, string);
+               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> >&);
 };
 
 #endif