added root parameter to the unifrac commands so you can choose to include the entire...

[mothur.git] / venn.h

diff --git a/venn.h b/venn.h
index fbb6cf183ba7ac1409ad83c4cee42ef3d59e5cb9..33935e6a2c9496fd984b8328cf33326dbeb23fa1 100644 (file)
--- a/venn.h
+++ b/venn.h
@@ -9,37 +9,32 @@
  *
  */
 
-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"
+
 
 /***********************************************************************/
 
 class Venn {
-       
-       public:
-               Venn();
-               ~Venn(){};
-       
-               void getPic(OrderVector*);
-               void getPic(SharedOrderVector*);
-
-       private:
-               void getSharedVectors(SharedOrderVector*);
-               
-               RAbundVector rabund;
-               GlobalData* globaldata;
-               vector<SharedRAbundVector*> lookup;
-               string format, groupComb;
-               ofstream outsvg;
-
-                       
+public:
+       Venn(string, bool);
+       ~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;
+       bool nseqs;
 };
+
 /***********************************************************************/
 
 #endif