bugs fixes while testing for 1.5 release

[mothur.git] / tree.h

diff --git a/tree.h b/tree.h
index 4f77e50578bad8c234ae4711adf69a612175b088..c90f51a451461ceca068f743ecefe8fd3e7cba5f 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -13,6 +13,7 @@
 #include "treenode.h"
 #include "globaldata.hpp"
 
+class GlobalData;
 /* This class represents the treefile. */
 
 class Tree {
@@ -20,7 +21,6 @@ public:
        Tree();         //to generate a tree from a file
        ~Tree();
        
-       
        void getCopy(Tree*);  //makes tree a copy of the one passed in.
        void assembleRandomTree();
        void assembleRandomUnifracTree(vector<string>);
@@ -55,6 +55,11 @@ private:
        void randomLabels(vector<string>);
        void randomLabels(string, string);
        void printBranch(int, ostream&, string);  //recursively print out tree
+       void parseTreeFile();   //parses through tree file to find names of nodes and number of them
+                                                       //this is required in case user has sequences in the names file that are
+                                                       //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&);
 };
 
 #endif