X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=readcluster.h;h=7ea579c2fc1a250bba3500f7d6dc59d3ebed26f8;hp=4574c8071616b47f389527f2fd90a5236326f4cd;hb=1a20e24ee786195ab0e1cccd4f5aede7a88f3f4e;hpb=aa9238c0a9e6e7aa0ed8b8b606b08ad4fd7dcfe3

diff --git a/readcluster.h b/readcluster.h
index 4574c80..7ea579c 100644
--- a/readcluster.h
+++ b/readcluster.h
@@ -13,7 +13,7 @@
 #include "mothur.h"
 #include "nameassignment.hpp"
 #include "listvector.hpp"
-#include "globaldata.hpp"
+#include "counttable.h"
 
 
 /******************************************************/
@@ -21,22 +21,24 @@
 class ReadCluster {
 	
 public:
-	ReadCluster(string, float);
+	ReadCluster(string, float, string, bool);
 	~ReadCluster();
-	int read(NameAssignment*);
+	int read(NameAssignment*&);
+    int read(CountTable*&);
 	string getOutputFile() { return OutPutFile; }
 	void setFormat(string f) { format = f;	}
 	ListVector* getListVector()		{	return list;	}
 	
 private:
-	GlobalData* globaldata;
-	string distFile;
+	string distFile, outputDir;
 	string OutPutFile, format;
 	ListVector* list;
 	float cutoff;
 	MothurOut* m;
+	bool sortWanted;
 	
-	int convertPhylip2Column(NameAssignment*);
+	int convertPhylip2Column(NameAssignment*&);
+    int convertPhylip2Column(CountTable*&);
 };
 
 /******************************************************/