X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sharedlistvector.h;h=81779257346d4b25dbecf092a6c730162d7d4991;hb=372fb21ea66ced432b109225851a1b80ef0491a3;hp=492997eee0ea238a1909c44baf262950442d0d95;hpb=4761e165b4a196fefa57755d3176d9ced19df6b1;p=mothur.git

diff --git a/sharedlistvector.h b/sharedlistvector.h
index 492997e..8177925 100644
--- a/sharedlistvector.h
+++ b/sharedlistvector.h
@@ -10,14 +10,11 @@
  *
  */
 
-#include <Carbon/Carbon.h>
 #include "datavector.hpp"
 #include "groupmap.h"
-#include "globaldata.hpp"
+#include "counttable.h"
 #include "sharedrabundvector.h"
 #include "sharedsabundvector.h"
-#include <iostream>
-#include <map>
 
 /* This class is a child to datavector.  It represents OTU information at a certain distance. 
 	A sharedlistvector can be converted into a sharedordervector, sharedrabundvector or sharedsabundvectorand 
@@ -36,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;		}
@@ -57,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;
@@ -69,4 +67,3 @@ private:
 };
 
 #endif
-