changes while testing

[mothur.git] / treenode.h

diff --git a/treenode.h b/treenode.h
index 58d967d5cf297bbcd82e3839822e201a0aed121f..029cee9419cf7adf88344d1635e5709196bd5c73 100644 (file)
--- a/treenode.h
+++ b/treenode.h
@@ -10,9 +10,8 @@
  *
  */
 
-using namespace std;
-
 #include "mothur.h"
+#include "mothurout.h"
 
 /* This class represents a node on a tree. */
 
@@ -23,17 +22,19 @@ class Node  {
                ~Node() { pGroups.clear(); pcount.clear(); };
                
                void setName(string);
-               void setGroup(string);  
+               void setGroup(vector<string>);  
                void setBranchLength(float);
+               void setLabel(float);
                void setParent(int);
                void setChildren(int, int);             //leftchild, rightchild
                void setIndex(int);
                void setLengthToLeaves(float);
                
                string getName();
-               string getGroup();  
+               vector<string> getGroup();  
                float getBranchLength();
                float getLengthToLeaves();
+               float getLabel();
                int getParent();
                int getLChild();
                int getRChild();
@@ -52,12 +53,13 @@ class Node  {
                        
        private:
                string                  name;
-               string                  group;
-               float                   branchLength, length2leaf;
+               vector<string>  group; 
+               float                   branchLength, length2leaf, label;
                int                             parent;
                int                             lchild;
                int                             rchild;
                int                             vectorIndex;
+               MothurOut* m;
 };             
 
 #endif