mods for 1.16

diff --git a/corraxescommand.cpp b/corraxescommand.cpp
index 0d421b5aba7d6be8e8f9bf13ae00d39eecbac926..8ebd22c50144bf60ee5c7ff0a6f608745707a045 100644 (file)
--- a/corraxescommand.cpp
+++ b/corraxescommand.cpp
@@ -190,7 +190,7 @@ CorrAxesCommand::CorrAxesCommand(string option)  {
 
 void CorrAxesCommand::help(){
        try {
-               m->mothurOut("The corr.axes command reads a shared or relabund file as well as a pcoa file and calculates the correlation coefficient.\n");
+               m->mothurOut("The corr.axes command reads a shared, relabund or metadata file as well as an axes file and calculates the correlation coefficient.\n");
                m->mothurOut("The corr.axes command parameters are shared, relabund, axes, metadata, groups, method, numaxes and label.  The shared, relabund or metadata and axes parameters are required.  If shared is given the relative abundance is calculated.\n");
                m->mothurOut("The groups parameter allows you to specify which of the groups you would like included. The group names are separated by dashes.\n");
                m->mothurOut("The label parameter allows you to select what distance level you would like used, if none is given the first distance is used.\n");

diff --git a/pcacommand.cpp b/pcacommand.cpp
index 89e1cb71f282aa2f2606b84ae3aba03da5c74f6b..4ca977876e8fe9bf250338c799f3cd69d2a29062 100644 (file)
--- a/pcacommand.cpp
+++ b/pcacommand.cpp
@@ -111,7 +111,7 @@ PCACommand::PCACommand(string option)  {
                        metric = m->isTrue(temp); 
                        
                        label = validParameter.validFile(parameters, "label", false);                   
-                       if (label == "not found") { label = ""; m->mothurOut("You did not provide a label, I will use the first label in your inputfile."); m->mothurOutEndLine();  }   
+                       if (label == "not found") { label = ""; labels = globaldata->labels; if(labels.size() == 0) {  m->mothurOut("You did not provide a label, I will use the first label in your inputfile."); m->mothurOutEndLine(); } }
                        else { m->splitAtDash(label, labels); }
                        
                        groups = validParameter.validFile(parameters, "groups", false);                 
@@ -130,7 +130,7 @@ PCACommand::PCACommand(string option)  {
 //**********************************************************************************************************************
 void PCACommand::help(){
        try {
-               m->mothurOut("The pca command can only be run after a successful read.otu command."); m->mothurOutEndLine();
+               m->mothurOut("The pca command can only be run after a successful read.otu command of a shared or relabund file."); m->mothurOutEndLine();
                m->mothurOut("The pca command parameters are label, groups and metric. No parameters are required."); m->mothurOutEndLine();
                m->mothurOut("The label parameter is used to analyze specific labels in your input. Default is the first label in your shared or relabund file. Multpile labels may be separated by dashes.\n");
                m->mothurOut("The groups parameter allows you to specify which groups you would like analyzed. Groupnames are separated by dashes.\n");

diff --git a/trimseqscommand.cpp b/trimseqscommand.cpp
index 2dc07794be5abb2f239e4b228c3aacbf51c51b6e..2a43e354d7c3aec784e68fffbb7cd12c480a39c0 100644 (file)
--- a/trimseqscommand.cpp
+++ b/trimseqscommand.cpp
@@ -267,24 +267,31 @@ TrimSeqsCommand::TrimSeqsCommand(string option)  {
 
 void TrimSeqsCommand::help(){
        try {
-               m->mothurOut("The trim.seqs command reads a fastaFile and creates .....\n");
-               m->mothurOut("The trim.seqs command parameters are fasta, flip, oligos, group, maxambig, maxhomop, minlength, maxlength, qfile, qthreshold, qaverage, diffs, qtrim and allfiles.\n");
+               m->mothurOut("The trim.seqs command reads a fastaFile and creates 2 new fasta files, .trim.fasta and scrap.fasta, as well as group files if you provide and oligos file.\n");
+               m->mothurOut("The .trim.fasta contains sequences that meet your requirements, and the .scrap.fasta contains those which don't.\n");
+               m->mothurOut("The trim.seqs command parameters are fasta, flip, oligos, group, maxambig, maxhomop, minlength, maxlength, qfile, qthreshold, qaverage, diffs, qtrim, keepfirst, removelast and allfiles.\n");
                m->mothurOut("The fasta parameter is required.\n");
                m->mothurOut("The group parameter allows you to enter a group file for your fasta file.\n");
                m->mothurOut("The flip parameter will output the reverse compliment of your trimmed sequence. The default is false.\n");
-               m->mothurOut("The oligos parameter .... The default is "".\n");
-               m->mothurOut("The maxambig parameter .... The default is -1.\n");
-               m->mothurOut("The maxhomop parameter .... The default is 0.\n");
-               m->mothurOut("The minlength parameter .... The default is 0.\n");
-               m->mothurOut("The maxlength parameter .... The default is 0.\n");
+               m->mothurOut("The oligos parameter allows you to provide an oligos file.\n");
+               m->mothurOut("The maxambig parameter allows you to set the maximum number of ambigious bases allowed. The default is -1.\n");
+               m->mothurOut("The maxhomop parameter allows you to set a maximum homopolymer length. \n");
+               m->mothurOut("The minlength parameter allows you to set and minimum sequence length. \n");
+               m->mothurOut("The maxlength parameter allows you to set and maximum sequence length. \n");
                m->mothurOut("The tdiffs parameter is used to specify the total number of differences allowed in the sequence. The default is pdiffs + bdiffs.\n");
                m->mothurOut("The bdiffs parameter is used to specify the number of differences allowed in the barcode. The default is 0.\n");
                m->mothurOut("The pdiffs parameter is used to specify the number of differences allowed in the primer. The default is 0.\n");
-               m->mothurOut("The qfile parameter .....\n");
-               m->mothurOut("The qthreshold parameter .... The default is 0.\n");
-               m->mothurOut("The qaverage parameter .... The default is 0.\n");
-               m->mothurOut("The allfiles parameter .... The default is F.\n");
-               m->mothurOut("The qtrim parameter .... The default is F.\n");
+               m->mothurOut("The qfile parameter allows you to provide a quality file.\n");
+               m->mothurOut("The qthreshold parameter allows you to set a minimum quality score allowed. \n");
+               m->mothurOut("The qaverage parameter allows you to set a minimum average quality score allowed. \n");
+               m->mothurOut("The qwindowsize parameter allows you to set a number of bases in a window. Default=50.\n");
+               m->mothurOut("The qwindowaverage parameter allows you to set a minimum average quality score allowed over a window. \n");
+               m->mothurOut("The rollaverage parameter allows you to set a minimum rolling average quality score allowed over a window. \n");
+               m->mothurOut("The qstepsize parameter allows you to set a number of bases to move the window over. Default=1.\n");
+               m->mothurOut("The allfiles parameter will create separate group and fasta file for each grouping. The default is F.\n");
+               m->mothurOut("The qtrim parameter will trim sequence from the point that they fall below the qthreshold and put it in the .trim file if set to true. The default is F.\n");
+               m->mothurOut("The keepfirst parameter trims the sequence to the first keepfirst number of bases after the barcode or primers are removed, before the sequence is checked to see if it meets the other requirements. \n");
+               m->mothurOut("The removelast removes the last removelast number of bases after the barcode or primers are removed, before the sequence is checked to see if it meets the other requirements.\n");
                m->mothurOut("The trim.seqs command should be in the following format: \n");
                m->mothurOut("trim.seqs(fasta=yourFastaFile, flip=yourFlip, oligos=yourOligos, maxambig=yourMaxambig,  \n");
                m->mothurOut("maxhomop=yourMaxhomop, minlength=youMinlength, maxlength=yourMaxlength)  \n");