changes while testing

[mothur.git] / rarefact.h

diff --git a/rarefact.h b/rarefact.h
index 7d1fab4b16b412b56f07225acac50936b0348e77..f6bc35551f50858e47a7999ce198145bcb81a4bb 100644 (file)
--- a/rarefact.h
+++ b/rarefact.h
@@ -5,27 +5,27 @@
 #include "raredisplay.h"
 #include "ordervector.hpp"
 #include "mothur.h"
-#include "globaldata.hpp"
 
 
 class Rarefact {
        
 public:
-       Rarefact(OrderVector* o, vector<Display*> disp, int p) :
-                       numSeqs(o->getNumSeqs()), order(o), displays(disp), label(o->getLabel()), processors(p)  { m = MothurOut::getInstance(); }
+       Rarefact(OrderVector* o, vector<Display*> disp, int p, set<int> en) :
+                       numSeqs(o->getNumSeqs()), order(o), displays(disp), label(o->getLabel()), processors(p), ends(en)  { m = MothurOut::getInstance(); }
        Rarefact(vector<SharedRAbundVector*> shared, vector<Display*> disp) :
-                                        lookup(shared), displays(disp) {  globaldata = GlobalData::getInstance(); m = MothurOut::getInstance(); }
+                                        lookup(shared), displays(disp) {  m = MothurOut::getInstance(); }
 
        ~Rarefact(){};
        int getCurve(float, int);
        int getSharedCurve(float, int);
        
 private:
-       GlobalData* globaldata;
+       
        OrderVector* order;
        vector<Display*> displays;
        int numSeqs, numGroupComb, processors;
        string label;
+    set<int> ends;
        void mergeVectors(SharedRAbundVector*, SharedRAbundVector*);
        vector<SharedRAbundVector*> lookup; 
        MothurOut* m;