X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tree.h;h=55d3c92aabca1083fd300896a813f41374eca860;hb=010638fc7580c18a51f5ed650e9ee7589c8fb2d4;hp=d7dcc3ddd790e0894347aa1bcb37d2da9608a567;hpb=09a01fb51eea9e81409d367410c831394193fd86;p=mothur.git

diff --git a/tree.h b/tree.h
index d7dcc3d..55d3c92 100644
--- a/tree.h
+++ b/tree.h
@@ -31,6 +31,7 @@ class Tree {
 		void setIndex(string, int);
 		int getNumNodes() { return numNodes; }
 		int getNumLeaves(){	return numLeaves; }
+		map<string, int> mergeUserGroups(int);  //returns a map with a groupname and the number of times that group was seen in the children
 		
 		//this function takes the leaf info and populates the non leaf nodes
 		void assembleTree();		
@@ -43,14 +44,16 @@ class Tree {
 		ofstream out;
 		string filename;
 		
-		map<string, int>::iterator it;
+		map<string, int>::iterator it, it2;
 		map<string, int> mergeGroups(int);  //returns a map with a groupname and the number of times that group was seen in the children
+		
 		map<string,int> Tree::mergeGcounts(int);
 		void randomTopology();
 		void randomBlengths();
 		void randomLabels();
 		int findRoot();  //return index of root node
 		void printBranch(int);  //recursively print out tree
+		void setGroups();
 };
 
 #endif