more calculator edits and added coverage and whittaker

[mothur.git] / venn.h

diff --git a/venn.h b/venn.h
index ae73dc235bdb266d1d833131012bc293bbe795f5..35c1d1cbbe6d71663fa345bc97856c6194a6fda5 100644 (file)
--- a/venn.h
+++ b/venn.h
@@ -11,14 +11,12 @@
 
 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"
+
 
 /***********************************************************************/
 
@@ -28,14 +26,12 @@ class Venn {
                Venn();
                ~Venn(){};
        
-               void getPic(OrderVector*, vector<Calculator*>);
-               void getPic(SharedOrderVector*, vector<Calculator*>);
+               void getPic(SAbundVector*, vector<Calculator*>);
+               void getPic(vector<SharedRAbundVector*>, vector<Calculator*>);
 
        private:
-               SharedUtil* util;
-               SAbundVector* sabund;
                GlobalData* globaldata;
-               vector<SharedRAbundVector*> lookup;
+               Calculator* singleCalc;
                string format, groupComb;
                ofstream outsvg;