changes while testing

[mothur.git] / hcluster.h

diff --git a/hcluster.h b/hcluster.h
index da7769d8813e656cd5e63fc3ec15b10c210e062b..d8598867a7bf247509a7736203a5ef505ce70f9e 100644 (file)
--- a/hcluster.h
+++ b/hcluster.h
@@ -17,23 +17,13 @@
 class RAbundVector;
 class ListVector;
 
-/***********************************************************************/
-struct linkNode {
-       int     links;
-       float dist;
-       
-       linkNode() {};
-       linkNode(int l, float a) : links(l), dist(a) {};
-       ~linkNode() {};
-};
-
 /***********************************************************************/
 class HCluster {
        
 public:
        HCluster(RAbundVector*, ListVector*, string, string, NameAssignment*, float);
        ~HCluster(){};
-    bool update(int, int, float);
+    double update(int, int, float);
        void setMapWanted(bool m); 
        map<string, int> getSeqtoBin()  {  return seq2Bin;      }
        vector<seqDist> getSeqs();
@@ -48,8 +38,8 @@ protected:
        void updateMap();
        vector<seqDist> getSeqsFNNN();
        vector<seqDist> getSeqsAN();
-       void combineFile();
-       void processFile();
+       int combineFile();
+       int processFile();
        //seqDist getNextDist(char*, int&, int);
                
        RAbundVector* rabund;
@@ -78,6 +68,7 @@ protected:
        
        vector<seqDist> mergedMin;
        string partialDist;
+       MothurOut* m;
        
        
 };