*** empty log message ***

[mothur.git] / validcalculator.h

diff --git a/validcalculator.h b/validcalculator.h
index b23c24f0b287d926d68090c25533007b3a86dca9..6cf37924144906276a9aa39c491ffed301c35510 100644 (file)
--- a/validcalculator.h
+++ b/validcalculator.h
@@ -11,9 +11,7 @@
  */
 using namespace std;
 
-#include <string>
-#include <iostream>
-#include <map>
+#include "mothur.h"
 
 //This class contains a list of all valid calculators in Mothur.  
 //It has a function which will tell you if your calculator is valid for the given parameter.
@@ -33,12 +31,20 @@ class ValidCalculators {
                map<string, string> summary;
                map<string, string> sharedrarefaction;
                map<string, string> sharedsummary;
+               map<string, string> vennsingle;
+               map<string, string> vennshared;
+               map<string, string> treegroup;
+               map<string, string>::iterator it;
+               
                void initialSingle();
                void initialShared();
                void initialRarefaction();
                void initialSharedRarefact();
                void initialSummary();
                void initialSharedSummary();
+               void initialVennSingle();
+               void initialVennShared();
+               void initialTreeGroups();
 };
 
 #endif