broke apart read matrix file

[mothur.git] / rarefactsharedcommand.h

diff --git a/rarefactsharedcommand.h b/rarefactsharedcommand.h
index 1d877106bda0678fadfd99fff7e17f9766daa841..a16fdb9d8f1ff7166c6b78ca1815368a3c45e287 100644 (file)
--- a/rarefactsharedcommand.h
+++ b/rarefactsharedcommand.h
@@ -9,17 +9,15 @@
  *
  */
 
-#include <Carbon/Carbon.h>
-#include <iostream>
-#include <fstream>
-#include <vector>
 #include "command.hpp"
 #include "sharedordervector.h"
 #include "sharedlistvector.h"
 #include "inputdata.h"
 #include "rarefact.h"
 #include "display.h"
-#include "readmatrix.hpp"
+#include "readotu.h"
+#include "validcalculator.h"
+#include "sharedutilities.h"
 
 /* The rarefaction.shared() command:
        The rarefaction command generates a rarefaction curve from a given file representing several groups.  
@@ -44,14 +42,17 @@ public:
        
 private:
        GlobalData* globaldata;
+       SharedUtil* util;
        SharedListVector* SharedList;
-       ReadMatrix* read;
+       ReadOTUFile* read;
        SharedOrderVector* order;
        InputData* input;
+       ValidCalculators* validCalculator;
        Rarefact* rCurve;
        vector<Display*> rDisplays;
        int freq, nIters;
+       string format;
 
 };
 
-#endif
\ No newline at end of file
+#endif