X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=validcalculator.h;h=59f6bb3488ddb03acdc9a8682b748e9347f04fb9;hp=9f0d9b47430fbef80d66d5883c8231daded87c7d;hb=df7e3ff9f68ef157b0328a2d353c3258c5d45d89;hpb=51cf89e90eef8b300c2786eb1560dd89e6e83445

diff --git a/validcalculator.h b/validcalculator.h
index 9f0d9b4..59f6bb3 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.
@@ -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,8 +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();
@@ -47,7 +53,12 @@ class ValidCalculators {
 		void initialVennSingle();
 		void initialVennShared();
 		void initialTreeGroups();
+		void initialMatrix();
 		void initialBoot();
+		void initialDistance();
+		void initialHeat();
+		
+		MothurOut* m;
 };
 
 #endif