X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=sharedlistvector.h;h=81779257346d4b25dbecf092a6c730162d7d4991;hp=53fe1b1edd280bd6184766cbdf1d67cc2778cf91;hb=d1c97b8c04bb75faca1e76ffad60b37a4d789d3d;hpb=bfbc55964f1977da72c2cea984288a427d370a59

diff --git a/sharedlistvector.h b/sharedlistvector.h
index 53fe1b1..8177925 100644
--- a/sharedlistvector.h
+++ b/sharedlistvector.h
@@ -12,7 +12,7 @@
 
 #include "datavector.hpp"
 #include "groupmap.h"
-#include "globaldata.hpp"
+#include "counttable.h"
 #include "sharedrabundvector.h"
 #include "sharedsabundvector.h"
 
@@ -33,8 +33,8 @@ public:
 	SharedListVector();
 	SharedListVector(int);
 	SharedListVector(ifstream&);
-	SharedListVector(const SharedListVector& lv) : DataVector(lv.label), data(lv.data), maxRank(lv.maxRank), numBins(lv.numBins), numSeqs(lv.numSeqs){};
-	~SharedListVector(){};
+	SharedListVector(const SharedListVector& lv) : DataVector(lv.label), data(lv.data), maxRank(lv.maxRank), numBins(lv.numBins), numSeqs(lv.numSeqs){ groupmap = NULL; countTable = NULL; };
+	~SharedListVector(){ if (groupmap != NULL) { delete groupmap; } if (countTable != NULL) { delete countTable; } };
 	
 	int getNumBins()							{	return numBins;		}
 	int getNumSeqs()							{	return numSeqs;		}
@@ -54,11 +54,12 @@ public:
 	SharedOrderVector* getSharedOrderVector();
 	SharedRAbundVector getSharedRAbundVector(string);  //get sharedrabundvector for a certain group
 	SharedSAbundVector getSharedSAbundVector(string);			//get sharedsabundvector for a certain group
+	vector<SharedRAbundVector*> getSharedRAbundVector(); //returns sharedRabundVectors for all the users groups
 	
 private:
 	vector<string> data;  //data[i] is a list of names of sequences in the ith OTU.
-	GlobalData* globaldata;
 	GroupMap* groupmap;
+    CountTable* countTable;
 	int maxRank;
 	int numBins;
 	int numSeqs;