X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tree.cpp;h=6aa1b829c91d59bcee681b906c6c31ab07f1c168;hb=2e5ec5cbbd23637ed20da9bdd544d178a3b5d949;hp=22892e2cbd7c9738261d5632492eafe674e7471b;hpb=d0939d3ab83988cc068f9ebe60596cf5decb65e5;p=mothur.git

diff --git a/tree.cpp b/tree.cpp
index 22892e2..6aa1b82 100644
--- a/tree.cpp
+++ b/tree.cpp
@@ -13,9 +13,9 @@
 /*****************************************************************/
 Tree::Tree() {
 	try {
-	
 		globaldata = GlobalData::getInstance();
-		numLeaves = globaldata->gTreemap->getNumSeqs();
+		
+		numLeaves = globaldata->Treenames.size();
 		numNodes = 2*numLeaves - 1;
 		
 		tree.resize(numNodes);
@@ -24,13 +24,13 @@ Tree::Tree() {
 		for (int i = 0; i < numNodes; i++) {
 			//initialize leaf nodes
 			if (i <= (numLeaves-1)) {
-				tree[i].setName(globaldata->gTreemap->namesOfSeqs[i]);
-				tree[i].setGroup(globaldata->gTreemap->getGroup(globaldata->gTreemap->namesOfSeqs[i]));
+				tree[i].setName(globaldata->Treenames[i]);
+				tree[i].setGroup(globaldata->gTreemap->getGroup(globaldata->Treenames[i]));
 				//set pcount and pGroup for groupname to 1.
-				tree[i].pcount[globaldata->gTreemap->getGroup(globaldata->gTreemap->namesOfSeqs[i])] = 1;
-				tree[i].pGroups[globaldata->gTreemap->getGroup(globaldata->gTreemap->namesOfSeqs[i])] = 1;
+				tree[i].pcount[globaldata->gTreemap->getGroup(globaldata->Treenames[i])] = 1;
+				tree[i].pGroups[globaldata->gTreemap->getGroup(globaldata->Treenames[i])] = 1;
 				//Treemap knows name, group and index to speed up search
-				globaldata->gTreemap->setIndex(globaldata->gTreemap->namesOfSeqs[i], i);
+				globaldata->gTreemap->setIndex(globaldata->Treenames[i], i);
 	
 			//intialize non leaf nodes
 			}else if (i > (numLeaves-1)) {
@@ -486,7 +486,7 @@ int Tree::findRoot() {
 	try {
 		for (int i = 0; i < numNodes; i++) {
 			//you found the root
-			if (tree[i].getParent() == -1) { return i; }
+			if (tree[i].getParent() == -1) { return i; }  
 		}
 		return -1;
 	}