X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tree.cpp;h=1e115bddad1a451c181c4c26b90b758788df1155;hb=dbc9352256135d7b3e2b17dddc5c506770e2df92;hp=2cd9cbabc691d692fcb30a7fb9408da8ad22c383;hpb=9daea1c357d32c6a7b34c5cbec122b7cfc5c92e3;p=mothur.git

diff --git a/tree.cpp b/tree.cpp
index 2cd9cba..1e115bd 100644
--- a/tree.cpp
+++ b/tree.cpp
@@ -178,7 +178,7 @@ map<string, int> Tree::mergeGroups(int i) {
 			for(it=parsimony.begin();it!=parsimony.end();it++){
 				if(it->second == 1){
 					parsimony.erase(it->first);
-					it--;
+//					it--;
 				}
 			}
 			//set one remaining groups to 1
@@ -240,24 +240,20 @@ map<string, int> Tree::mergeUserGroups(int i, vector<string> g) {
 				maxPars = parsimony[it->first];
 			}
 		}
-	
+			
 		// this is true if right child had a greater parsimony for a certain group
 		if(maxPars > 1){
 			//erase all the groups that are only 1 because you found something with 2.
 			for(it=parsimony.begin();it!=parsimony.end();it++){
 				if(it->second == 1){
 					parsimony.erase(it->first);
-					it--;
 				}
 			}
-			//set one remaining groups to 1
-			//so with our above example p[white] = 2 would be left and it would become p[white] = 1
 			for(it=parsimony.begin();it!=parsimony.end();it++){
 				parsimony[it->first] = 1;
 			}
+		}		
 		
-		}
-	
 		return parsimony;
 	}
 	catch(exception& e) {