sffinfo bug with flow grams right index when clipQualRight=0

[mothur.git] / datavector.hpp

diff --git a/datavector.hpp b/datavector.hpp
index 73058a992a53e3da313cae4ca595c77797058e94..e6c839d4772d0586457a9913df2d9e889db60e00 100644 (file)
--- a/datavector.hpp
+++ b/datavector.hpp
@@ -1,9 +1,9 @@
 #ifndef datavector_h
 #define datavector_h
 
-using namespace std;
 
 #include "mothur.h"
+#include "mothurout.h"
 
 /* This class is parent to listvector, ordervector, rabundvector, sabundvector, sharedordervector, sharedrabundvector, sharedsabundvector. 
        The child classes all contain OTU information in different forms. */
@@ -16,15 +16,18 @@ class SharedListVector;
 class SharedOrderVector;
 class SharedSAbundVector;
 class SharedRAbundVector;
+class SharedRAbundFloatVector;
+class GroupMap;
 
 class DataVector {
        
 public:
-       DataVector(){};// : maxRank(0), numBins(0), numSeqs(0){};
+       DataVector(){ m = MothurOut::getInstance(); }// : maxRank(0), numBins(0), numSeqs(0){};
        DataVector(string l) : label(l) {};
        DataVector(const DataVector& dv) : label(dv.label){};//, maxRank(dv.maxRank), numBins(dv.numBins), numSeqs(dv.numSeqs) {};
        DataVector(ifstream&);
-       ~DataVector(){};
+       DataVector(ifstream&, GroupMap*);
+       virtual ~DataVector(){};
        
 //     virtual int getNumBins()        {       return numBins;         }
 //     virtual int getNumSeqs()        {       return numSeqs;         }
@@ -33,16 +36,19 @@ public:
        virtual void resize(int) = 0;
        virtual int size()      = 0;
        virtual void print(ostream&) = 0;
+       virtual void printHeaders(ostream&) {};
+       virtual void clear() = 0;
        
        void setLabel(string l)         {       label = l;                      }
        string getLabel()                       {       return label;           }
 
-       //virtual RAbundVector getRAbundVector() = 0;
+       virtual RAbundVector getRAbundVector() = 0;
        virtual SAbundVector getSAbundVector() = 0;
        virtual OrderVector getOrderVector(map<string,int>* hold = NULL) = 0;
        
 protected:
        string label;
+       MothurOut* m;
 //     int maxRank;
 //     int numBins;
 //     int numSeqs;