X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=venn.h;h=d3a3f05b841e768554746b14fa087d0baef28bfe;hb=dd173a49e37f6bae73a63c32dd7c98d317bb4a79;hp=ceb52fda7a5447f812133aea9c343d7ccf8e71b5;hpb=f20505bcd9f07e0b5f967be0e8d414076d9a5678;p=mothur.git

diff --git a/venn.h b/venn.h
index ceb52fd..d3a3f05 100644
--- a/venn.h
+++ b/venn.h
@@ -9,38 +9,31 @@
  *
  */
 
-using namespace std;
-
-#include "ordervector.hpp"
-#include "Sabundvector.hpp"
+#include "sabundvector.hpp"
 #include "sharedrabundvector.h"
-#include "sharedordervector.h"
 #include "datavector.hpp"
 #include "globaldata.hpp"
 #include "calculator.h"
 
+
 /***********************************************************************/
 
 class Venn {
-	
-	public:
-		Venn();
-		~Venn(){};
-	
-		void getPic(OrderVector*, vector<Calculator*>);
-		void getPic(SharedOrderVector*, vector<Calculator*>);
-
-	private:
-		void getSharedVectors(SharedOrderVector*);
-		
-		SAbundVector* sabund;
-		GlobalData* globaldata;
-		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