Merge remote-tracking branch 'origin/master'

[mothur.git] / mgclustercommand.h

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