X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=averagelinkage.cpp;h=c430c883f66d6006cc9bf01a2a964dd62957688f;hb=fb981b4699571698cbbb09e9ee9c986ca49c3d58;hp=7a4cb88d366d4f9765d906ce0fc7ea27600a6fdd;hpb=1b9d0a66e4737f31d16824fe93944880b9edc530;p=mothur.git

diff --git a/averagelinkage.cpp b/averagelinkage.cpp
index 7a4cb88..c430c88 100644
--- a/averagelinkage.cpp
+++ b/averagelinkage.cpp
@@ -1,7 +1,7 @@
 #ifndef AVERAGE_H
 #define AVERAGE_H
 
-
+//test
 #include "mothur.h"
 #include "cluster.hpp"
 #include "rabundvector.hpp"
@@ -11,8 +11,8 @@
 
 /***********************************************************************/
 
-AverageLinkage::AverageLinkage(RAbundVector* rav, ListVector* lv, SparseMatrix* dm) :
-	Cluster(rav, lv, dm)
+AverageLinkage::AverageLinkage(RAbundVector* rav, ListVector* lv, SparseMatrix* dm, float c, string s) :
+	Cluster(rav, lv, dm, c, s)
 {
 	saveRow = -1;
 	saveCol = -1;
@@ -37,12 +37,13 @@ bool AverageLinkage::updateDistance(MatData& colCell, MatData& rowCell) {
 			saveRow = smallRow;
 			saveCol = smallCol;
 		}
-
+		
 		colCell->dist = (colBin * colCell->dist + rowBin * rowCell->dist) / totalBin;
+		
 		return(true);
 	}
 	catch(exception& e) {
-		errorOut(e, "AverageLinkage", "updateDistance");
+		m->errorOut(e, "AverageLinkage", "updateDistance");
 		exit(1);
 	}
 }