unifrac.weighted

[mothur.git] / collectsharedcommand.h

diff --git a/collectsharedcommand.h b/collectsharedcommand.h
index 3737c11196c48cd7fba5179ee311264f22b0e6ba..6e9d5cc3f498c96574d93321ecf2823edb0fa004 100644 (file)
--- a/collectsharedcommand.h
+++ b/collectsharedcommand.h
@@ -9,10 +9,7 @@
  *
  */
 
-#include <Carbon/Carbon.h>
-#include <iostream>
-#include <fstream>
-#include <vector>
+
 #include "command.hpp"
 #include "sharedordervector.h"
 #include "sharedlistvector.h"
@@ -21,6 +18,7 @@
 #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.  
@@ -51,10 +49,12 @@ private:
        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