X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=validcalculator.h;h=bf8819f4f317df5337c75975afd2e165ce376bcd;hb=b447f829850ae054e42560c7c3ed71b14f3f40bb;hp=36a1174b813dc1d9581a927982e0e0182534e2e9;hpb=20a2d0350a737a434c89f303662d64a8eeea7b05;p=mothur.git

diff --git a/validcalculator.h b/validcalculator.h
index 36a1174..bf8819f 100644
--- a/validcalculator.h
+++ b/validcalculator.h
@@ -1,3 +1,6 @@
+#ifndef VALIDCALCULATOR_H
+#define VALIDCALCULATOR_H
+
 /*
  *  validcalculator.h
  *  Dotur
@@ -6,12 +9,9 @@
  *  Copyright 2009 Schloss Lab UMASS Amherst. All rights reserved.
  *
  */
-using namespace std;
 
-#include <Carbon/Carbon.h>
-#include <string>
-#include <iostream>
-#include <map>
+#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;
@@ -31,12 +32,30 @@ class ValidCalculators {
 		map<string, string> summary;
 		map<string, string> sharedrarefaction;
 		map<string, string> sharedsummary;
+		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();
 		void initialShared();
 		void initialRarefaction();
 		void initialSharedRarefact();
 		void initialSummary();
 		void initialSharedSummary();
+		void initialVennSingle();
+		void initialVennShared();
+		void initialTreeGroups();
+		void initialMatrix();
+		void initialBoot();
+		void initialDistance();
+		void initialHeat();
 		
-		
+		MothurOut* m;
 };
+
+#endif