forced rarefaction.single to output ending line for all groups. added subsample...

[mothur.git] / sharedlistvector.h

diff --git a/sharedlistvector.h b/sharedlistvector.h
index 53fe1b1edd280bd6184766cbdf1d67cc2778cf91..56ea802a1b1bca511454f83ddcb9e8f29bd5ed27 100644 (file)
--- a/sharedlistvector.h
+++ b/sharedlistvector.h
@@ -12,7 +12,6 @@
 
 #include "datavector.hpp"
 #include "groupmap.h"
-#include "globaldata.hpp"
 #include "sharedrabundvector.h"
 #include "sharedsabundvector.h"
 
@@ -33,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;         }
@@ -54,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;