changed heatmap and venn command to use vector of sharedrabunds instead of order...

[mothur.git] / venn.h

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