X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=completelinkage.cpp;h=06ed2db6495a0897c74c2b278aac642a15ea1c78;hp=86e90547f494ef0883705f640521cb82cf6dbb8f;hb=a8e2df1b96a57f5f29576b08361b86a96a8eff4f;hpb=0caf3fbabaa3ece404f8ce77f4c883dc5b1bf1dc diff --git a/completelinkage.cpp b/completelinkage.cpp index 86e9054..06ed2db 100644 --- a/completelinkage.cpp +++ b/completelinkage.cpp @@ -3,7 +3,7 @@ /***********************************************************************/ -CompleteLinkage::CompleteLinkage(RAbundVector* rav, ListVector* lv, SparseMatrix* dm, float c, string s) : +CompleteLinkage::CompleteLinkage(RAbundVector* rav, ListVector* lv, SparseDistanceMatrix* dm, float c, string s) : Cluster(rav, lv, dm, c, s) {} @@ -16,11 +16,11 @@ string CompleteLinkage::getTag() { /***********************************************************************/ //This function updates the distance based on the furthest neighbor method. -bool CompleteLinkage::updateDistance(MatData& colCell, MatData& rowCell) { +bool CompleteLinkage::updateDistance(PDistCell& colCell, PDistCell& rowCell) { try { bool changed = false; - if (colCell->dist < rowCell->dist) { - colCell->dist = rowCell->dist; + if (colCell.dist < rowCell.dist) { + colCell.dist = rowCell.dist; changed = true; } return(changed);