fixes while testing 1.33.0

[mothur.git] / listvector.hpp

diff --git a/listvector.hpp b/listvector.hpp
index f4eaca031c8daefa875788bc03f2288973deedf0..b2bc511cfd258da992f9f1b8a44971f4dd29e3e2 100644 (file)
--- a/listvector.hpp
+++ b/listvector.hpp
@@ -2,10 +2,9 @@
 #define LIST_H
 
 #include "datavector.hpp"
-#include <iostream>
-#include <map>
 
-/* This class is a child to datavector.  It represents OTU information at a certain distance. 
+/*     DataStructure for a list file.
+       This class is a child to datavector.  It represents OTU information at a certain distance. 
        A list vector can be converted into and ordervector, rabundvector or sabundvector.
        Each member of the internal container "data" represents an individual OTU.
        So data[0] = "a,b,c,d,e,f".
@@ -21,7 +20,7 @@ public:
        ListVector(int);
 //     ListVector(const ListVector&);
        ListVector(string, vector<string>);
-       ListVector(const ListVector& lv) : DataVector(lv.label), data(lv.data), maxRank(lv.maxRank), numBins(lv.numBins), numSeqs(lv.numSeqs){};
+       ListVector(const ListVector& lv) : DataVector(lv.label), data(lv.data), maxRank(lv.maxRank), numBins(lv.numBins), numSeqs(lv.numSeqs), binLabels(lv.binLabels) {};
        ListVector(ifstream&);
        ~ListVector(){};
        
@@ -31,11 +30,14 @@ public:
 
        void set(int, string);  
        string get(int);
+    vector<string> getLabels();
+    void setLabels(vector<string>);
        void push_back(string);
        void resize(int);
        void clear();
        int size();
        void print(ostream&);
+    void printHeaders(ostream&);
        
        RAbundVector getRAbundVector();
        SAbundVector getSAbundVector();
@@ -46,6 +48,7 @@ private:
        int maxRank;
        int numBins;
        int numSeqs;
+    vector<string> binLabels;
 
 };