finished chimera.slayer template=self change

[mothur.git] / validcalculator.h

diff --git a/validcalculator.h b/validcalculator.h
index 9f0d9b47430fbef80d66d5883c8231daded87c7d..6cdd4ae3d9cc48176b1a525723b5b5c1cc78fdd2 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,7 @@ class ValidCalculators {
                ~ValidCalculators();
                bool isValidCalculator(string, string);
                void printCalc(string, ostream&);
+               string printCalc(string);
                
        private:
                map<string, string> single;
@@ -35,7 +36,10 @@ 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;
                
                void initialSingle();
@@ -47,7 +51,12 @@ class ValidCalculators {
                void initialVennSingle();
                void initialVennShared();
                void initialTreeGroups();
+               void initialMatrix();
                void initialBoot();
+               void initialDistance();
+               void initialHeat();
+               
+               MothurOut* m;
 };
 
 #endif