fixes while testing 1.33.0

[mothur.git] / sharedlistvector.h

diff --git a/sharedlistvector.h b/sharedlistvector.h
index 56ea802a1b1bca511454f83ddcb9e8f29bd5ed27..13fed9791fb347806f33723893aacd15eb535690 100644 (file)
--- a/sharedlistvector.h
+++ b/sharedlistvector.h
@@ -12,6 +12,7 @@
 
 #include "datavector.hpp"
 #include "groupmap.h"
+#include "counttable.h"
 #include "sharedrabundvector.h"
 #include "sharedsabundvector.h"
 
@@ -32,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){ groupmap = NULL; };
-       ~SharedListVector(){ if (groupmap != NULL) { delete groupmap; } };
+       SharedListVector(const SharedListVector& lv) : DataVector(lv.label), data(lv.data), maxRank(lv.maxRank), numBins(lv.numBins), numSeqs(lv.numSeqs), binLabels(lv.binLabels) { groupmap = NULL; countTable = NULL; };
+       ~SharedListVector(){ if (groupmap != NULL) { delete groupmap; } if (countTable != NULL) { delete countTable; } };
        
        int getNumBins()                                                        {       return numBins;         }
        int getNumSeqs()                                                        {       return numSeqs;         }
@@ -41,6 +42,8 @@ public:
 
        void set(int, string);  
        string get(int);
+    vector<string> getLabels();
+    void setLabels(vector<string>);
        void push_back(string);
        void resize(int);
        void clear();
@@ -58,9 +61,11 @@ public:
 private:
        vector<string> data;  //data[i] is a list of names of sequences in the ith OTU.
        GroupMap* groupmap;
+    CountTable* countTable;
        int maxRank;
        int numBins;
        int numSeqs;
+    vector<string> binLabels;
 
 };