parsimony command now uses groups, fixed bug with unweighted groups

[mothur.git] / rarefactsharedcommand.h

diff --git a/rarefactsharedcommand.h b/rarefactsharedcommand.h
index cb2219fc7ec1897aa69d492f467bc0572a67354e..a0afb9607184e4d6e522fe92003047616e07c968 100644 (file)
--- a/rarefactsharedcommand.h
+++ b/rarefactsharedcommand.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 "rarefact.h"
 #include "display.h"
 #include "readmatrix.hpp"
+#include "validcalculator.h"
 
 /* The rarefaction.shared() command:
        The rarefaction command generates a rarefaction curve from a given file representing several groups.  
@@ -45,15 +44,16 @@ public:
        
 private:
        GlobalData* globaldata;
-       GroupMap* groupmap;
-       ListVector* list;
+       SharedListVector* SharedList;
        ReadMatrix* 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