X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=cluster.hpp;h=23a3d97f26db6087adcf1dee3c015e581e06321c;hp=ff5d41d38c71cfea8dd9d434f7a4e466e0cd160c;hb=cf9987b67aa49777a4c91c2d21f96e58bf17aa82;hpb=f687723a8357916e86a05116978e6869b039ce36

diff --git a/cluster.hpp b/cluster.hpp
index ff5d41d..23a3d97 100644
--- a/cluster.hpp
+++ b/cluster.hpp
@@ -1,7 +1,7 @@
 #ifndef CLUSTER_H
 #define CLUSTER_H
 
-
+//test change
 
 #include "mothur.h"
 #include "sparsedistancematrix.h"
@@ -13,7 +13,8 @@ class ListVector;
 class Cluster {
 	
 public:
-	Cluster(RAbundVector*, ListVector*, SparseDistanceMatrix*, float, string);
+	Cluster(RAbundVector*, ListVector*, SparseDistanceMatrix*, float, string, float);
+    virtual ~Cluster() {}
     virtual void update(double&);				
 	virtual string getTag() = 0;
 	virtual void setMapWanted(bool m);  
@@ -32,7 +33,7 @@ protected:
 	
 	ull smallRow;
 	ull smallCol;
-	float smallDist;
+	float smallDist, adjust;
 	bool mapWanted;
 	float cutoff;
 	map<string, int> seq2Bin;
@@ -47,7 +48,7 @@ protected:
 
 class CompleteLinkage : public Cluster {
 public:
-	CompleteLinkage(RAbundVector*, ListVector*, SparseDistanceMatrix*, float, string);
+	CompleteLinkage(RAbundVector*, ListVector*, SparseDistanceMatrix*, float, string, float);
 	bool updateDistance(PDistCell& colCell, PDistCell& rowCell);
 	string getTag();
 	
@@ -59,7 +60,7 @@ private:
 
 class SingleLinkage : public Cluster {
 public:
-	SingleLinkage(RAbundVector*, ListVector*, SparseDistanceMatrix*, float, string);
+	SingleLinkage(RAbundVector*, ListVector*, SparseDistanceMatrix*, float, string, float);
     void update(double&);
 	bool updateDistance(PDistCell& colCell, PDistCell& rowCell);
 	string getTag();
@@ -72,7 +73,7 @@ private:
 
 class AverageLinkage : public Cluster {
 public:
-	AverageLinkage(RAbundVector*, ListVector*, SparseDistanceMatrix*, float, string);
+	AverageLinkage(RAbundVector*, ListVector*, SparseDistanceMatrix*, float, string, float);
 	bool updateDistance(PDistCell& colCell, PDistCell& rowCell);
 	string getTag();
 	
@@ -89,7 +90,7 @@ private:
 
 class WeightedLinkage : public Cluster {
 public:
-	WeightedLinkage(RAbundVector*, ListVector*, SparseDistanceMatrix*, float, string);
+	WeightedLinkage(RAbundVector*, ListVector*, SparseDistanceMatrix*, float, string, float);
 	bool updateDistance(PDistCell& colCell, PDistCell& rowCell);
 	string getTag();
 	
@@ -102,4 +103,4 @@ private:
 
 
 
-#endif
\ No newline at end of file
+#endif