This is mothur v 1.2.0 - the April ~24, 2009 release

[mothur.git] / validcalculator.h

diff --git a/validcalculator.h b/validcalculator.h
index 36a1174b813dc1d9581a927982e0e0182534e2e9..9f0d9b47430fbef80d66d5883c8231daded87c7d 100644 (file)
--- a/validcalculator.h
+++ b/validcalculator.h
@@ -1,3 +1,6 @@
+#ifndef VALIDCALCULATOR_H
+#define VALIDCALCULATOR_H
+
 /*
  *  validcalculator.h
  *  Dotur
@@ -8,10 +11,7 @@
  */
 using namespace std;
 
-#include <Carbon/Carbon.h>
-#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.
@@ -23,6 +23,7 @@ class ValidCalculators {
                ValidCalculators();
                ~ValidCalculators();
                bool isValidCalculator(string, string);
+               void printCalc(string, ostream&);
                
        private:
                map<string, string> single;
@@ -31,12 +32,22 @@ 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> boot;
+               map<string, string>::iterator it;
+               
                void initialSingle();
                void initialShared();
                void initialRarefaction();
                void initialSharedRarefact();
                void initialSummary();
                void initialSharedSummary();
-               
-               
+               void initialVennSingle();
+               void initialVennShared();
+               void initialTreeGroups();
+               void initialBoot();
 };
+
+#endif