X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=datavector.hpp;h=dfcd684eaaec9e725ddf6e860b9d22ec4c4a90c5;hp=b3c7c90d018ee960e02b281b4f72b1e39601d51b;hb=cf9987b67aa49777a4c91c2d21f96e58bf17aa82;hpb=02909d6cae9963ba00dc746969a370fa8ca934fc

diff --git a/datavector.hpp b/datavector.hpp
index b3c7c90..dfcd684 100644
--- a/datavector.hpp
+++ b/datavector.hpp
@@ -3,6 +3,7 @@
 
 
 #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. */
@@ -15,14 +16,17 @@ class SharedListVector;
 class SharedOrderVector;
 class SharedSAbundVector;
 class SharedRAbundVector;
+class SharedRAbundFloatVector;
+class GroupMap;
 
 class DataVector {
 	
 public:
-	DataVector(){};// : 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(){ m = MothurOut::getInstance(); }// : maxRank(0), numBins(0), numSeqs(0){};
+	DataVector(string l) : label(l) { m = MothurOut::getInstance();};
+	DataVector(const DataVector& dv) : label(dv.label){ m = MothurOut::getInstance();};//, maxRank(dv.maxRank), numBins(dv.numBins), numSeqs(dv.numSeqs) {};
+	DataVector(ifstream&) {m = MothurOut::getInstance();}
+	DataVector(ifstream&, GroupMap*){m = MothurOut::getInstance();}
 	virtual ~DataVector(){};
 	
 //	virtual int getNumBins()	{	return numBins;		}
@@ -32,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;		}
@@ -42,6 +48,7 @@ public:
 	
 protected:
 	string label;
+	MothurOut* m;
 //	int maxRank;
 //	int numBins;
 //	int numSeqs;