modified sequence class to read fasta files with comments. this required modification...

[mothur.git] / validcalculator.h

diff --git a/validcalculator.h b/validcalculator.h
index b23c24f0b287d926d68090c25533007b3a86dca9..320f9822662f842faecec103ef29ba75495e77af 100644 (file)
--- a/validcalculator.h
+++ b/validcalculator.h
@@ -9,11 +9,8 @@
  *  Copyright 2009 Schloss Lab UMASS Amherst. All rights reserved.
  *
  */
-using namespace std;
 
-#include <string>
-#include <iostream>
-#include <map>
+#include "mothur.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.
@@ -25,6 +22,7 @@ class ValidCalculators {
                ValidCalculators();
                ~ValidCalculators();
                bool isValidCalculator(string, string);
+               void printCalc(string, ostream&);
                
        private:
                map<string, string> single;
@@ -33,12 +31,28 @@ 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();
 };
 
 #endif