added the Calculators Thomas made in the fall. Added parameter and command error...

[mothur.git] / collectsharedcommand.h

diff --git a/collectsharedcommand.h b/collectsharedcommand.h
index 6a8f96f1c9115548cc6dca8f7ff13835468ec441..c5c24b2f974e504e5c8ef079d15a89026291b992 100644 (file)
--- a/collectsharedcommand.h
+++ b/collectsharedcommand.h
@@ -9,9 +9,7 @@
  *
  */
 
-#include <iostream>
-#include <fstream>
-#include <vector>
+
 #include "command.hpp"
 #include "sharedordervector.h"
 #include "sharedlistvector.h"
@@ -20,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.  
@@ -50,9 +49,12 @@ private:
        ReadMatrix* read;
        SharedOrderVector* order;
        InputData* input;
+       ValidCalculators* validCalculator;
        Collect* cCurve;
        vector<Display*> cDisplays;
        int freq;
+       string format;
+       void setGroups();
 
 };