X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=datavector.hpp;h=0b09e0dc4c914f7a5d26461c092ab3cb250bc071;hb=f663afa231c9bc1b5e18e0ea3bdd2b2ee784f5b2;hp=4ddb1aa6fb054dfcf7d127a6d4b8dcd7998169d6;hpb=20a2d0350a737a434c89f303662d64a8eeea7b05;p=mothur.git

diff --git a/datavector.hpp b/datavector.hpp
index 4ddb1aa..0b09e0d 100644
--- a/datavector.hpp
+++ b/datavector.hpp
@@ -1,25 +1,30 @@
 #ifndef datavector_h
 #define datavector_h
 
-using namespace std;
 
-#include <iostream>
-#include <string>
-#include <vector>
-#include <map>
+#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. */
+	
 
 class RAbundVector;
 class SAbundVector;
 class OrderVector;
+class SharedListVector;
+class SharedOrderVector;
+class SharedSAbundVector;
+class SharedRAbundVector;
 
 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(){};
+	virtual ~DataVector(){};
 	
 //	virtual int getNumBins()	{	return numBins;		}
 //	virtual int getNumSeqs()	{	return numSeqs;		}
@@ -32,12 +37,13 @@ public:
 	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;