X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=hcluster.h;h=78406505a1665dfa7eb95e7a8c0733ee0a7e7f5e;hb=62c36830aae6dd6151898ec6e07df59c8aed79fe;hp=bff432892144bfc0caa3f52f9cdd2691a605e72a;hpb=832d53a9dfac6b1795735eec643d8cf627b0d8e3;p=mothur.git

diff --git a/hcluster.h b/hcluster.h
index bff4328..7840650 100644
--- a/hcluster.h
+++ b/hcluster.h
@@ -17,16 +17,6 @@
 class RAbundVector;
 class ListVector;
 
-/***********************************************************************/
-struct linkNode {
-	int	links;
-	float dist;
-	
-	linkNode() {};
-	linkNode(int l, float a) : links(l), dist(a) {};
-	~linkNode() {};
-};
-
 /***********************************************************************/
 class HCluster {
 	
@@ -48,9 +38,9 @@ protected:
 	void updateMap();
 	vector<seqDist> getSeqsFNNN();
 	vector<seqDist> getSeqsAN();
-	void combineFile();
-	void processFile();
-	seqDist getNextDist(char*, int&, int);
+	int combineFile();
+	int processFile();
+	//seqDist getNextDist(char*, int&, int);
 		
 	RAbundVector* rabund;
 	ListVector* list;
@@ -78,6 +68,7 @@ protected:
 	
 	vector<seqDist> mergedMin;
 	string partialDist;
+	MothurOut* m;
 	
 	
 };