X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=validparameter.h;h=04d201d2c62152ec9f50cd5fce17d35b30d7b41e;hp=61b1c5b2d90ee0e805bc205c5fe8b19b5a4a5c97;hb=b206f634aae1b4ce13978d203247fb64757d5482;hpb=eb1c88346fb246e95a6b38935b103f95e38b82ca

diff --git a/validparameter.h b/validparameter.h
index 61b1c5b..04d201d 100644
--- a/validparameter.h
+++ b/validparameter.h
@@ -9,10 +9,9 @@
  *  Copyright 2009 Schloss Lab UMASS Amherst. All rights reserved.
  *
  */
-using namespace std;
 
 #include "mothur.h"
-#include "utilities.hpp"
+#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.
@@ -23,34 +22,19 @@ class ValidParameters {
 
 	public:
 		ValidParameters();
+		ValidParameters(string);
 		~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, commandName
 
 	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;
+		MothurOut* m;
+		string commandName;
 
 };