Merge remote-tracking branch 'mothur/master'

[mothur.git] / mgclustercommand.h

diff --git a/mgclustercommand.h b/mgclustercommand.h
index 6f4453316a33d41cb18774d6c9b435bc563980e2..c9c23c80f88d0ab0c98ae058748c544a561b76d3 100644 (file)
--- a/mgclustercommand.h
+++ b/mgclustercommand.h
@@ -47,6 +47,7 @@ private:
        Cluster* cluster;
        HCluster* hcluster;
        ListVector* list;
+    CountTable* ct;
        ListVector oldList;
     RAbundVector rav;
        vector<seqDist> overlapMatrix;
@@ -57,13 +58,13 @@ private:
        double cutoff;
        float penalty;
        int precision, length, precisionLength;
-       bool abort, minWanted, hclusterWanted, merge, hard, large;
+       bool abort, minWanted, hclusterWanted, merge, hard;
        
        void printData(ListVector*);
        ListVector* mergeOPFs(map<string, int>, float);
        void sortHclusterFiles(string, string);
        vector<seqDist> getSeqs(ifstream&);
-    void createRabund(CountTable);
+    void createRabund(CountTable*&, ListVector*&, RAbundVector*&);
 
 };