X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=commandfactory.cpp;h=681e3e59f7e987a792b934d4ade36e182ed984ca;hb=a150db3c2bfd7b76420048a1e94ebe397f2c6045;hp=42567e4a36c429cc39c859277af0a3948816ea9d;hpb=ea34218a94af7cb96d4a1b44e444a87c7ab7456c;p=mothur.git diff --git a/commandfactory.cpp b/commandfactory.cpp index 42567e4..681e3e5 100644 --- a/commandfactory.cpp +++ b/commandfactory.cpp @@ -48,7 +48,6 @@ #include "reversecommand.h" #include "trimseqscommand.h" #include "mergefilecommand.h" -#include "chimeraseqscommand.h" #include "listseqscommand.h" #include "getseqscommand.h" #include "removeseqscommand.h" @@ -70,6 +69,7 @@ #include "chimeraslayercommand.h" #include "chimerapintailcommand.h" #include "chimerabellerophoncommand.h" +#include "chimerauchimecommand.h" #include "setlogfilecommand.h" #include "phylodiversitycommand.h" #include "makegroupcommand.h" @@ -110,6 +110,14 @@ #include "removerarecommand.h" #include "mergegroupscommand.h" #include "amovacommand.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" /*******************************************************/ @@ -145,6 +153,7 @@ CommandFactory::CommandFactory(){ 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"; @@ -176,7 +185,7 @@ CommandFactory::CommandFactory(){ 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"; @@ -222,17 +231,24 @@ CommandFactory::CommandFactory(){ commands["nmds"] = "nmds"; commands["remove.rare"] = "remove.rare"; 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"] = "get.current"; + commands["set.current"] = "set.current"; + commands["get.commandinfo"] = "get.commandinfo"; 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"] = "MPIEnabled"; commands["chimera.pintail"] = "MPIEnabled"; commands["chimera.bellerophon"] = "MPIEnabled"; commands["screen.seqs"] = "MPIEnabled"; @@ -324,7 +340,6 @@ Command* CommandFactory::getCommand(string commandName, string 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 == "list.seqs") { command = new ListSeqsCommand(optionString); } else if(commandName == "get.seqs") { command = new GetSeqsCommand(optionString); } else if(commandName == "remove.seqs") { command = new RemoveSeqsCommand(optionString); } @@ -338,6 +353,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); } @@ -385,6 +401,14 @@ Command* CommandFactory::getCommand(string commandName, string optionString){ else if(commandName == "remove.rare") { command = new RemoveRareCommand(optionString); } else if(commandName == "merge.groups") { command = new MergeGroupsCommand(optionString); } else if(commandName == "amova") { command = new AmovaCommand(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 { command = new NoCommand(optionString); } return command; @@ -453,7 +477,6 @@ Command* CommandFactory::getCommand(string commandName, string optionString, str 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 == "list.seqs") { pipecommand = new ListSeqsCommand(optionString); } else if(commandName == "get.seqs") { pipecommand = new GetSeqsCommand(optionString); } else if(commandName == "remove.seqs") { pipecommand = new RemoveSeqsCommand(optionString); } @@ -466,6 +489,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); } @@ -513,6 +537,14 @@ Command* CommandFactory::getCommand(string commandName, string optionString, str else if(commandName == "remove.rare") { pipecommand = new RemoveRareCommand(optionString); } else if(commandName == "merge.groups") { pipecommand = new MergeGroupsCommand(optionString); } 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 { pipecommand = new NoCommand(optionString); } return pipecommand; @@ -569,7 +601,6 @@ Command* CommandFactory::getCommand(string commandName){ 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 == "list.seqs") { shellcommand = new ListSeqsCommand(); } else if(commandName == "get.seqs") { shellcommand = new GetSeqsCommand(); } else if(commandName == "remove.seqs") { shellcommand = new RemoveSeqsCommand(); } @@ -583,6 +614,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(); } @@ -629,6 +661,14 @@ Command* CommandFactory::getCommand(string commandName){ else if(commandName == "remove.rare") { shellcommand = new RemoveRareCommand(); } else if(commandName == "merge.groups") { shellcommand = new MergeGroupsCommand(); } 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 { shellcommand = new NoCommand(); } return shellcommand;