X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=validcalculator.h;h=bf8819f4f317df5337c75975afd2e165ce376bcd;hb=03acfa01ede71b107817966fcf27cd728038b3c9;hp=6cf37924144906276a9aa39c491ffed301c35510;hpb=c5c7502f435e1413c19e373dab1dfebcaa67588d;p=mothur.git

diff --git a/validcalculator.h b/validcalculator.h
index 6cf3792..bf8819f 100644
--- 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.
@@ -23,6 +23,7 @@ class ValidCalculators {
 		ValidCalculators();
 		~ValidCalculators();
 		bool isValidCalculator(string, string);
+		void printCalc(string, ostream&);
 		
 	private:
 		map<string, string> single;
@@ -34,6 +35,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();
@@ -45,6 +50,12 @@ class ValidCalculators {
 		void initialVennSingle();
 		void initialVennShared();
 		void initialTreeGroups();
+		void initialMatrix();
+		void initialBoot();
+		void initialDistance();
+		void initialHeat();
+		
+		MothurOut* m;
 };
 
 #endif