fixed bug in read.tree

[mothur.git] / validparameter.cpp

diff --git a/validparameter.cpp b/validparameter.cpp
index 7072825c69a9186af91f893834f62a0eb18e5acb..a82962f1e0096e406e7cc21d03dba08a3039ea3a 100644 (file)
--- 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";
@@ -40,8 +40,9 @@ ValidParameters::ValidParameters() {
                parameters["shared"]                    = "shared"; 
                parameters["summary"]                   = "summary"; 
                parameters["sharedsummary"]             = "sharedsummary";
-               parameters["randomtree"]                = "randomtree";
+               parameters["random"]                    = "random";
                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;
                }