X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=singlelinkage.cpp;h=1a1b2aee36bed8af6b7d9782e54adcdedc04d466;hb=94d43af803e4be78b2ba8049669504e854ad13be;hp=9f015db7359879be53da5e6001889117c7e5f7c6;hpb=832d53a9dfac6b1795735eec643d8cf627b0d8e3;p=mothur.git

diff --git a/singlelinkage.cpp b/singlelinkage.cpp
index 9f015db..1a1b2ae 100644
--- a/singlelinkage.cpp
+++ b/singlelinkage.cpp
@@ -5,8 +5,8 @@
 
 /***********************************************************************/
 
-SingleLinkage::SingleLinkage(RAbundVector* rav, ListVector* lv, SparseMatrix* dm, float c) :
-Cluster(rav, lv, dm, c)
+SingleLinkage::SingleLinkage(RAbundVector* rav, ListVector* lv, SparseMatrix* dm, float c, string s) :
+Cluster(rav, lv, dm, c, s)
 {}
 
 
@@ -18,7 +18,7 @@ string SingleLinkage::getTag() {
 
 /***********************************************************************/
 //This function clusters based on the single linkage method.
-void  SingleLinkage::update(){
+void  SingleLinkage::update(double& cutOFF){
 	try {
 		getRowColCells();	
 	
@@ -77,10 +77,11 @@ void  SingleLinkage::update(){
 		clusterBins();
 		clusterNames();
 		// remove also the cell with the smallest distance
+
 		removeCell(rowCells[rowInd], -1 , -1);
 	}
 	catch(exception& e) {
-		errorOut(e, "SingleLinkage", "update");
+		m->errorOut(e, "SingleLinkage", "update");
 		exit(1);
 	}
 }
@@ -97,7 +98,7 @@ bool SingleLinkage::updateDistance(MatData& colCell, MatData& rowCell) {
 		return(changed);
 	}
 	catch(exception& e) {
-		errorOut(e, "SingleLinkage", "updateDistance");
+		m->errorOut(e, "SingleLinkage", "updateDistance");
 		exit(1);
 	}
 }