X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=commandfactory.cpp;h=fc20ee5abbcda080d7965c133199e9a86e4a74cb;hb=956cdff34f2d609a7736838b1631cd7957580b8b;hp=a40c432f54d18c19e549e9370253fb52dd9ddfa3;hpb=44b464979e91c2a1f144ac45ca12c14fcf6579f0;p=mothur.git

diff --git a/commandfactory.cpp b/commandfactory.cpp
index a40c432..fc20ee5 100644
--- a/commandfactory.cpp
+++ b/commandfactory.cpp
@@ -79,6 +79,11 @@
 #include "catchallcommand.h"
 #include "splitabundcommand.h"
 #include "clustersplitcommand.h"
+#include "classifyotucommand.h"
+#include "degapseqscommand.h"
+#include "getrelabundcommand.h"
+#include "sensspeccommand.h"
+#include "sffinfocommand.h"
 
 /*******************************************************/
 
@@ -164,7 +169,10 @@ CommandFactory::CommandFactory(){
 	commands["clearcut"]			= "clearcut";
 	commands["catchall"]			= "catchall";
 	commands["split.abund"]			= "split.abund";
-	commands["cluster.split"]		= "cluster.split";
+	commands["classify.otu"]		= "classify.otu";
+	commands["degap.seqs"]			= "degap.seqs";
+	commands["get.relabund"]		= "get.relabund";
+	commands["sffinfo"]				= "sffinfo";
 	commands["classify.seqs"]		= "MPIEnabled"; 
 	commands["dist.seqs"]			= "MPIEnabled";
 	commands["filter.seqs"]			= "MPIEnabled";
@@ -177,6 +185,8 @@ CommandFactory::CommandFactory(){
 	commands["chimera.bellerophon"]	= "MPIEnabled";
 	commands["screen.seqs"]			= "MPIEnabled";
 	commands["summary.seqs"]		= "MPIEnabled";
+	commands["cluster.split"]		= "MPIEnabled";
+	commands["sens.spec"]			= "sens.spec";
 	commands["quit"]				= "MPIEnabled"; 
 
 }
@@ -288,6 +298,11 @@ Command* CommandFactory::getCommand(string commandName, string 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 if(commandName == "degap.seqs")			{	command = new DegapSeqsCommand(optionString);				}
+		else if(commandName == "get.relabund")			{	command = new GetRelAbundCommand(optionString);				}
+		else if(commandName == "sens.spec")				{	command = new SensSpecCommand(optionString);				}
+		else if(commandName == "sffinfo")				{	command = new SffInfoCommand(optionString);					}
 		else											{	command = new NoCommand(optionString);						}
 
 		return command;
@@ -339,9 +354,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;
 	}