Merge remote-tracking branch 'origin'

[mothur.git] / completelinkage.cpp

diff --git a/completelinkage.cpp b/completelinkage.cpp
index df6371ac8c988ce08b4ff670d0c4da86f6dff85f..06ed2db6495a0897c74c2b278aac642a15ea1c78 100644 (file)
--- 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,17 +16,17 @@ 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);
        }
        catch(exception& e) {
-               errorOut(e, "CompleteLinkage", "updateDistance");
+               m->errorOut(e, "CompleteLinkage", "updateDistance");
                exit(1);
        }
 }