X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=completelinkage.cpp;h=0a3c7b3e42f68347d0315299d5ed050b89ebb796;hp=a09af904fc64e3f901ef48c82b6f20469c48f348;hb=b206f634aae1b4ce13978d203247fb64757d5482;hpb=832d53a9dfac6b1795735eec643d8cf627b0d8e3

diff --git a/completelinkage.cpp b/completelinkage.cpp
index a09af90..0a3c7b3 100644
--- a/completelinkage.cpp
+++ b/completelinkage.cpp
@@ -3,8 +3,8 @@
 
 /***********************************************************************/
 
-CompleteLinkage::CompleteLinkage(RAbundVector* rav, ListVector* lv, SparseMatrix* dm, float c) :
-	Cluster(rav, lv, dm, c)
+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);
 	}
 }