X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=validparameter.h;h=04d201d2c62152ec9f50cd5fce17d35b30d7b41e;hb=3914b0d6480f67df53b1e838f51c4e6155710434;hp=d3fb2b7071fc79ab875ad3f696a4d8c90cf8fde7;hpb=20a2d0350a737a434c89f303662d64a8eeea7b05;p=mothur.git

diff --git a/validparameter.h b/validparameter.h
index d3fb2b7..04d201d 100644
--- a/validparameter.h
+++ b/validparameter.h
@@ -1,3 +1,6 @@
+#ifndef VALIDPARAMETERS_H
+#define VALIDPARAMETERS_H
+
 /*
  *  validparameter.h
  *  Dotur
@@ -6,12 +9,9 @@
  *  Copyright 2009 Schloss Lab UMASS Amherst. All rights reserved.
  *
  */
-using namespace std;
 
-#include <Carbon/Carbon.h>
-#include <iostream>
-#include <string>
-#include <map>
+#include "mothur.h"
+#include "mothurout.h"
 
 //This class contains a list of all valid parameters in Mothur.  
 //It has a function which will tell you if your parameter is valid.
@@ -22,9 +22,20 @@ class ValidParameters {
 
 	public:
 		ValidParameters();
+		ValidParameters(string);
 		~ValidParameters();
-		bool isValidParameter(string);
+		//bool isValidParameter(string, string, string) {return true;}
+		bool isValidParameter(string, vector<string>, string);
+		vector <string> addParameters(string[], int);
+		void initParameterRanges();
+		string validFile(map<string, string>&, string, bool); //container, parameter, isFile, commandName
+
 	private:
-		map<string, string> parameters;
+		map<string, string>::iterator it;
+		map<string, vector<string> > parameterRanges;
+		MothurOut* m;
+		string commandName;
+
+};
 
-};
\ No newline at end of file
+#endif