Added get.line command.

[mothur.git] / collectsharedcommand.h

diff --git a/collectsharedcommand.h b/collectsharedcommand.h
index ee11a701035442fe310a0908c4eb1bf20a1cfd85..ffc4278f3b690a4b2f4a0f5bf637146bee65ca3b 100644 (file)
--- a/collectsharedcommand.h
+++ b/collectsharedcommand.h
@@ -9,18 +9,18 @@
  *
  */
 
-#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 "validcalculator.h"
 
 /* The collect.shared() command:
        The collect command generates a collector's curve from the given file representing several groups.  
@@ -47,14 +47,16 @@ public:
 private:
        GlobalData* globaldata;
        GroupMap* groupmap;
-       ListVector* list;
+       SharedListVector* SharedList;
        ReadMatrix* read;
        SharedOrderVector* order;
        InputData* input;
+       ValidCalculators* validCalculator;
        Collect* cCurve;
        vector<Display*> cDisplays;
        int freq;
+       string format;
 
 };
 
-#endif
\ No newline at end of file
+#endif