made read.tree not require a groupfile, if one is not given all seqs are assumed...

[mothur.git] / tree.h

diff --git a/tree.h b/tree.h
index 04d9fb1fd3499cd87b5a8563b6e082fddb3d32dd..59343d5fa828a2bcd15d4402764c070c51111e01 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -18,6 +18,7 @@ class GlobalData;
 
 class Tree {
 public: 
+       Tree(string); 
        Tree();         //to generate a tree from a file
        ~Tree();
        
@@ -37,10 +38,11 @@ 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.
-               
+       
+                       
 private:
        GlobalData* globaldata;
        int numNodes, numLeaves;
@@ -62,8 +64,9 @@ 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;
-       
+               
 };
 
 #endif