pat's differences before v.1.8

[mothur.git] / validparameter.h

diff --git a/validparameter.h b/validparameter.h
index a4dd51675445db321b6babad8a51048a11432114..5007948ae1e556b5f7a2a6fe13eeb030ab899909 100644 (file)
--- a/validparameter.h
+++ b/validparameter.h
@@ -9,11 +9,8 @@
  *  Copyright 2009 Schloss Lab UMASS Amherst. All rights reserved.
  *
  */
-using namespace std;
 
-#include <iostream>
-#include <string>
-#include <map>
+#include "mothur.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.
@@ -25,10 +22,15 @@ class ValidParameters {
        public:
                ValidParameters();
                ~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
+
        private:
-               map<string, string> parameters;
                map<string, string>::iterator it;
+               map<string, vector<string> > parameterRanges;
 
 };