pat's edits of screen.seqs and summary.seqs

[mothur.git] / validparameter.cpp

diff --git a/validparameter.cpp b/validparameter.cpp
index 5e93a5c10dab67d52494b36675f38a71f63b29ae..cd3b05474e18fe4eb49c3173408f5b9f0b2daba7 100644 (file)
--- a/validparameter.cpp
+++ b/validparameter.cpp
@@ -239,6 +239,12 @@ void ValidParameters::initCommandParameters() {
 
                string getlineArray[] =  {};
                commandParameters["get.line"] = addParameters(getlineArray, sizeof(getlineArray)/sizeof(string));
+               
+               string getsabundArray[] =  {"line", "label"};
+               commandParameters["get.sabund"] = addParameters(getsabundArray, sizeof(getsabundArray)/sizeof(string));
+               
+               string getrabundArray[] =  {"line", "label"};
+               commandParameters["get.rabund"] = addParameters(getrabundArray, sizeof(getrabundArray)/sizeof(string));
 
                string rarefactionsingleArray[] =  {"iters","freq","line","label","calc","abund"};
                commandParameters["rarefaction.single"] = addParameters(rarefactionsingleArray, sizeof(rarefactionsingleArray)/sizeof(string));
@@ -267,22 +273,28 @@ void ValidParameters::initCommandParameters() {
                string heatmapArray[] =  {"groups","line","label","sorted","scale"};
                commandParameters["heatmap"] = addParameters(heatmapArray, sizeof(heatmapArray)/sizeof(string));
                
-               string filterseqsArray[] =  {"fasta","phylip","clustal","nexus", "trump", "soft", "filter"};
+               string filterseqsArray[] =  {"fasta","phylip","clustal","nexus", "trump", "soft", "hard", "vertical"};
                commandParameters["filter.seqs"] = addParameters(filterseqsArray, sizeof(filterseqsArray)/sizeof(string));
 
+               string summaryseqsArray[] =  {"fasta","phylip","clustal","nexus"};
+               commandParameters["summary.seqs"] = addParameters(summaryseqsArray, sizeof(summaryseqsArray)/sizeof(string));
+
+               string screenseqsArray[] =  {"fasta", "start", "end", "maxambig", "maxhomop", "minlength", "maxlength", "name", "group"};
+               commandParameters["screen.seqs"] = addParameters(screenseqsArray, sizeof(screenseqsArray)/sizeof(string));
+
                string vennArray[] =  {"groups","line","label","calc"};
                commandParameters["venn"] = addParameters(vennArray, sizeof(vennArray)/sizeof(string));
                
-               string binseqsArray[] =  {"fasta","line","label","name"};
+               string binseqsArray[] =  {"fasta","line","label","name", "group"};
                commandParameters["bin.seqs"] = addParameters(binseqsArray, sizeof(binseqsArray)/sizeof(string));
                
-               string getrepseqsArray[] =  {"fasta","line","label","name", "group"};
-               commandParameters["get.repseqs"] = addParameters(getrepseqsArray, sizeof(getrepseqsArray)/sizeof(string));
+               string distsharedArray[] =  {"line","label","calc","groups"};
+               commandParameters["dist.shared"] = addParameters(distsharedArray, sizeof(distsharedArray)/sizeof(string));
                
-               string getOTURepArray[] =  {"fasta","list","line","label","name"};
+               string getOTURepArray[] =  {"fasta","list","line","label","name", "group"};
                commandParameters["get.oturep"] = addParameters(getOTURepArray, sizeof(getOTURepArray)/sizeof(string));
                
-               string treeGroupsArray[] =  {"line","label","calc","groups"};
+               string treeGroupsArray[] =  {"line","label","calc","groups", "phylip", "column", "name"};
                commandParameters["tree.shared"] = addParameters(treeGroupsArray, sizeof(treeGroupsArray)/sizeof(string));
                
                string bootstrapArray[] =  {"line","label","calc","groups","iters"};
@@ -291,10 +303,10 @@ void ValidParameters::initCommandParameters() {
                string concensusArray[] =  {};
                commandParameters["concensus"] = addParameters(concensusArray, sizeof(concensusArray)/sizeof(string));
                
-               string distanceArray[] =  {"fasta","phylip","clustal","nexus", "calc", "ends", "cutoff", "processors"};
+               string distanceArray[] =  {"fasta","phylip","clustal","nexus", "calc", "countends", "cutoff", "processors"};
                commandParameters["dist.seqs"] = addParameters(distanceArray, sizeof(distanceArray)/sizeof(string));
                
-               string AlignArray[] =  {"fasta","phylip","clustal","nexus", "template", "search", "ksize", "align", "match", "mismatch", "gapopen", "gapextend"};
+               string AlignArray[] =  {"fasta", "candidate", "search", "ksize", "align", "match", "mismatch", "gapopen", "gapextend"};
                commandParameters["align.seqs"] = addParameters(AlignArray, sizeof(AlignArray)/sizeof(string));
                
                string quitArray[] = {};