]> git.donarmstrong.com Git - mothur.git/blobdiff - commandfactory.cpp
fixes while testing 1.33.0
[mothur.git] / commandfactory.cpp
index 56cca07fd19266820a29e3f529f784581ae00d80..e8e9c2754677ee639fce944fbc533d3bd9eb98db 100644 (file)
@@ -8,9 +8,6 @@
  */
 
 #include "command.hpp"
-#include "readdistcommand.h"
-#include "readtreecommand.h"
-#include "readotucommand.h"
 #include "clustercommand.h"
 #include "collectcommand.h"
 #include "collectsharedcommand.h"
@@ -36,8 +33,6 @@
 #include "binsequencecommand.h"
 #include "getoturepcommand.h"
 #include "treegroupscommand.h"
-#include "bootstrapsharedcommand.h"
-//#include "consensuscommand.h"
 #include "distancecommand.h"
 #include "aligncommand.h"
 #include "matrixoutputcommand.h"
@@ -48,7 +43,6 @@
 #include "reversecommand.h"
 #include "trimseqscommand.h"
 #include "mergefilecommand.h"
-#include "chimeraseqscommand.h"
 #include "listseqscommand.h"
 #include "getseqscommand.h"
 #include "removeseqscommand.h"
@@ -70,6 +64,7 @@
 #include "chimeraslayercommand.h"
 #include "chimerapintailcommand.h"
 #include "chimerabellerophoncommand.h"
+#include "chimerauchimecommand.h"
 #include "setlogfilecommand.h"
 #include "phylodiversitycommand.h"
 #include "makegroupcommand.h"
 #include "homovacommand.h"
 #include "mantelcommand.h"
 #include "makefastqcommand.h"
+#include "anosimcommand.h"
+#include "getcurrentcommand.h"
+#include "setcurrentcommand.h"
+#include "sharedcommand.h"
+#include "getcommandinfocommand.h"
+#include "deuniquetreecommand.h"
+#include "countseqscommand.h"
+#include "countgroupscommand.h"
+#include "clearmemorycommand.h"
+#include "summarytaxcommand.h"
+#include "chimeraperseuscommand.h"
+#include "shhhseqscommand.h"
+#include "summaryqualcommand.h"
+#include "otuassociationcommand.h"
+#include "sortseqscommand.h"
+#include "classifytreecommand.h"
+#include "cooccurrencecommand.h"
+#include "pcrseqscommand.h"
+#include "createdatabasecommand.h"
+#include "makebiomcommand.h"
+#include "getcoremicrobiomecommand.h"
+#include "listotulabelscommand.h"
+#include "getotulabelscommand.h"
+#include "removeotulabelscommand.h"
+#include "makecontigscommand.h"
+#include "loadlogfilecommand.h"
+#include "sffmultiplecommand.h"
+#include "classifyrfsharedcommand.h"
+#include "filtersharedcommand.h"
+#include "primerdesigncommand.h"
+#include "getdistscommand.h"
+#include "removedistscommand.h"
+#include "mergetaxsummarycommand.h"
+#include "getmetacommunitycommand.h"
+#include "sparcccommand.h"
+#include "makelookupcommand.h"
+#include "renameseqscommand.h"
+#include "makelefsecommand.h"
+#include "lefsecommand.h"
+#include "kruskalwalliscommand.h"
+#include "sracommand.h"
+#include "mergesfffilecommand.h"
 
 /*******************************************************/
 
@@ -145,9 +182,7 @@ CommandFactory::CommandFactory(){
        append = false;
        
        //initialize list of valid commands
-       commands["read.dist"]                   = "read.dist"; 
-       commands["read.otu"]                    = "read.otu";
-       commands["read.tree"]                   = "read.tree"; 
+       commands["make.shared"]                 = "make.shared"; 
        commands["bin.seqs"]                    = "bin.seqs"; 
        commands["get.oturep"]                  = "get.oturep";
        commands["cluster"]                             = "cluster"; 
@@ -171,15 +206,13 @@ CommandFactory::CommandFactory(){
        commands["get.label"]           = "get.label";
        commands["get.sabund"]          = "get.sabund";
        commands["get.rabund"]          = "get.rabund";
-       commands["bootstrap.shared"]    = "bootstrap.shared";
-       //commands["consensus"]                 = "consensus";
        commands["help"]                                = "help";
        commands["reverse.seqs"]                = "reverse.seqs";
        commands["trim.seqs"]                   = "trim.seqs";
        commands["trim.flows"]                  = "trim.flows";
        commands["list.seqs"]                   = "list.seqs";
        commands["get.seqs"]                    = "get.seqs";
-       commands["remove.seqs"]                 = "get.seqs";
+       commands["remove.seqs"]                 = "remove.seqs";
        commands["system"]                              = "system";
        commands["align.check"]                 = "align.check";
        commands["get.sharedseqs"]              = "get.sharedseqs";
@@ -190,7 +223,7 @@ CommandFactory::CommandFactory(){
        commands["pre.cluster"]                 = "pre.cluster";
        commands["pcoa"]                                = "pcoa";
        commands["otu.hierarchy"]               = "otu.hierarchy";
-       commands["set.dir"]                             = "set.dir";
+       commands["set.dir"]                             = "MPIEnabled";
        commands["merge.files"]                 = "merge.files";
        commands["parse.list"]                  = "parse.list";
        commands["set.logfile"]                 = "set.logfile";
@@ -227,27 +260,70 @@ CommandFactory::CommandFactory(){
        commands["amova"]                               = "amova";
        commands["homova"]                              = "homova";
        commands["mantel"]                              = "mantel";
+       commands["anosim"]                              = "anosim";
        commands["make.fastq"]                  = "make.fastq";
        commands["merge.groups"]                = "merge.groups";
+       commands["get.current"]                 = "MPIEnabled";
+       commands["set.current"]                 = "MPIEnabled";
+       commands["get.commandinfo"]             = "get.commandinfo";
+       commands["deunique.tree"]               = "deunique.tree";
+       commands["count.seqs"]                  = "count.seqs";
+       commands["count.groups"]                = "count.groups";
+       commands["clear.memory"]                = "clear.memory";
        commands["pairwise.seqs"]               = "MPIEnabled";
        commands["pipeline.pds"]                = "MPIEnabled";
        commands["classify.seqs"]               = "MPIEnabled"; 
        commands["dist.seqs"]                   = "MPIEnabled";
        commands["filter.seqs"]                 = "MPIEnabled";
        commands["align.seqs"]                  = "MPIEnabled";
-       commands["chimera.seqs"]                = "chimera.seqs";
        commands["chimera.ccode"]               = "MPIEnabled";
        commands["chimera.check"]               = "MPIEnabled";
        commands["chimera.slayer"]              = "MPIEnabled";
+       commands["chimera.uchime"]              = "chimera.uchime";
+       commands["chimera.perseus"]             = "chimera.perseus";
        commands["chimera.pintail"]             = "MPIEnabled";
        commands["chimera.bellerophon"] = "MPIEnabled";
        commands["screen.seqs"]                 = "MPIEnabled";
        commands["summary.seqs"]                = "MPIEnabled";
        commands["cluster.split"]               = "MPIEnabled";
-       commands["shhh.seqs"]                   = "MPIEnabled";
+       commands["shhh.flows"]                  = "MPIEnabled";
        commands["sens.spec"]                   = "sens.spec";
        commands["seq.error"]                   = "seq.error";
+       commands["summary.tax"]                 = "summary.tax";
+       commands["summary.qual"]                = "summary.qual";
+       commands["shhh.seqs"]                   = "shhh.seqs";
+       commands["otu.association"]             = "otu.association";
+    commands["sort.seqs"]           = "sort.seqs";
+    commands["classify.tree"]       = "classify.tree";
+    commands["cooccurrence"]        = "cooccurrence";
+    commands["pcr.seqs"]            = "pcr.seqs";
+    commands["create.database"]     = "create.database";
+    commands["make.biom"]           = "make.biom";
+    commands["get.coremicrobiome"]  = "get.coremicrobiome";
+    commands["list.otulabels"]      = "list.otulabels";
+    commands["get.otulabels"]       = "get.otulabels";
+    commands["remove.otulabels"]    = "remove.otulabels";
+    commands["make.contigs"]        = "make.contigs";
+    commands["load.logfile"]        = "load.logfile";
+    commands["make.table"]          = "make.table";
+    commands["sff.multiple"]        = "sff.multiple";
        commands["quit"]                                = "MPIEnabled"; 
+    commands["classify.rf"]         = "classify.rf"; 
+    commands["filter.shared"]          = "filter.shared"; 
+    commands["primer.design"]          = "primer.design";
+    commands["get.dists"]           = "get.dists";
+    commands["remove.dists"]        = "remove.dists";
+    commands["merge.taxsummary"]    = "merge.taxsummary";
+    commands["get.communitytype"]   = "get.communitytype";
+    commands["sparcc"]              = "sparcc";
+    commands["make.lookup"]         = "make.lookup";
+    commands["rename.seqs"]         = "rename.seqs";
+    commands["make.lefse"]          = "make.lefse";
+    commands["lefse"]               = "lefse";
+    commands["kruskal.wallis"]      = "kruskal.wallis";
+    commands["sra"]                 = "sra";
+    commands["merge.sfffiles"]      = "merge.sfffiles";
+    
 
 }
 /***********************************************************/
@@ -270,15 +346,60 @@ CommandFactory::~CommandFactory(){
        delete shellcommand;
        delete pipecommand;
 }
+/***********************************************************/
 
+/***********************************************************/
+int CommandFactory::checkForRedirects(string optionString) {
+    try {
+        
+        int pos = optionString.find("outputdir");
+        if (pos != string::npos) { //user has set outputdir in command option string
+            string outputOption = "";
+            bool foundEquals = false;
+            for(int i=pos;i<optionString.length();i++){
+                if(optionString[i] == ',')       { break;               }              
+                else if(optionString[i] == '=')  { foundEquals = true; }
+                if (foundEquals)       {   outputOption += optionString[i]; }
+            }
+            if(m->dirCheck(outputOption)){ 
+                setOutputDirectory(outputOption); 
+                m->mothurOut("Setting output directory to: " + outputOption); m->mothurOutEndLine();
+            }
+        }
+        
+        pos = optionString.find("inputdir");
+        if (pos != string::npos) { //user has set inputdir in command option string
+            string intputOption = "";
+            bool foundEquals = false;
+            for(int i=pos;i<optionString.length();i++){
+                if(optionString[i] == ',')       { break;               }              
+                else if(optionString[i] == '=')  { foundEquals = true; }
+                if (foundEquals)       {   intputOption += optionString[i]; }
+            }
+            if(m->dirCheck(intputOption)){ 
+                setInputDirectory(intputOption); 
+                m->mothurOut("Setting input directory to: " + intputOption); m->mothurOutEndLine();
+            }
+        }
+        
+        return 0;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "CommandFactory", "getCommand");
+               exit(1);
+       }
+}
 /***********************************************************/
 
 /***********************************************************/
 //This function calls the appropriate command fucntions based on user input.
 Command* CommandFactory::getCommand(string commandName, string optionString){
        try {
+        
                delete command;   //delete the old command
-               
+        
+        checkForRedirects(optionString);
+                       
                //user has opted to redirect output from dir where input files are located to some other place
                if (outputDir != "") { 
                        if (optionString != "") { optionString += ", outputdir=" + outputDir; }
@@ -291,10 +412,7 @@ Command* CommandFactory::getCommand(string commandName, string optionString){
                        else { optionString += "inputdir=" + inputDir; }
                }
                
-               if(commandName == "read.dist")                                  {       command = new ReadDistCommand(optionString);                            }
-               else if(commandName == "read.otu")                              {       command = new ReadOtuCommand(optionString);                                     }
-               else if(commandName == "read.tree")                             {       command = new ReadTreeCommand(optionString);                            }
-               else if(commandName == "cluster")                               {       command = new ClusterCommand(optionString);                                     }
+               if(commandName == "cluster")                    {       command = new ClusterCommand(optionString);                                     }
                else if(commandName == "unique.seqs")                   {       command = new DeconvoluteCommand(optionString);                         }
                else if(commandName == "parsimony")                             {       command = new ParsimonyCommand(optionString);                           }
                else if(commandName == "help")                                  {       command = new HelpCommand(optionString);                                        }
@@ -320,8 +438,6 @@ Command* CommandFactory::getCommand(string commandName, string optionString){
                else if(commandName == "get.oturep")                    {   command = new GetOTURepCommand(optionString);                               }
                else if(commandName == "tree.shared")                   {   command = new TreeGroupCommand(optionString);                               }
                else if(commandName == "dist.shared")                   {   command = new MatrixOutputCommand(optionString);                    }
-               else if(commandName == "bootstrap.shared")              {   command = new BootSharedCommand(optionString);                              }
-               else if(commandName == "consensus")                             {   command = new ConcensusCommand(optionString);                               }
                else if(commandName == "dist.seqs")                             {   command = new DistanceCommand(optionString);                                }
                else if(commandName == "align.seqs")                    {   command = new AlignCommand(optionString);                                   }
                else if(commandName == "summary.seqs")                  {       command = new SeqSummaryCommand(optionString);                          }
@@ -329,8 +445,7 @@ Command* CommandFactory::getCommand(string commandName, string optionString){
                else if(commandName == "reverse.seqs")                  {       command = new ReverseSeqsCommand(optionString);                         }
                else if(commandName == "trim.seqs")                             {       command = new TrimSeqsCommand(optionString);                            }
                else if(commandName == "trim.flows")                    {       command = new TrimFlowsCommand(optionString);                           }
-               else if(commandName == "shhh.seqs")                             {       command = new ShhherCommand(optionString);                                      }
-               else if(commandName == "chimera.seqs")                  {       command = new ChimeraSeqsCommand(optionString);                         }
+               else if(commandName == "shhh.flows")                    {       command = new ShhherCommand(optionString);                                      }
                else if(commandName == "list.seqs")                             {       command = new ListSeqsCommand(optionString);                            }
                else if(commandName == "get.seqs")                              {       command = new GetSeqsCommand(optionString);                                     }
                else if(commandName == "remove.seqs")                   {       command = new RemoveSeqsCommand(optionString);                          }
@@ -344,6 +459,7 @@ Command* CommandFactory::getCommand(string commandName, string optionString){
                else if(commandName == "chimera.ccode")                 {       command = new ChimeraCcodeCommand(optionString);                        }
                else if(commandName == "chimera.check")                 {       command = new ChimeraCheckCommand(optionString);                        }
                else if(commandName == "chimera.slayer")                {       command = new ChimeraSlayerCommand(optionString);                       }
+               else if(commandName == "chimera.uchime")                {       command = new ChimeraUchimeCommand(optionString);                       }
                else if(commandName == "chimera.pintail")               {       command = new ChimeraPintailCommand(optionString);                      }
                else if(commandName == "chimera.bellerophon")   {       command = new ChimeraBellerophonCommand(optionString);          }
                else if(commandName == "phylotype")                             {       command = new PhylotypeCommand(optionString);                           }
@@ -394,6 +510,48 @@ Command* CommandFactory::getCommand(string commandName, string optionString){
                else if(commandName == "homova")                                {       command = new HomovaCommand(optionString);                                      }
                else if(commandName == "mantel")                                {       command = new MantelCommand(optionString);                                      }
                else if(commandName == "make.fastq")                    {       command = new MakeFastQCommand(optionString);                           }
+               else if(commandName == "get.current")                   {       command = new GetCurrentCommand(optionString);                          }
+               else if(commandName == "set.current")                   {       command = new SetCurrentCommand(optionString);                          }
+               else if(commandName == "anosim")                                {       command = new AnosimCommand(optionString);                                      }
+               else if(commandName == "make.shared")                   {       command = new SharedCommand(optionString);                                      }
+               else if(commandName == "get.commandinfo")               {       command = new GetCommandInfoCommand(optionString);                      }
+               else if(commandName == "deunique.tree")                 {       command = new DeuniqueTreeCommand(optionString);                        }
+               else if((commandName == "count.seqs") || (commandName == "make.table"))                 {       command = new CountSeqsCommand(optionString);                           }
+               else if(commandName == "count.groups")                  {       command = new CountGroupsCommand(optionString);                         }
+               else if(commandName == "clear.memory")                  {       command = new ClearMemoryCommand(optionString);                         }
+               else if(commandName == "summary.tax")                   {       command = new SummaryTaxCommand(optionString);                          }
+               else if(commandName == "summary.qual")                  {       command = new SummaryQualCommand(optionString);                         }
+               else if(commandName == "chimera.perseus")               {       command = new ChimeraPerseusCommand(optionString);                      }
+               else if(commandName == "shhh.seqs")                             {       command = new ShhhSeqsCommand(optionString);                            }
+               else if(commandName == "otu.association")               {       command = new OTUAssociationCommand(optionString);                      }
+        else if(commandName == "sort.seqs")             {      command = new SortSeqsCommand(optionString);                }
+        else if(commandName == "classify.tree")         {      command = new ClassifyTreeCommand(optionString);            }
+        else if(commandName == "cooccurrence")          {      command = new CooccurrenceCommand(optionString);            }
+        else if(commandName == "pcr.seqs")              {      command = new PcrSeqsCommand(optionString);                 }
+        else if(commandName == "create.database")       {      command = new CreateDatabaseCommand(optionString);          }
+        else if(commandName == "make.biom")             {      command = new MakeBiomCommand(optionString);                }
+        else if(commandName == "get.coremicrobiome")    {      command = new GetCoreMicroBiomeCommand(optionString);       }
+        else if(commandName == "list.otulabels")        {      command = new ListOtuLabelsCommand(optionString);           }
+        else if(commandName == "get.otulabels")         {      command = new GetOtuLabelsCommand(optionString);            }
+        else if(commandName == "remove.otulabels")      {      command = new RemoveOtuLabelsCommand(optionString);         }
+        else if(commandName == "make.contigs")          {      command = new MakeContigsCommand(optionString);             }
+        else if(commandName == "load.logfile")          {      command = new LoadLogfileCommand(optionString);             }
+        else if(commandName == "sff.multiple")          {      command = new SffMultipleCommand(optionString);             }
+        else if(commandName == "classify.rf")           {      command = new ClassifyRFSharedCommand(optionString);        }
+        else if(commandName == "filter.shared")         {      command = new FilterSharedCommand(optionString);            }
+        else if(commandName == "primer.design")         {      command = new PrimerDesignCommand(optionString);            }
+        else if(commandName == "get.dists")             {      command = new GetDistsCommand(optionString);                }
+        else if(commandName == "remove.dists")          {      command = new RemoveDistsCommand(optionString);             }
+        else if(commandName == "merge.taxsummary")      {      command = new MergeTaxSummaryCommand(optionString);         }
+        else if(commandName == "get.communitytype")     {      command = new GetMetaCommunityCommand(optionString);        }
+        else if(commandName == "sparcc")                {      command = new SparccCommand(optionString);                  }
+        else if(commandName == "make.lookup")                  {       command = new MakeLookupCommand(optionString);                          }
+        else if(commandName == "rename.seqs")                  {       command = new RenameSeqsCommand(optionString);                          }
+        else if(commandName == "make.lefse")                   {       command = new MakeLefseCommand(optionString);                           }
+        else if(commandName == "lefse")                 {      command = new LefseCommand(optionString);                   }
+        else if(commandName == "kruskal.wallis")        {      command = new KruskalWallisCommand(optionString);           }
+        else if(commandName == "sra")                   {      command = new SRACommand(optionString);                     }
+        else if(commandName == "merge.sfffiles")        {      command = new MergeSfffilesCommand(optionString);           }
                else                                                                                    {       command = new NoCommand(optionString);                                          }
 
                return command;
@@ -411,6 +569,8 @@ Command* CommandFactory::getCommand(string commandName, string optionString, str
        try {
                delete pipecommand;   //delete the old command
                
+        checkForRedirects(optionString);
+        
                //user has opted to redirect output from dir where input files are located to some other place
                if (outputDir != "") { 
                        if (optionString != "") { optionString += ", outputdir=" + outputDir; }
@@ -423,10 +583,7 @@ Command* CommandFactory::getCommand(string commandName, string optionString, str
                        else { optionString += "inputdir=" + inputDir; }
                }
                
-               if(commandName == "read.dist")                                  {       pipecommand = new ReadDistCommand(optionString);                                }
-               else if(commandName == "read.otu")                              {       pipecommand = new ReadOtuCommand(optionString);                                 }
-               else if(commandName == "read.tree")                             {       pipecommand = new ReadTreeCommand(optionString);                                }
-               else if(commandName == "cluster")                               {       pipecommand = new ClusterCommand(optionString);                                 }
+               if(commandName == "cluster")                            {       pipecommand = new ClusterCommand(optionString);                                 }
                else if(commandName == "unique.seqs")                   {       pipecommand = new DeconvoluteCommand(optionString);                             }
                else if(commandName == "parsimony")                             {       pipecommand = new ParsimonyCommand(optionString);                               }
                else if(commandName == "help")                                  {       pipecommand = new HelpCommand(optionString);                                    }
@@ -452,8 +609,6 @@ Command* CommandFactory::getCommand(string commandName, string optionString, str
                else if(commandName == "get.oturep")                    {   pipecommand = new GetOTURepCommand(optionString);                           }
                else if(commandName == "tree.shared")                   {   pipecommand = new TreeGroupCommand(optionString);                           }
                else if(commandName == "dist.shared")                   {   pipecommand = new MatrixOutputCommand(optionString);                        }
-               else if(commandName == "bootstrap.shared")              {   pipecommand = new BootSharedCommand(optionString);                          }
-               else if(commandName == "consensus")                             {   pipecommand = new ConcensusCommand(optionString);                           }
                else if(commandName == "dist.seqs")                             {   pipecommand = new DistanceCommand(optionString);                            }
                else if(commandName == "align.seqs")                    {   pipecommand = new AlignCommand(optionString);                                       }
                else if(commandName == "summary.seqs")                  {       pipecommand = new SeqSummaryCommand(optionString);                              }
@@ -461,8 +616,7 @@ Command* CommandFactory::getCommand(string commandName, string optionString, str
                else if(commandName == "reverse.seqs")                  {       pipecommand = new ReverseSeqsCommand(optionString);                             }
                else if(commandName == "trim.seqs")                             {       pipecommand = new TrimSeqsCommand(optionString);                                }
                else if(commandName == "trim.flows")                    {       pipecommand = new TrimFlowsCommand(optionString);                               }
-               else if(commandName == "shhh.seqs")                             {       pipecommand = new ShhherCommand(optionString);                                  }
-               else if(commandName == "chimera.seqs")                  {       pipecommand = new ChimeraSeqsCommand(optionString);                             }
+               else if(commandName == "shhh.flows")                    {       pipecommand = new ShhherCommand(optionString);                                  }
                else if(commandName == "list.seqs")                             {       pipecommand = new ListSeqsCommand(optionString);                                }
                else if(commandName == "get.seqs")                              {       pipecommand = new GetSeqsCommand(optionString);                                 }
                else if(commandName == "remove.seqs")                   {       pipecommand = new RemoveSeqsCommand(optionString);                              }
@@ -475,6 +629,7 @@ Command* CommandFactory::getCommand(string commandName, string optionString, str
                else if(commandName == "classify.seqs")                 {       pipecommand = new ClassifySeqsCommand(optionString);                    }
                else if(commandName == "chimera.ccode")                 {       pipecommand = new ChimeraCcodeCommand(optionString);                    }
                else if(commandName == "chimera.check")                 {       pipecommand = new ChimeraCheckCommand(optionString);                    }
+               else if(commandName == "chimera.uchime")                {       pipecommand = new ChimeraUchimeCommand(optionString);                   }
                else if(commandName == "chimera.slayer")                {       pipecommand = new ChimeraSlayerCommand(optionString);                   }
                else if(commandName == "chimera.pintail")               {       pipecommand = new ChimeraPintailCommand(optionString);                  }
                else if(commandName == "chimera.bellerophon")   {       pipecommand = new ChimeraBellerophonCommand(optionString);              }
@@ -524,7 +679,49 @@ Command* CommandFactory::getCommand(string commandName, string optionString, str
                else if(commandName == "amova")                                 {       pipecommand = new AmovaCommand(optionString);                                   }
                else if(commandName == "homova")                                {       pipecommand = new HomovaCommand(optionString);                                  }
                else if(commandName == "mantel")                                {       pipecommand = new MantelCommand(optionString);                                  }
+               else if(commandName == "anosim")                                {       pipecommand = new AnosimCommand(optionString);                                  }
                else if(commandName == "make.fastq")                    {       pipecommand = new MakeFastQCommand(optionString);                               }
+               else if(commandName == "get.current")                   {       pipecommand = new GetCurrentCommand(optionString);                              }
+               else if(commandName == "set.current")                   {       pipecommand = new SetCurrentCommand(optionString);                              }
+               else if(commandName == "make.shared")                   {       pipecommand = new SharedCommand(optionString);                                  }
+               else if(commandName == "get.commandinfo")               {       pipecommand = new GetCommandInfoCommand(optionString);                  }
+               else if(commandName == "deunique.tree")                 {       pipecommand = new DeuniqueTreeCommand(optionString);                    }
+               else if((commandName == "count.seqs") || (commandName == "make.table"))                 {       pipecommand = new CountSeqsCommand(optionString);                               }
+               else if(commandName == "count.groups")                  {       pipecommand = new CountGroupsCommand(optionString);                             }
+               else if(commandName == "clear.memory")                  {       pipecommand = new ClearMemoryCommand(optionString);                             }
+               else if(commandName == "summary.tax")                   {       pipecommand = new SummaryTaxCommand(optionString);                              }
+               else if(commandName == "summary.qual")                  {       pipecommand = new SummaryQualCommand(optionString);                             }
+               else if(commandName == "chimera.perseus")               {       pipecommand = new ChimeraPerseusCommand(optionString);                  }
+               else if(commandName == "shhh.seqs")                             {       pipecommand = new ShhhSeqsCommand(optionString);                                }
+               else if(commandName == "otu.association")               {       pipecommand = new OTUAssociationCommand(optionString);                  }
+        else if(commandName == "sort.seqs")             {      pipecommand = new SortSeqsCommand(optionString);                }
+        else if(commandName == "classify.tree")         {      pipecommand = new ClassifyTreeCommand(optionString);            }
+        else if(commandName == "cooccurrence")          {      pipecommand = new CooccurrenceCommand(optionString);            }
+        else if(commandName == "pcr.seqs")              {      pipecommand = new PcrSeqsCommand(optionString);                 }
+        else if(commandName == "create.database")       {      pipecommand = new CreateDatabaseCommand(optionString);          }
+        else if(commandName == "make.biom")             {      pipecommand = new MakeBiomCommand(optionString);                }
+        else if(commandName == "get.coremicrobiome")    {      pipecommand = new GetCoreMicroBiomeCommand(optionString);       }
+        else if(commandName == "list.otulabels")        {      pipecommand = new ListOtuLabelsCommand(optionString);           }
+        else if(commandName == "get.otulabels")         {      pipecommand = new GetOtuLabelsCommand(optionString);            }
+        else if(commandName == "remove.otulabels")      {      pipecommand = new RemoveOtuLabelsCommand(optionString);         }
+        else if(commandName == "make.contigs")          {      pipecommand = new MakeContigsCommand(optionString);             }
+        else if(commandName == "load.logfile")          {      pipecommand = new LoadLogfileCommand(optionString);             }
+        else if(commandName == "sff.multiple")          {      pipecommand = new SffMultipleCommand(optionString);             }
+        else if(commandName == "classify.rf")           {      pipecommand = new ClassifyRFSharedCommand(optionString);        }
+        else if(commandName == "filter.shared")         {      pipecommand = new FilterSharedCommand(optionString);            }
+        else if(commandName == "primer.design")         {      pipecommand = new PrimerDesignCommand(optionString);            }
+        else if(commandName == "get.dists")             {      pipecommand = new GetDistsCommand(optionString);                }
+        else if(commandName == "remove.dists")          {      pipecommand = new RemoveDistsCommand(optionString);             }
+        else if(commandName == "merge.taxsummary")      {      pipecommand = new MergeTaxSummaryCommand(optionString);         }
+        else if(commandName == "get.communitytype")     {      pipecommand = new GetMetaCommunityCommand(optionString);        }
+        else if(commandName == "sparcc")                {      pipecommand = new SparccCommand(optionString);                  }
+        else if(commandName == "make.lookup")                  {       pipecommand = new MakeLookupCommand(optionString);                              }
+        else if(commandName == "rename.seqs")                  {       pipecommand = new RenameSeqsCommand(optionString);                              }
+        else if(commandName == "make.lefse")                   {       pipecommand = new MakeLefseCommand(optionString);                               }
+        else if(commandName == "lefse")                 {      pipecommand = new LefseCommand(optionString);                   }
+        else if(commandName == "kruskal.wallis")        {      pipecommand = new KruskalWallisCommand(optionString);           }
+        else if(commandName == "sra")                   {      pipecommand = new SRACommand(optionString);                     }
+        else if(commandName == "merge.sfffiles")        {      pipecommand = new MergeSfffilesCommand(optionString);           }
                else                                                                                    {       pipecommand = new NoCommand(optionString);                                              }
 
                return pipecommand;
@@ -542,10 +739,7 @@ Command* CommandFactory::getCommand(string commandName){
        try {
                delete shellcommand;   //delete the old command
                
-               if(commandName == "read.dist")                                  {       shellcommand = new ReadDistCommand();                           }
-               else if(commandName == "read.otu")                              {       shellcommand = new ReadOtuCommand();                            }
-               else if(commandName == "read.tree")                             {       shellcommand = new ReadTreeCommand();                           }
-               else if(commandName == "cluster")                               {       shellcommand = new ClusterCommand();                            }
+               if(commandName == "cluster")                            {       shellcommand = new ClusterCommand();                            }
                else if(commandName == "unique.seqs")                   {       shellcommand = new DeconvoluteCommand();                        }
                else if(commandName == "parsimony")                             {       shellcommand = new ParsimonyCommand();                          }
                else if(commandName == "help")                                  {       shellcommand = new HelpCommand();                                       }
@@ -571,8 +765,6 @@ Command* CommandFactory::getCommand(string commandName){
                else if(commandName == "get.oturep")                    {   shellcommand = new GetOTURepCommand();                              }
                else if(commandName == "tree.shared")                   {   shellcommand = new TreeGroupCommand();                              }
                else if(commandName == "dist.shared")                   {   shellcommand = new MatrixOutputCommand();                   }
-               else if(commandName == "bootstrap.shared")              {   shellcommand = new BootSharedCommand();                             }
-               else if(commandName == "consensus")                             {   shellcommand = new ConcensusCommand();                              }
                else if(commandName == "dist.seqs")                             {   shellcommand = new DistanceCommand();                               }
                else if(commandName == "align.seqs")                    {   shellcommand = new AlignCommand();                                  }
                else if(commandName == "summary.seqs")                  {       shellcommand = new SeqSummaryCommand();                         }
@@ -580,8 +772,7 @@ Command* CommandFactory::getCommand(string commandName){
                else if(commandName == "reverse.seqs")                  {       shellcommand = new ReverseSeqsCommand();                        }
                else if(commandName == "trim.seqs")                             {       shellcommand = new TrimSeqsCommand();                           }
                else if(commandName == "trim.flows")                    {       shellcommand = new TrimFlowsCommand();                          }
-               else if(commandName == "shhh.seqs")                             {       shellcommand = new ShhherCommand();                                     }
-               else if(commandName == "chimera.seqs")                  {       shellcommand = new ChimeraSeqsCommand();                        }
+               else if(commandName == "shhh.flows")                    {       shellcommand = new ShhherCommand();                                     }
                else if(commandName == "list.seqs")                             {       shellcommand = new ListSeqsCommand();                           }
                else if(commandName == "get.seqs")                              {       shellcommand = new GetSeqsCommand();                            }
                else if(commandName == "remove.seqs")                   {       shellcommand = new RemoveSeqsCommand();                         }
@@ -595,6 +786,7 @@ Command* CommandFactory::getCommand(string commandName){
                else if(commandName == "chimera.ccode")                 {       shellcommand = new ChimeraCcodeCommand();                       }
                else if(commandName == "chimera.check")                 {       shellcommand = new ChimeraCheckCommand();                       }
                else if(commandName == "chimera.slayer")                {       shellcommand = new ChimeraSlayerCommand();                      }
+               else if(commandName == "chimera.uchime")                {       shellcommand = new ChimeraUchimeCommand();                      }
                else if(commandName == "chimera.pintail")               {       shellcommand = new ChimeraPintailCommand();                     }
                else if(commandName == "chimera.bellerophon")   {       shellcommand = new ChimeraBellerophonCommand();         }
                else if(commandName == "phylotype")                             {       shellcommand = new PhylotypeCommand();                          }
@@ -643,7 +835,49 @@ Command* CommandFactory::getCommand(string commandName){
                else if(commandName == "amova")                                 {       shellcommand = new AmovaCommand();                                      }
                else if(commandName == "homova")                                {       shellcommand = new HomovaCommand();                                     }
                else if(commandName == "mantel")                                {       shellcommand = new MantelCommand();                                     }
+               else if(commandName == "anosim")                                {       shellcommand = new AnosimCommand();                                     }
                else if(commandName == "make.fastq")                    {       shellcommand = new MakeFastQCommand();                          }
+               else if(commandName == "get.current")                   {       shellcommand = new GetCurrentCommand();                         }
+               else if(commandName == "set.current")                   {       shellcommand = new SetCurrentCommand();                         }
+               else if(commandName == "make.shared")                   {       shellcommand = new SharedCommand();                                     }
+               else if(commandName == "get.commandinfo")               {       shellcommand = new GetCommandInfoCommand();                     }
+               else if(commandName == "deunique.tree")                 {       shellcommand = new DeuniqueTreeCommand();                       }
+               else if((commandName == "count.seqs") || (commandName == "make.table"))                 {       shellcommand = new CountSeqsCommand();                          }
+               else if(commandName == "count.groups")                  {       shellcommand = new CountGroupsCommand();                        }
+               else if(commandName == "clear.memory")                  {       shellcommand = new ClearMemoryCommand();                        }
+               else if(commandName == "summary.tax")                   {       shellcommand = new SummaryTaxCommand();                         }
+               else if(commandName == "summary.qual")                  {       shellcommand = new SummaryQualCommand();                        }
+               else if(commandName == "chimera.perseus")               {       shellcommand = new ChimeraPerseusCommand();                     }
+               else if(commandName == "shhh.seqs")                             {       shellcommand = new ShhhSeqsCommand();                           }
+               else if(commandName == "otu.association")               {       shellcommand = new OTUAssociationCommand();                     }
+        else if(commandName == "sort.seqs")             {      shellcommand = new SortSeqsCommand();               }
+        else if(commandName == "classify.tree")         {      shellcommand = new ClassifyTreeCommand();           }
+        else if(commandName == "cooccurrence")          {      shellcommand = new CooccurrenceCommand();           }
+        else if(commandName == "pcr.seqs")              {      shellcommand = new PcrSeqsCommand();                }
+        else if(commandName == "create.database")       {      shellcommand = new CreateDatabaseCommand();         }
+        else if(commandName == "make.biom")             {      shellcommand = new MakeBiomCommand();               }
+        else if(commandName == "get.coremicrobiome")    {      shellcommand = new GetCoreMicroBiomeCommand();      }
+        else if(commandName == "list.otulabels")        {      shellcommand = new ListOtuLabelsCommand();          }
+        else if(commandName == "get.otulabels")         {      shellcommand = new GetOtuLabelsCommand();           }
+        else if(commandName == "remove.otulabels")      {      shellcommand = new RemoveOtuLabelsCommand();        }
+        else if(commandName == "make.contigs")          {      shellcommand = new MakeContigsCommand();            }
+        else if(commandName == "load.logfile")          {      shellcommand = new LoadLogfileCommand();            }
+        else if(commandName == "sff.multiple")          {      shellcommand = new SffMultipleCommand();            }
+        else if(commandName == "classify.rf")           {      shellcommand = new ClassifyRFSharedCommand();       }
+        else if(commandName == "filter.shared")         {      shellcommand = new FilterSharedCommand();           }
+        else if(commandName == "primer.design")         {      shellcommand = new PrimerDesignCommand();           }
+        else if(commandName == "get.dists")             {      shellcommand = new GetDistsCommand();               }
+        else if(commandName == "remove.dists")          {      shellcommand = new RemoveDistsCommand();            }
+        else if(commandName == "merge.taxsummary")      {      shellcommand = new MergeTaxSummaryCommand();        }
+        else if(commandName == "get.communitytype")     {      shellcommand = new GetMetaCommunityCommand();       }
+        else if(commandName == "sparcc")                {      shellcommand = new SparccCommand();                 }
+        else if(commandName == "make.lookup")                  {       shellcommand = new MakeLookupCommand();                         }
+        else if(commandName == "rename.seqs")                  {       shellcommand = new RenameSeqsCommand();                         }
+        else if(commandName == "make.lefse")                   {       shellcommand = new MakeLefseCommand();                          }
+        else if(commandName == "lefse")                 {      shellcommand = new LefseCommand();                  }
+        else if(commandName == "kruskal.wallis")        {      shellcommand = new KruskalWallisCommand();          }
+        else if(commandName == "sra")                   {      shellcommand = new SRACommand();                    }
+        else if(commandName == "merge.sfffiles")        {      shellcommand = new MergeSfffilesCommand();          }
                else                                                                                    {       shellcommand = new NoCommand();                                         }
 
                return shellcommand;
@@ -669,7 +903,7 @@ Command* CommandFactory::getCommand(){
                exit(1);
        }
 }
-/***********************************************************************/
+***********************************************************************/
 bool CommandFactory::isValidCommand(string command) {
        try {   
        
@@ -723,6 +957,41 @@ void CommandFactory::printCommands(ostream& out) {
        }
 }
 /***********************************************************************/
+void CommandFactory::printCommandsCategories(ostream& out) {
+    try {
+        map<string, string> commands = getListCommands();
+        map<string, string>::iterator it;
+
+        map<string, string> categories;
+        map<string, string>::iterator itCat;
+        //loop through each command outputting info
+        for (it = commands.begin(); it != commands.end(); it++) {
+    
+            Command* thisCommand = getCommand(it->first);
+    
+            //don't add hidden commands
+            if (thisCommand->getCommandCategory() != "Hidden") {
+                itCat = categories.find(thisCommand->getCommandCategory());
+                if (itCat == categories.end()) {
+                    categories[thisCommand->getCommandCategory()] = thisCommand->getCommandName();
+                }else {
+                    categories[thisCommand->getCommandCategory()] += ", " + thisCommand->getCommandName();
+                }
+            }
+        }
+        
+        for (itCat = categories.begin(); itCat != categories.end(); itCat++) {
+            out << itCat->first << " commmands include: " << itCat->second << endl;
+        }
+
+    }
+       catch(exception& e) {
+               m->errorOut(e, "CommandFactory", "printCommandsCategories");
+               exit(1);
+       }
+}      
+
+/***********************************************************************/