fixed some bugs

[mothur.git] / validcalculator.h

diff --git a/validcalculator.h b/validcalculator.h
index 1c39d49253f6f138cbd27523a2fbb86b675e02a5..ff93c58ccc980684ae52f48b08cac9d380cf7a88 100644 (file)
--- a/validcalculator.h
+++ b/validcalculator.h
@@ -9,7 +9,6 @@
  *  Copyright 2009 Schloss Lab UMASS Amherst. All rights reserved.
  *
  */
-using namespace std;
 
 #include "mothur.h"
 
@@ -23,6 +22,7 @@ class ValidCalculators {
                ValidCalculators();
                ~ValidCalculators();
                bool isValidCalculator(string, string);
+               void printCalc(string, ostream&);
                
        private:
                map<string, string> single;
@@ -33,6 +33,10 @@ class ValidCalculators {
                map<string, string> sharedsummary;
                map<string, string> vennsingle;
                map<string, string> vennshared;
+               map<string, string> treegroup;
+               map<string, string> matrix;
+               map<string, string> boot;
+               map<string, string> distance;
                map<string, string>::iterator it;
                
                void initialSingle();
@@ -43,7 +47,10 @@ class ValidCalculators {
                void initialSharedSummary();
                void initialVennSingle();
                void initialVennShared();
-
+               void initialTreeGroups();
+               void initialMatrix();
+               void initialBoot();
+               void initialDistance();
 };
 
 #endif