X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=completelinkage.cpp;h=0a3c7b3e42f68347d0315299d5ed050b89ebb796;hp=86e90547f494ef0883705f640521cb82cf6dbb8f;hb=d1c97b8c04bb75faca1e76ffad60b37a4d789d3d;hpb=0caf3fbabaa3ece404f8ce77f4c883dc5b1bf1dc diff --git a/completelinkage.cpp b/completelinkage.cpp index 86e9054..0a3c7b3 100644 --- a/completelinkage.cpp +++ b/completelinkage.cpp @@ -3,8 +3,8 @@ /***********************************************************************/ -CompleteLinkage::CompleteLinkage(RAbundVector* rav, ListVector* lv, SparseMatrix* dm, float c, string s) : - Cluster(rav, lv, dm, c, s) +CompleteLinkage::CompleteLinkage(RAbundVector* rav, ListVector* lv, SparseDistanceMatrix* dm, float c, string s, float a) : + Cluster(rav, lv, dm, c, s, a) {} /***********************************************************************/ @@ -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);