pds' small change to sffinfo

[mothur.git] / hcluster.h

diff --git a/hcluster.h b/hcluster.h
index 679abbc2cc19e54f5a3028155de3d6d18372d937..78406505a1665dfa7eb95e7a8c0733ee0a7e7f5e 100644 (file)
--- 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;
@@ -71,13 +61,14 @@ protected:
        int smallCol;
        float smallDist, cutoff;
        map<string, int> seq2Bin;
-       bool mapWanted, exitedBreak, firstRead;
+       bool mapWanted, exitedBreak;
        seqDist next;
        string method, distfile;
        ifstream filehandle;
        
        vector<seqDist> mergedMin;
        string partialDist;
+       MothurOut* m;
        
        
 };