X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=commandfactory.cpp;h=bd519eebfd6eaa24134dad9ac08f2193004e6386;hb=8130ff9b30d872c578963f8d6f24af821b1ec33c;hp=e2d114a3ba25e41474af369a8d41752be7616ccd;hpb=0319c36f068f092c766e1bff34b3554c1858255a;p=mothur.git

diff --git a/commandfactory.cpp b/commandfactory.cpp
index e2d114a..bd519ee 100644
--- a/commandfactory.cpp
+++ b/commandfactory.cpp
@@ -74,6 +74,12 @@
 #include "setlogfilecommand.h"
 #include "phylodiversitycommand.h"
 #include "makegroupcommand.h"
+#include "chopseqscommand.h"
+#include "clearcutcommand.h"
+#include "catchallcommand.h"
+#include "splitabundcommand.h"
+#include "clustersplitcommand.h"
+#include "classifyotucommand.h"
 
 /*******************************************************/
 
@@ -155,6 +161,12 @@ CommandFactory::CommandFactory(){
 	commands["set.logfile"]			= "set.logfile";
 	commands["phylo.diversity"]		= "phylo.diversity";
 	commands["make.group"]			= "make.group";
+	commands["chop.seqs"]			= "chop.seqs";
+	commands["clearcut"]			= "clearcut";
+	commands["catchall"]			= "catchall";
+	commands["split.abund"]			= "split.abund";
+	commands["cluster.split"]		= "cluster.split";
+	commands["classify.otu"]		= "classify.otu";
 	commands["classify.seqs"]		= "MPIEnabled"; 
 	commands["dist.seqs"]			= "MPIEnabled";
 	commands["filter.seqs"]			= "MPIEnabled";
@@ -239,7 +251,7 @@ Command* CommandFactory::getCommand(string commandName, string 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 == "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);				}
@@ -273,6 +285,12 @@ Command* CommandFactory::getCommand(string commandName, string optionString){
 		else if(commandName == "parse.sff")				{	command = new ParseSFFCommand(optionString);				}
 		else if(commandName == "phylo.diversity")		{	command = new PhyloDiversityCommand(optionString);			}
 		else if(commandName == "make.group")			{	command = new MakeGroupCommand(optionString);				}
+		else if(commandName == "chop.seqs")				{	command = new ChopSeqsCommand(optionString);				}
+		else if(commandName == "clearcut")				{	command = new ClearcutCommand(optionString);				}
+		else if(commandName == "catchall")				{	command = new CatchAllCommand(optionString);				}
+		else if(commandName == "split.abund")			{	command = new SplitAbundCommand(optionString);				}
+		else if(commandName == "cluster.split")			{	command = new ClusterSplitCommand(optionString);			}
+		else if(commandName == "classify.otu")			{	command = new ClassifyOtuCommand(optionString);				}
 		else											{	command = new NoCommand(optionString);						}
 
 		return command;
@@ -324,9 +342,9 @@ bool CommandFactory::isValidCommand(string command) {
 /***********************************************************************/
 void CommandFactory::printCommands(ostream& out) {
 	try {	
-		out << "Valid commands are ";
+		out << "Valid commands are: ";
 		for (it = commands.begin(); it != commands.end(); it++) {
-			out << it->first << ", ";
+			out << it->first << ",";
 		}
 		out << endl;
 	}