sffinfo bug with flow grams right index when clipQualRight=0

[mothur.git] / sharedlistvector.h

diff --git a/sharedlistvector.h b/sharedlistvector.h
index f62248db77da9895e25fcb57f687fcf24922b47d..81779257346d4b25dbecf092a6c730162d7d4991 100644 (file)
--- a/sharedlistvector.h
+++ b/sharedlistvector.h
@@ -12,11 +12,9 @@
 
 #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 
@@ -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){ groupmap = NULL; countTable = NULL; };
+       ~SharedListVector(){ if (groupmap != NULL) { delete groupmap; } if (countTable != NULL) { delete countTable; } };
        
        int getNumBins()                                                        {       return numBins;         }
        int getNumSeqs()                                                        {       return numSeqs;         }
@@ -56,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;