X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=singlelinkage.cpp;h=fe5adca04ac1659cf88ac3c8df311aeead91709c;hb=74844a60d80c6dd06e3fb02ee9b928424f9019b0;hp=9f015db7359879be53da5e6001889117c7e5f7c6;hpb=832d53a9dfac6b1795735eec643d8cf627b0d8e3;p=mothur.git diff --git a/singlelinkage.cpp b/singlelinkage.cpp index 9f015db..fe5adca 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) {} @@ -80,7 +80,7 @@ void SingleLinkage::update(){ removeCell(rowCells[rowInd], -1 , -1); } catch(exception& e) { - errorOut(e, "SingleLinkage", "update"); + m->errorOut(e, "SingleLinkage", "update"); exit(1); } } @@ -97,7 +97,7 @@ bool SingleLinkage::updateDistance(MatData& colCell, MatData& rowCell) { return(changed); } catch(exception& e) { - errorOut(e, "SingleLinkage", "updateDistance"); + m->errorOut(e, "SingleLinkage", "updateDistance"); exit(1); } }