X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=unweighted.cpp;h=16a2203274f325ffc8d8b5febfea903597340093;hb=38922fcff5a03abfedffda3e06a45fad2270a044;hp=b038f388af1c3ef027c66339523ce8bc87b55661;hpb=d9ec50b60719a907681a22acbe2469f1ea93facb;p=mothur.git

diff --git a/unweighted.cpp b/unweighted.cpp
index b038f38..16a2203 100644
--- a/unweighted.cpp
+++ b/unweighted.cpp
@@ -205,7 +205,7 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
 
 		//if the users enters no groups then give them the score of all groups
 		int numGroups = globaldata->Groups.size();
-		
+cout << "NumGroups = " << numGroups << endl;
 		//calculate number of comparsions
 		int numComp = 0;
 		for (int r=0; r<numGroups; r++) { 
@@ -227,12 +227,13 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
 				
 				//copy random tree passed in
 				copyTree->getCopy(t);
-				
-				//swap labels in the groups you want to compare
-				copyTree->assembleRandomUnifracTree(globaldata->Groups[a], globaldata->Groups[l]);
-				
+								
 				//groups in this combo
 				groups.push_back(globaldata->Groups[a]); groups.push_back(globaldata->Groups[l]);
+				
+				//swap labels in the groups you want to compare
+				copyTree->assembleRandomUnifracTree(groups[0], groups[1]);
+
 		
 				for(int i=t->getNumLeaves();i<t->getNumNodes();i++){
 		
@@ -312,7 +313,7 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
 			copyTree->getCopy(t);
 				
 			//swap labels in all the groups you want to compare
-			copyTree->assembleRandomUnifracTree();
+			copyTree->assembleRandomUnifracTree(groups);
 
 			for(int i=t->getNumLeaves();i<t->getNumNodes();i++){