X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=averagelinkage.cpp;h=c430c883f66d6006cc9bf01a2a964dd62957688f;hb=ee8403d4eb5760187d62b42a9cf4272de8fc0ec4;hp=7522d2a3083f9247744f93a5bc147480f0304a72;hpb=81276c241b984898f8d30ad123c00592ee6db7b8;p=mothur.git diff --git a/averagelinkage.cpp b/averagelinkage.cpp index 7522d2a..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, float c) : - Cluster(rav, lv, dm, c) +AverageLinkage::AverageLinkage(RAbundVector* rav, ListVector* lv, SparseMatrix* dm, float c, string s) : + Cluster(rav, lv, dm, c, s) { saveRow = -1; saveCol = -1; @@ -43,7 +43,7 @@ bool AverageLinkage::updateDistance(MatData& colCell, MatData& rowCell) { return(true); } catch(exception& e) { - errorOut(e, "AverageLinkage", "updateDistance"); + m->errorOut(e, "AverageLinkage", "updateDistance"); exit(1); } }