X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=sharedlistvector.h;h=13fed9791fb347806f33723893aacd15eb535690;hp=2c8d01bf4c257a715f789412a4391169138af9b6;hb=b206f634aae1b4ce13978d203247fb64757d5482;hpb=753dc84cf289b1d5dc0ca5b0c043640927aa951a

diff --git a/sharedlistvector.h b/sharedlistvector.h
index 2c8d01b..13fed97 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){globaldata = GlobalData::getInstance();};
-	~SharedListVector(){};
+	SharedListVector(const SharedListVector& lv) : DataVector(lv.label), data(lv.data), maxRank(lv.maxRank), numBins(lv.numBins), numSeqs(lv.numSeqs), binLabels(lv.binLabels) { groupmap = NULL; countTable = NULL; };
+	~SharedListVector(){ if (groupmap != NULL) { delete groupmap; } if (countTable != NULL) { delete countTable; } };
 	
 	int getNumBins()							{	return numBins;		}
 	int getNumSeqs()							{	return numSeqs;		}
@@ -42,6 +42,8 @@ public:
 
 	void set(int, string);	
 	string get(int);
+    vector<string> getLabels();
+    void setLabels(vector<string>);
 	void push_back(string);
 	void resize(int);
 	void clear();
@@ -58,11 +60,12 @@ public:
 	
 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;
+    vector<string> binLabels;
 
 };