X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=clusterclassic.h;h=eaccb273b4980b297e1ad4d9f419d6494e37a120;hp=110c0408e5107e9acebd322c7a1070f364c13a7d;hb=cf9987b67aa49777a4c91c2d21f96e58bf17aa82;hpb=ca9ac1d80c62f57270b0dcd49410ebe08a8aecd6

diff --git a/clusterclassic.h b/clusterclassic.h
index 110c040..eaccb27 100644
--- a/clusterclassic.h
+++ b/clusterclassic.h
@@ -1,12 +1,12 @@
-#ifndef CLUSTER_H
-#define CLUSTER_H
+#ifndef CLUSTERCLASSIC_H
+#define CLUSTERCLASSIC_H
 
 
-#include "mothur.h"
 #include "mothurout.h"
 #include "listvector.hpp"
 #include "rabundvector.hpp"
 #include "nameassignment.hpp"
+#include "counttable.h"
 
 /*
  *  clusterclassic.h
@@ -23,12 +23,13 @@ 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; }	
 	ListVector* getListVector() { return list; }
 	RAbundVector* getRAbundVector() { return rabund; }		
-	string getTag();
+	string getTag() { return tag; }
 	void setMapWanted(bool m);  
 	map<string, int> getSeqtoBin()  {  return seq2Bin;	}
 
@@ -42,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;
@@ -57,7 +58,7 @@ private:
 	bool mapWanted, sim;
 	double cutoff, aboveCutoff;
 	map<string, int> seq2Bin;
-	string method;
+	string method, tag;
 	
 	MothurOut* m;
 };