X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=validcalculator.h;h=bf8819f4f317df5337c75975afd2e165ce376bcd;hb=11c115c802602be50e106aae56969e15d2c49a62;hp=45381b8d2719d2ef80085893c7ced8550259a89b;hpb=3117b1c3109121dff476997d3c5db5b47a77729b;p=mothur.git

diff --git a/validcalculator.h b/validcalculator.h
index 45381b8..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.
@@ -35,6 +35,8 @@ 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;
@@ -48,8 +50,12 @@ class ValidCalculators {
 		void initialVennSingle();
 		void initialVennShared();
 		void initialTreeGroups();
+		void initialMatrix();
 		void initialBoot();
 		void initialDistance();
+		void initialHeat();
+		
+		MothurOut* m;
 };
 
 #endif