changes to blastdb to make filenames given to blast unique, changes to split.abund...

[mothur.git] / tree.h

diff --git a/tree.h b/tree.h
index 37028be57e90f3d5d38eeb3080b36a8538e8bf8e..99cd68fa7f4b71dfeebffc90ad649a1f01c6564e 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -37,7 +37,7 @@ public:
        int findRoot();  //return index of root node
        
        //this function takes the leaf info and populates the non leaf nodes
-       void assembleTree();    
+       int assembleTree();     
        
        vector<Node> tree;              //the first n nodes are the leaves, where n is the number of sequences.
                
@@ -62,6 +62,11 @@ private:
                                                        //not included in the tree. 
                                                        //only takes names from the first tree in the tree file and assumes that all trees use the same names.
        int readTreeString(ifstream&);
+       string readLabel(ifstream&);
+       string readName(ifstream&);
+       string readBranchLength(ifstream&);
+       
+       MothurOut* m;
        
 };