changes while testing

[mothur.git] / validcalculator.h

diff --git a/validcalculator.h b/validcalculator.h
index 36a1174b813dc1d9581a927982e0e0182534e2e9..59f6bb3488ddb03acdc9a8682b748e9347f04fb9 100644 (file)
--- a/validcalculator.h
+++ b/validcalculator.h
@@ -1,3 +1,6 @@
+#ifndef VALIDCALCULATOR_H
+#define VALIDCALCULATOR_H
+
 /*
  *  validcalculator.h
  *  Dotur
@@ -6,12 +9,9 @@
  *  Copyright 2009 Schloss Lab UMASS Amherst. All rights reserved.
  *
  */
-using namespace std;
 
-#include <Carbon/Carbon.h>
-#include <string>
-#include <iostream>
-#include <map>
+#include "mothur.h"
+#include "mothurout.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,9 @@ class ValidCalculators {
                ValidCalculators();
                ~ValidCalculators();
                bool isValidCalculator(string, string);
+               void printCalc(string, ostream&);
+               string printCalc(string);
+               void printCitations(vector<string>);
                
        private:
                map<string, string> single;
@@ -31,12 +34,31 @@ 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> matrix;
+               map<string, string> heat;
+               map<string, string> boot;
+               map<string, string> distance;
+               map<string, string>::iterator it;
+               set<string> allCalcs;
+               
                void initialSingle();
                void initialShared();
                void initialRarefaction();
                void initialSharedRarefact();
                void initialSummary();
                void initialSharedSummary();
+               void initialVennSingle();
+               void initialVennShared();
+               void initialTreeGroups();
+               void initialMatrix();
+               void initialBoot();
+               void initialDistance();
+               void initialHeat();
                
-               
+               MothurOut* m;
 };
+
+#endif