X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=rarefact.h;h=20c19251b132dd8ba512ab1530206546eb0bbbec;hb=df1ea5f2151b9334c471bf4310f78f51bba098be;hp=6eed91214905f3e8f50b89043c45ea8203b2b808;hpb=37519fc35c0eb1523e84227517694c4015847c6d;p=mothur.git

diff --git a/rarefact.h b/rarefact.h
index 6eed912..20c1925 100644
--- a/rarefact.h
+++ b/rarefact.h
@@ -1,33 +1,34 @@
 #ifndef RAREFACT_H
 #define RAREFACT_H
 
-using namespace std;
-
 #include "rarefactioncurvedata.h"
 #include "raredisplay.h"
 #include "ordervector.hpp"
 #include "mothur.h"
+#include "globaldata.hpp"
 
 
 class Rarefact {
 	
 public:
 	Rarefact(OrderVector* o, vector<Display*> disp) :
-			numSeqs(o->getNumSeqs()), order(o), displays(disp), label(o->getLabel())  {};
+			numSeqs(o->getNumSeqs()), order(o), displays(disp), label(o->getLabel())  { m = MothurOut::getInstance(); }
 	Rarefact(vector<SharedRAbundVector*> shared, vector<Display*> disp) :
-					 lookup(shared), displays(disp) {};
+					 lookup(shared), displays(disp) {  globaldata = GlobalData::getInstance(); m = MothurOut::getInstance(); }
 
 	~Rarefact(){};
-	void getCurve(int, int);
-	void getSharedCurve(int, int);
+	int getCurve(float, int);
+	int getSharedCurve(float, int);
 	
 private:
+	GlobalData* globaldata;
 	OrderVector* order;
 	vector<Display*> displays;
 	int numSeqs, numGroupComb;
 	string label;
 	void mergeVectors(SharedRAbundVector*, SharedRAbundVector*);
 	vector<SharedRAbundVector*> lookup; 
+	MothurOut* m;
 
 };