X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=rarefact.h;fp=rarefact.h;h=5e42a787bb77f44a7bb989c738c45b8449ed6e29;hb=ca9ac1d80c62f57270b0dcd49410ebe08a8aecd6;hp=7d1fab4b16b412b56f07225acac50936b0348e77;hpb=36a867cbd85d9c276d3c8d13f25a150bbbe2466b;p=mothur.git diff --git a/rarefact.h b/rarefact.h index 7d1fab4..5e42a78 100644 --- a/rarefact.h +++ b/rarefact.h @@ -5,7 +5,6 @@ #include "raredisplay.h" #include "ordervector.hpp" #include "mothur.h" -#include "globaldata.hpp" class Rarefact { @@ -14,14 +13,14 @@ public: Rarefact(OrderVector* o, vector disp, int p) : numSeqs(o->getNumSeqs()), order(o), displays(disp), label(o->getLabel()), processors(p) { m = MothurOut::getInstance(); } Rarefact(vector shared, vector 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 displays; int numSeqs, numGroupComb, processors;