X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sharedlistvector.h;h=56ea802a1b1bca511454f83ddcb9e8f29bd5ed27;hb=36a6b02cf7f09d2bc34376b588944a9ca73429c5;hp=f62248db77da9895e25fcb57f687fcf24922b47d;hpb=58cf1d08fee8c64334979075fa57bcafb035a2ed;p=mothur.git

diff --git a/sharedlistvector.h b/sharedlistvector.h
index f62248d..56ea802 100644
--- a/sharedlistvector.h
+++ b/sharedlistvector.h
@@ -12,11 +12,8 @@
 
 #include "datavector.hpp"
 #include "groupmap.h"
-#include "globaldata.hpp"
 #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 
@@ -35,8 +32,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; };
+	~SharedListVector(){ if (groupmap != NULL) { delete groupmap; } };
 	
 	int getNumBins()							{	return numBins;		}
 	int getNumSeqs()							{	return numSeqs;		}
@@ -56,10 +53,10 @@ 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;
 	int maxRank;
 	int numBins;