X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sharedordervector.h;h=94d91c5756da05a608253694a307ad6ea931baed;hb=cd10743907df223b7dd5b3a3deb20fde758b8ed7;hp=f925964e72b7bf7173945b7c04299bbfba1d2fdc;hpb=fd282e6b4be2560f5b1bd154a9e8d24b798eefaf;p=mothur.git

diff --git a/sharedordervector.h b/sharedordervector.h
index f925964..94d91c5 100644
--- a/sharedordervector.h
+++ b/sharedordervector.h
@@ -25,11 +25,12 @@ struct individual {
 		int abundance;
 };
 
-#include <Carbon/Carbon.h>
 #include "sabundvector.hpp"
 #include "rabundvector.hpp"
 #include "sharedrabundvector.h"
 #include "sharedsabundvector.h"
+#include "globaldata.hpp"
+#include "groupmap.h"
 
 class SharedOrderVector : public DataVector {
 	
@@ -39,7 +40,7 @@ public:
 	SharedOrderVector(const SharedOrderVector& ov)	: DataVector(ov.label), data(ov.data), maxRank(ov.maxRank), numBins(ov.numBins), numSeqs(ov.numSeqs), needToUpdate(ov.needToUpdate) {if(needToUpdate == 1){	updateStats();}};
 
 	SharedOrderVector(string, vector<individual>);
-//	SharedOrderVector(ifstream&);
+	SharedOrderVector(ifstream&);
 	~SharedOrderVector(){};
 	
 	void set(int, int, int, string);	//index, OTU, abundance, group
@@ -64,6 +65,8 @@ public:
 	SharedSAbundVector getSharedSAbundVector(string);	//get the sharedSabundvector for a sepecific group
 	
 private:
+	GlobalData* globaldata;
+	GroupMap* groupmap;
 	vector<individual>  data; 
 	map< int, vector<individual> >::iterator it;
 	int maxRank;