fixed bug with getting sharedrabunds for venn, heatmap and tree.shared commands,...

[mothur.git] / collectsharedcommand.h

diff --git a/collectsharedcommand.h b/collectsharedcommand.h
index ee11a701035442fe310a0908c4eb1bf20a1cfd85..aac31c1e32a0b270d03d7b64d69ae1825b5a6af0 100644 (file)
--- a/collectsharedcommand.h
+++ b/collectsharedcommand.h
@@ -9,18 +9,17 @@
  *
  */
 
-#include <Carbon/Carbon.h>
-#include <iostream>
-#include <fstream>
-#include <vector>
+
 #include "command.hpp"
 #include "sharedordervector.h"
-#include "listvector.hpp"
+#include "sharedlistvector.h"
 #include "inputdata.h"
 #include "groupmap.h"
 #include "collect.h"
 #include "display.h"
-#include "readmatrix.hpp"
+#include "readotu.h"
+#include "validcalculator.h"
+#include "sharedutilities.h"
 
 /* The collect.shared() command:
        The collect command generates a collector's curve from the given file representing several groups.  
@@ -46,15 +45,18 @@ public:
        
 private:
        GlobalData* globaldata;
+       SharedUtil* util;
        GroupMap* groupmap;
-       ListVector* list;
-       ReadMatrix* read;
+       SharedListVector* SharedList;
+       ReadOTUFile* read;
        SharedOrderVector* order;
        InputData* input;
+       ValidCalculators* validCalculator;
        Collect* cCurve;
        vector<Display*> cDisplays;
        int freq;
+       string format;
 
 };
 
-#endif
\ No newline at end of file
+#endif