X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=validparameter.h;h=9aeafa23a6b03f619393cc502e2c1fade566ee2a;hb=cad05a21b084833b07808c1586e755be48fe7e1a;hp=b3d56e5c7eb0a69c0e4e0e4fdc9b3b224a2e225b;hpb=485c02be0cdcd06ce08dd58d551a525b6a1b47c5;p=mothur.git

diff --git a/validparameter.h b/validparameter.h
index b3d56e5..9aeafa2 100644
--- a/validparameter.h
+++ b/validparameter.h
@@ -9,9 +9,9 @@
  *  Copyright 2009 Schloss Lab UMASS Amherst. All rights reserved.
  *
  */
-using namespace std;
 
 #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.
@@ -23,44 +23,16 @@ class ValidParameters {
 	public:
 		ValidParameters();
 		~ValidParameters();
-		bool isValidParameter(string, 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> 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;
-		
-		void initialReaddist();
-		void initialReadotu();
-		void initialReadtree();
-		void initialCluster();
-		void initialDeconvolute();
-		void initialParsimony();
-		void initialCollectsingle();
-		void initialCollectshared();
-		void initialRarefactsingle();
-		void initialRarefactshared();
-		void initialSummarysingle();
-		void initialSummaryshared();
-		void initialUnifracweighted();
-		void initialUnifracunweighted();
-		void initialLibshuff();
-		void initialHeatmap();
+		map<string, vector<string> > parameterRanges;
+		MothurOut* m;
 
 };