X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=venncommand.h;h=98a59d404099dcb32052e07e93644be9f01e2869;hp=79a22d9bf6127a222382a6878ac026ebf1d5ae2b;hb=1a20e24ee786195ab0e1cccd4f5aede7a88f3f4e;hpb=163b300cfd7d4ca4e70c454be20f07b1d8346650

diff --git a/venncommand.h b/venncommand.h
index 79a22d9..98a59d4 100644
--- a/venncommand.h
+++ b/venncommand.h
@@ -11,40 +11,46 @@
  
 #include "command.hpp"
 #include "inputdata.h"
-#include "readotu.h"
 #include "sharedlistvector.h"
 #include "venn.h"
 #include "validcalculator.h"
 
-
-class GlobalData;
-
-
 class VennCommand : public Command {
 
 public:
 	VennCommand(string);
-	~VennCommand();
-	int execute();
-	void help();
+	VennCommand();
+	~VennCommand() {}
+	
+	vector<string> setParameters();
+	string getCommandName()			{ return "venn";					}
+	string getCommandCategory()		{ return "OTU-Based Approaches";	}
+	
+	string getHelpString();	
+    string getOutputPattern(string);	
+	string getCitation() { return "http://www.mothur.org/wiki/Venn"; }
+	string getDescription()		{ return "generates a Venn diagram from data provided in a shared file"; }
+
+	int execute(); 
+	void help() { m->mothurOut(getHelpString()); }	
 	
 private:
-	GlobalData* globaldata;
-	ReadOTUFile* read;
 	InputData* input;
 	SharedListVector* SharedList;
 	Venn* venn;
 	vector<Calculator*> vennCalculators;	
-	ValidCalculators* validCalculator;
 	vector<SharedRAbundVector*> lookup;
+	set< set<int> > combosOfFour;
 	SAbundVector* sabund;
-	int abund;
+	int abund, fontsize;
 	
-	bool abort, allLines;
-	set<int> lines; //hold lines to be used
+	bool abort, allLines, nseqs, perm, sharedOtus;
 	set<string> labels; //holds labels to be used
-	string format, groups, calc, line, label;
-	vector<string> Estimators, Groups;
+	string format, groups, calc, label, outputDir, sharedfile, listfile, inputfile;
+	vector<string> Estimators, Groups, outputNames;
+	
+	set< set<int> > findCombinations(int);
+	int getCombos(set<int>, set< set<int> >&);
 
 
 };