fixes while testing 1.33.0

[mothur.git] / cluster.hpp

diff --git a/cluster.hpp b/cluster.hpp
index 26a01b9389778fea2e2b1067a1738c75027ad7f2..23a3d97f26db6087adcf1dee3c015e581e06321c 100644 (file)
--- a/cluster.hpp
+++ b/cluster.hpp
@@ -13,7 +13,7 @@ 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;
@@ -33,7 +33,7 @@ protected:
        
        ull smallRow;
        ull smallCol;
-       float smallDist;
+       float smallDist, adjust;
        bool mapWanted;
        float cutoff;
        map<string, int> seq2Bin;
@@ -48,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();
        
@@ -60,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();
@@ -73,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();
        
@@ -90,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();