pat's differences before v.1.8

[mothur.git] / validparameter.h

diff --git a/validparameter.h b/validparameter.h
index 30ba46105cc4fc0585283493878f2bab8931bffd..5007948ae1e556b5f7a2a6fe13eeb030ab899909 100644 (file)
--- a/validparameter.h
+++ b/validparameter.h
@@ -9,7 +9,6 @@
  *  Copyright 2009 Schloss Lab UMASS Amherst. All rights reserved.
  *
  */
-using namespace std;
 
 #include "mothur.h"
 
@@ -23,32 +22,14 @@ class ValidParameters {
        public:
                ValidParameters();
                ~ValidParameters();
-               bool isValidParameter(string);
-               bool isValidParameter(string, string, string);
+               //bool isValidParameter(string, string, string) {return true;}
+               bool isValidParameter(string, vector<string>, string);
                vector <string> addParameters(string[], int);
-               void initCommandParameters();
                void initParameterRanges();
+               string validFile(map<string, string>, string, bool); //container, parameter, isFile
 
        private:
-               map<string, string> readdist;
-               map<string, string> readotu;
-               map<string, string> readtree;
-               map<string, string> cluster;
-               map<string, string> deconvolute;
-               map<string, string> parsimony;
-               map<string, string> collectsingle;
-               map<string, string> collectshared;
-               map<string, string> rarefactsingle;
-               map<string, string> rarefactshared;
-               map<string, string> summarysingle;
-               map<string, string> summaryshared;
-               map<string, string> unifracweighted;
-               map<string, string> unifracunweighted;
-               map<string, string> libshuff;
-               map<string, string> heatmap;
-               
                map<string, string>::iterator it;
-               map<string, vector<string> > commandParameters;
                map<string, vector<string> > parameterRanges;
 
 };