changes while testing

[mothur.git] / validcalculator.h

diff --git a/validcalculator.h b/validcalculator.h
index 45381b8d2719d2ef80085893c7ced8550259a89b..59f6bb3488ddb03acdc9a8682b748e9347f04fb9 100644 (file)
--- a/validcalculator.h
+++ b/validcalculator.h
@@ -9,9 +9,9 @@
  *  Copyright 2009 Schloss Lab UMASS Amherst. All rights reserved.
  *
  */
-using namespace std;
 
 #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.
@@ -24,6 +24,8 @@ class ValidCalculators {
                ~ValidCalculators();
                bool isValidCalculator(string, string);
                void printCalc(string, ostream&);
+               string printCalc(string);
+               void printCitations(vector<string>);
                
        private:
                map<string, string> single;
@@ -35,9 +37,12 @@ class ValidCalculators {
                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();
@@ -48,8 +53,12 @@ class ValidCalculators {
                void initialVennSingle();
                void initialVennShared();
                void initialTreeGroups();
+               void initialMatrix();
                void initialBoot();
                void initialDistance();
+               void initialHeat();
+               
+               MothurOut* m;
 };
 
 #endif