X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sharedlistvector.h;h=0586dfff3ce56dbaae588639f14331c312b3fb84;hb=b20d7d9b1b0eeeaedb78d8fdf26833fd212d2e81;hp=f62248db77da9895e25fcb57f687fcf24922b47d;hpb=58cf1d08fee8c64334979075fa57bcafb035a2ed;p=mothur.git diff --git a/sharedlistvector.h b/sharedlistvector.h index f62248d..0586dff 100644 --- a/sharedlistvector.h +++ b/sharedlistvector.h @@ -15,8 +15,6 @@ #include "globaldata.hpp" #include "sharedrabundvector.h" #include "sharedsabundvector.h" -#include -#include /* 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 +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){globaldata = GlobalData::getInstance(); groupmap = NULL; }; + ~SharedListVector(){ if (groupmap != NULL) { delete groupmap; } }; int getNumBins() { return numBins; } int getNumSeqs() { return numSeqs; } @@ -56,6 +54,7 @@ public: SharedOrderVector* getSharedOrderVector(); SharedRAbundVector getSharedRAbundVector(string); //get sharedrabundvector for a certain group SharedSAbundVector getSharedSAbundVector(string); //get sharedsabundvector for a certain group + vector getSharedRAbundVector(); //returns sharedRabundVectors for all the users groups private: vector data; //data[i] is a list of names of sequences in the ith OTU.