X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=weighted.cpp;h=a0d593c803f691821afdb680e79be80f179b0afa;hb=5334a314651228c55fd0f206dec0209bc3148b24;hp=30e4a7682dc4ae4ad840fcdf2f7a31921fc8c351;hpb=7b287636ea67fb2254b119c21b4057a177d3ce19;p=mothur.git

diff --git a/weighted.cpp b/weighted.cpp
index 30e4a76..a0d593c 100644
--- a/weighted.cpp
+++ b/weighted.cpp
@@ -231,10 +231,13 @@ EstOutput Weighted::driver(Tree* t, vector< vector<string> > namesOfGroupCombos,
 				
 				//if this is not the root then add it
 				if (rootForGrouping[namesOfGroupCombos[h]].count(i) == 0) {
-					u = abs(u * t->tree[i].getBranchLength());
-					WScore[(groupA+groupB)] += u; 
+					if (t->tree[i].getBranchLength() != -1) {
+						u = abs(u * t->tree[i].getBranchLength());
+						WScore[(groupA+groupB)] += u; 
+					}
 				}
 				
+				
 			}
 		}
 		
@@ -244,7 +247,6 @@ EstOutput Weighted::driver(Tree* t, vector< vector<string> > namesOfGroupCombos,
 		count = 0;
 		for (int h = start; h < (start+num); h++) {
 			UN = (WScore[namesOfGroupCombos[h][0]+namesOfGroupCombos[h][1]] / D[count]);
-		
 			if (isnan(UN) || isinf(UN)) { UN = 0; } 
 			results.push_back(UN);
 			count++;
@@ -319,12 +321,14 @@ EstOutput Weighted::getValues(Tree* t, string groupA, string groupB) {
 			
 			//if this is not the root then add it
 			if (rootForGrouping[groups].count(i) == 0) {
-				u = abs(u * t->tree[i].getBranchLength());
-				WScore[(groupA+groupB)] += u; 
+				if (t->tree[i].getBranchLength() != -1) {
+					u = abs(u * t->tree[i].getBranchLength());
+					WScore[(groupA+groupB)] += u;
+				}
 			}
 		}		
 		/********************************************************/
-		
+	 
 		//calculate weighted score for the group combination
 		double UN;	
 		UN = (WScore[(groupA+groupB)] / D);