added otu.association command. added calcSpearman, calcKendall and calcPearson functi...

[mothur.git] / averagelinkage.cpp

diff --git a/averagelinkage.cpp b/averagelinkage.cpp
index 7a4cb88d366d4f9765d906ce0fc7ea27600a6fdd..b98c8e294c09c6b75e9acb06bda9cbca63b7f85e 100644 (file)
--- a/averagelinkage.cpp
+++ b/averagelinkage.cpp
@@ -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);
        }
 }