X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=clusterclassic.h;h=eaccb273b4980b297e1ad4d9f419d6494e37a120;hp=932c806ec42ac52a4a90670239d0c4a6a27b1efb;hb=d1c97b8c04bb75faca1e76ffad60b37a4d789d3d;hpb=05c52893c6c2467381fe7e7b769d86b6209af2e1

diff --git a/clusterclassic.h b/clusterclassic.h
index 932c806..eaccb27 100644
--- 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;