X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=datavector.hpp;h=e6c839d4772d0586457a9913df2d9e889db60e00;hb=70491a12902e89b85cfa6b44a7b7fbe066ee2ac1;hp=18ac6958e09b64f209a39ff51098406021f5022b;hpb=d59f91eb1230d2c7867a92cb86138b7003100ab4;p=mothur.git

diff --git a/datavector.hpp b/datavector.hpp
index 18ac695..e6c839d 100644
--- 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,6 +36,8 @@ 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;		}
@@ -43,6 +48,7 @@ public:
 	
 protected:
 	string label;
+	MothurOut* m;
 //	int maxRank;
 //	int numBins;
 //	int numSeqs;