X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=commandfactory.cpp;h=250e4f6e3176ee10c7674778f365f9785a4df855;hb=f598bd8389840cf030d61f5da7d0b2c3e37c06ba;hp=26b8c8620e96b545fbeed8a47be96130ebe1e615;hpb=afeb767205e3e7efd11bb7a36a36ad79ad05a779;p=mothur.git

diff --git a/commandfactory.cpp b/commandfactory.cpp
index 26b8c86..250e4f6 100644
--- a/commandfactory.cpp
+++ b/commandfactory.cpp
@@ -108,6 +108,7 @@
 #include "pcacommand.h"
 #include "nmdscommand.h"
 #include "removerarecommand.h"
+#include "mergegroupscommand.h"
 
 /*******************************************************/
 
@@ -219,6 +220,7 @@ CommandFactory::CommandFactory(){
 	commands["pca"]					= "pca";
 	commands["nmds"]				= "nmds";
 	commands["remove.rare"]			= "remove.rare";
+	commands["merge.groups"]		= "merge.groups";
 	commands["pairwise.seqs"]		= "MPIEnabled";
 	commands["pipeline.pds"]		= "MPIEnabled";
 	commands["classify.seqs"]		= "MPIEnabled"; 
@@ -379,6 +381,7 @@ Command* CommandFactory::getCommand(string commandName, string optionString){
 		else if(commandName == "consensus.seqs")		{	command = new ConsensusSeqsCommand(optionString);			}
 		else if(commandName == "corr.axes")				{	command = new CorrAxesCommand(optionString);				}
 		else if(commandName == "remove.rare")			{	command = new RemoveRareCommand(optionString);				}
+		else if(commandName == "merge.groups")			{	command = new MergeGroupsCommand(optionString);				}
 		else											{	command = new NoCommand(optionString);						}
 
 		return command;
@@ -505,6 +508,7 @@ Command* CommandFactory::getCommand(string commandName, string optionString, str
 		else if(commandName == "consensus.seqs")		{	pipecommand = new ConsensusSeqsCommand(optionString);			}
 		else if(commandName == "corr.axes")				{	pipecommand = new CorrAxesCommand(optionString);				}
 		else if(commandName == "remove.rare")			{	pipecommand = new RemoveRareCommand(optionString);				}
+		else if(commandName == "merge.groups")			{	pipecommand = new MergeGroupsCommand(optionString);				}
 		else											{	pipecommand = new NoCommand(optionString);						}
 
 		return pipecommand;
@@ -619,6 +623,7 @@ Command* CommandFactory::getCommand(string commandName){
 		else if(commandName == "consensus.seqs")		{	shellcommand = new ConsensusSeqsCommand();			}
 		else if(commandName == "corr.axes")				{	shellcommand = new CorrAxesCommand();				}
 		else if(commandName == "remove.rare")			{	shellcommand = new RemoveRareCommand();				}
+		else if(commandName == "merge.groups")			{	shellcommand = new MergeGroupsCommand();			}
 		else											{	shellcommand = new NoCommand();						}
 
 		return shellcommand;