X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=errorchecking.h;h=1b023e079cf8ab15c8539596dc72841be7edf7a3;hb=692e0c1f69a78b568dc85cbdcea9fb6c189e2e6c;hp=58161d46886a6b99b73f853d0a36465a6f4b056e;hpb=d5c8caf2d08b7ac6de30e33b1d19cfd246d08f03;p=mothur.git

diff --git a/errorchecking.h b/errorchecking.h
index 58161d4..1b023e0 100644
--- a/errorchecking.h
+++ b/errorchecking.h
@@ -9,13 +9,12 @@
  *
  */
 
-#include <Carbon/Carbon.h>
 #include <iostream>
 #include <map>
 #include "globaldata.hpp"
 #include "validcommands.h"
 #include "validparameter.h"
-#include "validcalculator.h"
+#include "utilities.hpp"
 
 class ErrorCheck {
 	public:
@@ -27,20 +26,17 @@ class ErrorCheck {
 		GlobalData* globaldata;
 		ValidCommands* validCommand;
 		ValidParameters* validParameter;
-		ValidCalculators* validCalculator;
-		void splitAtDash(string&, vector<string>&);
-		void splitAtDash(string&, set<int>&);
-		void splitAtDash(string&, set<string>&);
 		void validateReadFiles();
 		void validateReadDist();
 		void validateReadPhil();
 		void validateParseFiles();
+		void validateTreeFiles();
 		void clear();
-		string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, cutoff, format; 
-		string precision, method, fileroot, label, line, iters, jumble, freq, single, rarefaction, shared, summary;
+		void refresh();
+		string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, fastafile, treefile, sharedfile, cutoff, format; 
+		string precision, method, fileroot, label, line, iters, jumble, freq, single, rarefaction, shared, summary, randomtree;
 		string commandName, optionText;
 		bool errorFree;
-		vector<string> singleEsimators, sharedEstimators, rareEstimators, summaryEstimators, sharedRareEstimators;
 		
 };
-#endif
\ No newline at end of file
+#endif