X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=rarefact.h;h=5e42a787bb77f44a7bb989c738c45b8449ed6e29;hb=ffc44592ff7ae94f14f9e21f87198e33d323cd1d;hp=9507d5af84eeadec5046a4fe1967eda508913968;hpb=861f46b74c17adec8c6ad6d89f232ae7485797bf;p=mothur.git

diff --git a/rarefact.h b/rarefact.h
index 9507d5a..5e42a78 100644
--- a/rarefact.h
+++ b/rarefact.h
@@ -5,29 +5,32 @@
 #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(OrderVector* o, vector<Display*> disp, int p) :
+			numSeqs(o->getNumSeqs()), order(o), displays(disp), label(o->getLabel()), processors(p)  { m = MothurOut::getInstance(); }
 	Rarefact(vector<SharedRAbundVector*> shared, vector<Display*> disp) :
-					 lookup(shared), displays(disp) {  globaldata = GlobalData::getInstance();  };
+					 lookup(shared), displays(disp) {  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;
+	int numSeqs, numGroupComb, processors;
 	string label;
 	void mergeVectors(SharedRAbundVector*, SharedRAbundVector*);
 	vector<SharedRAbundVector*> lookup; 
+	MothurOut* m;
+	
+	int createProcesses(vector<int>&, RarefactionCurveData*, int);
+	int driver(RarefactionCurveData*, int, int);
 
 };