adding treeclimber and unifrac pieces

[mothur.git] / readtree.h

diff --git a/readtree.h b/readtree.h
index 1abef8a179478b9db980ee6c21e6e6b9855a024b..02b6129b21b0bc960e1d16f9d028baab374bb465 100644 (file)
--- a/readtree.h
+++ b/readtree.h
@@ -32,15 +32,11 @@ class ReadTree {
                int readSpecialChar(istream&, char, string);
                int readNodeChar(istream& f);
                float readBranchLength(istream& f);
-
-                               
-               Tree* getTree()  { return T; }
                
-               int numNodes, numLeaves;
+       protected:
                GlobalData* globaldata;
+               int numNodes, numLeaves;
                
-       protected:
-               Tree* T;
 };
 
 /****************************************************************************/
@@ -48,14 +44,18 @@ class ReadTree {
 class ReadNewickTree : public ReadTree {
        
 public:
-       ReadNewickTree(string file) : treeFile(file) { openInputFile(file, filehandle); }
+       ReadNewickTree(string file) : treeFile(file) { openInputFile(file, filehandle);  } 
        ~ReadNewickTree() {};
        void read();
        
 private:
+       Tree* T;
        int readNewickInt(istream&, int&, Tree*);
+       void readTreeString();
+       void nexusTranslation();
        ifstream filehandle;
        string treeFile;
+       string holder;
 };
 
 /****************************************************************************/