fixed concensus command and modified tree class so you can print labels on trees

[mothur.git] / tree.h

diff --git a/tree.h b/tree.h
index d6a3b556f09ca251a2cbad64e07c0187dd50e6b4..8b77d3ddbed48dddb5de57dfa44394118c7a1920 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -20,7 +20,7 @@ using namespace std;
 class Tree {
 public: 
        Tree();         //to generate a tree from a file
-       ~Tree() {};
+       ~Tree();
        
        
        void getCopy(Tree*);  //makes tree a copy of the one passed in.
@@ -34,6 +34,8 @@ public:
        int getNumLeaves(){     return numLeaves; }
        map<string, int> mergeUserGroups(int, vector<string>);  //returns a map with a groupname and the number of times that group was seen in the children
        void printTree();
+       void print(ostream&);
+       void printForBoot(ostream&);
        
        //this function takes the leaf info and populates the non leaf nodes
        void assembleTree();            
@@ -48,13 +50,13 @@ private:
        map<string, int>::iterator it, it2;
        map<string, int> mergeGroups(int);  //returns a map with a groupname and the number of times that group was seen in the children
        
-       map<string,int> Tree::mergeGcounts(int);
+       map<string,int> mergeGcounts(int);
        void randomTopology();
        void randomBlengths();
        void randomLabels(vector<string>);
        void randomLabels(string, string);
        int findRoot();  //return index of root node
-       void printBranch(int);  //recursively print out tree
+       void printBranch(int, ostream&, string);  //recursively print out tree
 };
 
 #endif