X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=rarefact.h;h=f6bc35551f50858e47a7999ce198145bcb81a4bb;hp=9eab51d12303577405227e9c26cdcf9506e8a857;hb=b206f634aae1b4ce13978d203247fb64757d5482;hpb=aa9238c0a9e6e7aa0ed8b8b606b08ad4fd7dcfe3

diff --git a/rarefact.h b/rarefact.h
index 9eab51d..f6bc355 100644
--- a/rarefact.h
+++ b/rarefact.h
@@ -5,30 +5,33 @@
 #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())  { 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(int, int);
-	int getSharedCurve(int, int);
+	int getCurve(float, int);
+	int getSharedCurve(float, int);
 	
 private:
-	GlobalData* globaldata;
+	
 	OrderVector* order;
 	vector<Display*> displays;
-	int numSeqs, numGroupComb;
+	int numSeqs, numGroupComb, processors;
 	string label;
+    set<int> ends;
 	void mergeVectors(SharedRAbundVector*, SharedRAbundVector*);
 	vector<SharedRAbundVector*> lookup; 
 	MothurOut* m;
+	
+	int createProcesses(vector<int>&, RarefactionCurveData*, int);
+	int driver(RarefactionCurveData*, int, int);
 
 };