finished get.relabund command

[mothur.git] / commandfactory.cpp

diff --git a/commandfactory.cpp b/commandfactory.cpp
index cad0442747f2ff7a5ada7b24d4ba18ad9138643c..2b19f72e1761544c5ec5eb7b676d5bd8ad30e4a6 100644 (file)
--- a/commandfactory.cpp
+++ b/commandfactory.cpp
@@ -72,6 +72,16 @@
 #include "chimerapintailcommand.h"
 #include "chimerabellerophoncommand.h"
 #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"
+#include "degapseqscommand.h"
+#include "getrelabundcommand.h"
 
 /*******************************************************/
 
@@ -130,9 +140,7 @@ CommandFactory::CommandFactory(){
        commands["get.rabund"]          = "get.rabund";
        commands["bootstrap.shared"]    = "bootstrap.shared";
        //commands["consensus"]                 = "consensus";
-       commands["help"]                                = "help"; 
-       commands["summary.seqs"]                = "summary.seqs";
-       commands["screen.seqs"]                 = "screen.seqs";
+       commands["help"]                                = "help";
        commands["reverse.seqs"]                = "reverse.seqs";
        commands["trim.seqs"]                   = "trim.seqs";
        commands["list.seqs"]                   = "list.seqs";
@@ -153,6 +161,15 @@ CommandFactory::CommandFactory(){
        commands["parse.list"]                  = "parse.list";
        commands["parse.sff"]                   = "parse.sff";
        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["classify.otu"]                = "classify.otu";
+       commands["degap.seqs"]                  = "degap.seqs";
+       commands["get.relabund"]                = "get.relabund";
        commands["classify.seqs"]               = "MPIEnabled"; 
        commands["dist.seqs"]                   = "MPIEnabled";
        commands["filter.seqs"]                 = "MPIEnabled";
@@ -163,6 +180,9 @@ CommandFactory::CommandFactory(){
        commands["chimera.slayer"]              = "MPIEnabled";
        commands["chimera.pintail"]             = "MPIEnabled";
        commands["chimera.bellerophon"] = "MPIEnabled";
+       commands["screen.seqs"]                 = "MPIEnabled";
+       commands["summary.seqs"]                = "MPIEnabled";
+       commands["cluster.split"]               = "MPIEnabled";
        commands["quit"]                                = "MPIEnabled"; 
 
 }
@@ -235,7 +255,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);                          }
@@ -267,6 +287,16 @@ Command* CommandFactory::getCommand(string commandName, string optionString){
                else if(commandName == "set.logfile")                   {       command = new SetLogFileCommand(optionString);                          }
                else if(commandName == "parse.list")                    {       command = new ParseListCommand(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 if(commandName == "degap.seqs")                    {       command = new DegapSeqsCommand(optionString);                           }
+               else if(commandName == "get.relabund")                  {       command = new GetRelAbundCommand(optionString);                         }
                else                                                                                    {       command = new NoCommand(optionString);                                          }
 
                return command;
@@ -318,9 +348,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;
        }