fixed cluster.classic and added weighted method to hcluster

[mothur.git] / clusterclassic.h

diff --git a/clusterclassic.h b/clusterclassic.h
index 37d9b1b44cd1e13aa4198f5bde7e16c46de14437..9a896f28df1a51d29978914e6922ce924b083e86 100644 (file)
--- a/clusterclassic.h
+++ b/clusterclassic.h
@@ -43,19 +43,19 @@ private:
                int col;
                int row;
                double dist;
-               colDist(int i, int r, double d) : row(r), col(i), dist(d) {}
+               colDist(int r, int c, double d) : row(r), col(c), dist(d) {}
        };
        
        RAbundVector* rabund;
        ListVector* list;
        vector< vector<double> > dMatrix;       
-       vector<colDist> rowSmallDists;
+       //vector<colDist> rowSmallDists;
        
        int smallRow;
        int smallCol, nseqs;
        double smallDist;
        bool mapWanted;
-       float cutoff;
+       double cutoff, aboveCutoff;
        map<string, int> seq2Bin;
        string method;