X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=averagelinkage.cpp;fp=averagelinkage.cpp;h=7522d2a3083f9247744f93a5bc147480f0304a72;hb=81276c241b984898f8d30ad123c00592ee6db7b8;hp=db2c51edc5b182b52dcf540456baad7b5782c61e;hpb=e72551c9cc5542e6a354f0f3e415fea261421d72;p=mothur.git diff --git a/averagelinkage.cpp b/averagelinkage.cpp index db2c51e..7522d2a 100644 --- a/averagelinkage.cpp +++ b/averagelinkage.cpp @@ -38,15 +38,8 @@ bool AverageLinkage::updateDistance(MatData& colCell, MatData& rowCell) { saveCol = smallCol; } - float oldColCell = colCell->dist; - colCell->dist = (colBin * colCell->dist + rowBin * rowCell->dist) / totalBin; - //warn user if merge with value above cutoff produces a value below cutoff - if ((colCell->dist < cutoff) && ((oldColCell > cutoff) || (rowCell->dist > cutoff)) ) { - mothurOut("Warning: merging " + toString(oldColCell) + " with " + toString(rowCell->dist) + ", new value = " + toString(colCell->dist) + ". Results will differ from those if cutoff was used in the read.dist command."); mothurOutEndLine(); - } - return(true); } catch(exception& e) {