X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=validparameter.cpp;h=1c6cd60143c95fff34c531615b108d5d73925be4;hb=09a01fb51eea9e81409d367410c831394193fd86;hp=7072825c69a9186af91f893834f62a0eb18e5acb;hpb=d037597badc8d18e235c59f0c1114180edb7f98f;p=mothur.git

diff --git a/validparameter.cpp b/validparameter.cpp
index 7072825..1c6cd60 100644
--- a/validparameter.cpp
+++ b/validparameter.cpp
@@ -23,7 +23,7 @@ ValidParameters::ValidParameters() {
 		parameters["group"]			= "group"; 
 		parameters["order"]			= "order"; 
 		parameters["fasta"]			= "fasta"; 
-		parameters["treefile"]			= "treefile";
+		parameters["tree"]			= "tree";
 		parameters["fileroot"]			= "fileroot";
 		parameters["cutoff"]			= "cutoff"; 
 		parameters["method"]			= "method";
@@ -42,6 +42,7 @@ ValidParameters::ValidParameters() {
 		parameters["sharedsummary"]		= "sharedsummary";
 		parameters["randomtree"]		= "randomtree";
 		parameters["groups"]			= "groups";
+		parameters["calc"]				= "calc";
 		
 	}
 	catch(exception& e) {
@@ -66,7 +67,12 @@ bool ValidParameters::isValidParameter(string parameter) {
 		if ((parameters.find(parameter)) != (parameters.end())) {
 			return true;
 		}else{
-			cout << parameter << " is not a valid parameter in Mothur." << endl;
+			cout << parameter << " is not a valid parameter in Mothur. Valid parameters are " << endl;
+			for (it = parameters.begin(); it != parameters.end(); it++) {
+				cout << it->first << ", ";
+			}
+			cout << endl;
+
 			return false;
 		}