X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=completelinkage.cpp;h=0a3c7b3e42f68347d0315299d5ed050b89ebb796;hp=df6371ac8c988ce08b4ff670d0c4da86f6dff85f;hb=d1c97b8c04bb75faca1e76ffad60b37a4d789d3d;hpb=2397df97b12cd5d21ea10dc4248c18a5803ddd41

diff --git a/completelinkage.cpp b/completelinkage.cpp
index df6371a..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,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);
 	}
 }