X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=errorchecking.h;h=50cc00511a08fa71754d2dbf51fd76406d2925ea;hb=d97b619c4297b1274c754d73a64792ba656b0a79;hp=9387bc5954124d00612b5874bb7f084a90ca329d;hpb=d037597badc8d18e235c59f0c1114180edb7f98f;p=mothur.git

diff --git a/errorchecking.h b/errorchecking.h
index 9387bc5..50cc005 100644
--- a/errorchecking.h
+++ b/errorchecking.h
@@ -9,12 +9,11 @@
  *
  */
 
-#include <iostream>
-#include <map>
+#include "mothur.h"
 #include "globaldata.hpp"
 #include "validcommands.h"
 #include "validparameter.h"
-#include "validcalculator.h"
+#include "utilities.hpp"
 
 class ErrorCheck {
 	public:
@@ -26,22 +25,24 @@ 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();
+	//	bool validCommandParameter(string, string);
+	//	bool validParameterValue(string, string);
 		void validateReadDist();
 		void validateReadPhil();
 		void validateParseFiles();
 		void validateTreeFiles();
 		void clear();
 		void refresh();
-		string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, fastafile, treefile, cutoff, format; 
-		string precision, method, fileroot, label, line, iters, jumble, freq, single, rarefaction, shared, summary, randomtree;
+		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, abund;
 		string commandName, optionText;
 		bool errorFree;
-		vector<string> singleEsimators, sharedEstimators, rareEstimators, summaryEstimators, sharedRareEstimators;
-		
+
+		vector<string> sharedGroups;
+	//	map <string, vector<string> > commandParameters;
+	///	map <string, vector<double> > intParams;
+	//	double piSent;
+
 };
 #endif