changes while testing

[mothur.git] / clusterclassic.h

diff --git a/clusterclassic.h b/clusterclassic.h
index 932c806ec42ac52a4a90670239d0c4a6a27b1efb..eaccb273b4980b297e1ad4d9f419d6494e37a120 100644 (file)
--- a/clusterclassic.h
+++ b/clusterclassic.h
@@ -6,6 +6,7 @@
 #include "listvector.hpp"
 #include "rabundvector.hpp"
 #include "nameassignment.hpp"
+#include "counttable.h"
 
 /*
  *  clusterclassic.h
@@ -22,6 +23,7 @@ class ClusterClassic {
 public:
        ClusterClassic(float, string, bool);
        int readPhylipFile(string, NameAssignment*);
+    int readPhylipFile(string, CountTable*);
        void update(double&);
        double getSmallDist() { return smallDist; }     
        int getNSeqs() { return nseqs; }        
@@ -41,13 +43,13 @@ private:
        struct colDist {
                int col;
                int row;
-               double dist;
+               float dist;
                colDist(int r, int c, double d) : row(r), col(c), dist(d) {}
        };
        
        RAbundVector* rabund;
        ListVector* list;
-       vector< vector<double> > dMatrix;       
+       vector< vector<float> > dMatrix;        
        //vector<colDist> rowSmallDists;
        
        int smallRow;