X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=venn.h;h=d3a3f05b841e768554746b14fa087d0baef28bfe;hb=aba5f8811829037b0a3004ef33f0ad4ed5e5fcf8;hp=748723e85dd068722d09179dab76ee1dd2968390;hpb=2c5f6dfaab750da109bb7bc7e51b005d135c2d77;p=mothur.git

diff --git a/venn.h b/venn.h
index 748723e..d3a3f05 100644
--- a/venn.h
+++ b/venn.h
@@ -9,39 +9,31 @@
  *
  */
 
-using namespace std;
-
-#include "ordervector.hpp"
 #include "sabundvector.hpp"
 #include "sharedrabundvector.h"
-#include "sharedordervector.h"
 #include "datavector.hpp"
 #include "globaldata.hpp"
 #include "calculator.h"
-#include "sharedutilities.h"
+
 
 /***********************************************************************/
 
 class Venn {
-	
-	public:
-		Venn();
-		~Venn(){};
-	
-		void getPic(OrderVector*, vector<Calculator*>);
-		void getPic(SharedOrderVector*, vector<Calculator*>);
-
-	private:
-		SharedUtil* util;
-		SAbundVector* sabund;
-		GlobalData* globaldata;
-		Calculator* singleCalc;
-		vector<SharedRAbundVector*> lookup;
-		string format, groupComb;
-		ofstream outsvg;
-
-			
+public:
+	Venn(string);
+	~Venn(){};
+
+	vector<string> getPic(SAbundVector*, vector<Calculator*>);
+	vector<string> getPic(vector<SharedRAbundVector*>, vector<Calculator*>);
+
+private:
+	GlobalData* globaldata;
+	Calculator* singleCalc;
+	string groupComb, outputDir;
+	ofstream outsvg;
+	MothurOut* m;
 };
+
 /***********************************************************************/
 
 #endif