X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=rarefact.h;h=20c19251b132dd8ba512ab1530206546eb0bbbec;hb=6e81846c8e5b2614f6b06643a9f558fb0e6669fa;hp=b4a4cfee88a1c9d4dfc1abe58eaa59594002d108;hpb=20a2d0350a737a434c89f303662d64a8eeea7b05;p=mothur.git

diff --git a/rarefact.h b/rarefact.h
index b4a4cfe..20c1925 100644
--- a/rarefact.h
+++ b/rarefact.h
@@ -1,28 +1,26 @@
 #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())  {};
-	Rarefact(SharedOrderVector* sharedorder, vector<Display*> disp) :
-					numSeqs(sharedorder->getNumSeqs()), sharedorder(sharedorder), displays(disp), label(sharedorder->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) {  globaldata = GlobalData::getInstance(); m = MothurOut::getInstance(); }
 
 	~Rarefact(){};
-	void getCurve(int, int);
-	void getSharedCurve(int, int);
+	int getCurve(float, int);
+	int getSharedCurve(float, int);
 	
 private:
-	SharedOrderVector* sharedorder;
 	GlobalData* globaldata;
 	OrderVector* order;
 	vector<Display*> displays;
@@ -30,6 +28,7 @@ private:
 	string label;
 	void mergeVectors(SharedRAbundVector*, SharedRAbundVector*);
 	vector<SharedRAbundVector*> lookup; 
+	MothurOut* m;
 
 };