fixed parsimony for groups

[mothur.git] / validcalculator.h

diff --git a/validcalculator.h b/validcalculator.h
index 36a1174b813dc1d9581a927982e0e0182534e2e9..1534432799d2dfe8a9ef1e52fefe80d9096488dc 100644 (file)
--- a/validcalculator.h
+++ b/validcalculator.h
@@ -1,3 +1,6 @@
+#ifndef VALIDCALCULATOR_H
+#define VALIDCALCULATOR_H
+
 /*
  *  validcalculator.h
  *  Dotur
@@ -8,10 +11,7 @@
  */
 using namespace std;
 
-#include <Carbon/Carbon.h>
-#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.
@@ -31,12 +31,14 @@ class ValidCalculators {
                map<string, string> summary;
                map<string, string> sharedrarefaction;
                map<string, string> sharedsummary;
+               map<string, string>::iterator it;
+               
                void initialSingle();
                void initialShared();
                void initialRarefaction();
                void initialSharedRarefact();
                void initialSummary();
                void initialSharedSummary();
-               
-               
 };
+
+#endif