X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cluster.hpp;h=d7c2737a05ed1a0198be9713aa4345f288ec3976;hb=e0ce7cbc93d7d2fbb753ca694182db092a0ea0e7;hp=6d7fc470e91eca8dae548ffb5594a4099a203f35;hpb=2397df97b12cd5d21ea10dc4248c18a5803ddd41;p=mothur.git

diff --git a/cluster.hpp b/cluster.hpp
index 6d7fc47..d7c2737 100644
--- a/cluster.hpp
+++ b/cluster.hpp
@@ -4,6 +4,7 @@
 
 #include "mothur.h"
 #include "sparsematrix.hpp"
+#include "mothurout.h"
 
 class RAbundVector;
 class ListVector;
@@ -46,6 +47,7 @@ protected:
 	MatVec colCells;
 	ull nRowCells;
 	ull nColCells;
+	MothurOut* m;
 };
 
 /***********************************************************************/
@@ -65,7 +67,7 @@ private:
 class SingleLinkage : public Cluster {
 public:
 	SingleLinkage(RAbundVector*, ListVector*, SparseMatrix*, float, string);
-    void update();
+    void update(double&);
 	bool updateDistance(MatData& colCell, MatData& rowCell);
 	string getTag();
 	
@@ -92,4 +94,17 @@ private:
 
 /***********************************************************************/
 
+class WeightedLinkage : public Cluster {
+public:
+	WeightedLinkage(RAbundVector*, ListVector*, SparseMatrix*, float, string);
+	bool updateDistance(MatData& colCell, MatData& rowCell);
+	string getTag();
+	
+private:
+	int saveRow;
+	int saveCol;	
+};
+
+/***********************************************************************/
+
 #endif