changes while testing

[mothur.git] / hcluster.h

diff --git a/hcluster.h b/hcluster.h
index 7fc8177c56d50303771e1a60c9fdd0f4e84d957b..d8598867a7bf247509a7736203a5ef505ce70f9e 100644 (file)
--- a/hcluster.h
+++ b/hcluster.h
@@ -23,7 +23,7 @@ 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();
@@ -38,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;
@@ -68,6 +68,7 @@ protected:
        
        vector<seqDist> mergedMin;
        string partialDist;
+       MothurOut* m;
        
        
 };