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

diff --git a/venn.h b/venn.h
index fbb6cf1..ceb52fd 100644
--- a/venn.h
+++ b/venn.h
@@ -12,11 +12,12 @@
 using namespace std;
 
 #include "ordervector.hpp"
-#include "rabundvector.hpp"
+#include "Sabundvector.hpp"
 #include "sharedrabundvector.h"
 #include "sharedordervector.h"
 #include "datavector.hpp"
 #include "globaldata.hpp"
+#include "calculator.h"
 
 /***********************************************************************/
 
@@ -26,13 +27,13 @@ class Venn {
 		Venn();
 		~Venn(){};
 	
-		void getPic(OrderVector*);
-		void getPic(SharedOrderVector*);
+		void getPic(OrderVector*, vector<Calculator*>);
+		void getPic(SharedOrderVector*, vector<Calculator*>);
 
 	private:
 		void getSharedVectors(SharedOrderVector*);
 		
-		RAbundVector rabund;
+		SAbundVector* sabund;
 		GlobalData* globaldata;
 		vector<SharedRAbundVector*> lookup;
 		string format, groupComb;