]> git.donarmstrong.com Git - mothur.git/blobdiff - tree.h
fixed read.tree so that it can read trees generated by fasttree
[mothur.git] / tree.h
diff --git a/tree.h b/tree.h
index 04d9fb1fd3499cd87b5a8563b6e082fddb3d32dd..603f1c3160f984248e427353e3bc745bd4f5c4b0 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,7 @@ 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&);
+               
        MothurOut* m;
        
 };