X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=treenode.h;h=029cee9419cf7adf88344d1635e5709196bd5c73;hp=a5c39167ca6bda64c8058e99b16a02ca4e07c748;hb=d1c97b8c04bb75faca1e76ffad60b37a4d789d3d;hpb=9099173ea17b13be96563c7579ecc8dc2ef65d20

diff --git a/treenode.h b/treenode.h
index a5c3916..029cee9 100644
--- 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. */
 
@@ -20,18 +19,22 @@ using namespace std;
 class Node  {
 	public:
 		Node();  //pass it the sequence name
-		~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();
@@ -50,12 +53,13 @@ class Node  {
 			
 	private:
 		string			name;
-		string			group;
-		float			branchLength;
+		vector<string>	group; 
+		float			branchLength, length2leaf, label;
 		int				parent;
 		int				lchild;
 		int				rchild;
 		int				vectorIndex;
+		MothurOut* m;
 };		
 
 #endif