fixed bug in venn command which caused error when user used more than one distance...

[mothur.git] / venn.h

diff --git a/venn.h b/venn.h
index fbb6cf183ba7ac1409ad83c4cee42ef3d59e5cb9..748723e85dd068722d09179dab76ee1dd2968390 100644 (file)
--- a/venn.h
+++ b/venn.h
@@ -12,11 +12,13 @@
 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"
+#include "sharedutilities.h"
 
 /***********************************************************************/
 
@@ -26,14 +28,14 @@ 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;
+               SharedUtil* util;
+               SAbundVector* sabund;
                GlobalData* globaldata;
+               Calculator* singleCalc;
                vector<SharedRAbundVector*> lookup;
                string format, groupComb;
                ofstream outsvg;