fixed memory leak in parsimony calculator and added progress bars to parsimony and...

[mothur.git] / commandfactory.cpp

diff --git a/commandfactory.cpp b/commandfactory.cpp
index 840eaaccc82c392de096729a5db32d7c72cdf08a..354b5a3ba4de65d6576e408ff880930a11c0c1e0 100644 (file)
--- a/commandfactory.cpp
+++ b/commandfactory.cpp
@@ -10,7 +10,6 @@
 #include "command.hpp"
 #include "readdistcommand.h"
 #include "readtreecommand.h"
-#include "readsharedcommand.h"
 #include "readotucommand.h"
 #include "clustercommand.h"
 #include "parselistcommand.h"
@@ -23,7 +22,6 @@
 #include "summarycommand.h"
 #include "summarysharedcommand.h"
 #include "rarefactsharedcommand.h"
-#include "nocommand.h"
 #include "quitcommand.h"
 #include "helpcommand.h"
 #include "commandfactory.hpp"
@@ -31,7 +29,12 @@
 #include "parsimonycommand.h"
 #include "unifracunweightedcommand.h"
 #include "unifracweightedcommand.h"
-#include <exception>
+#include "libshuffcommand.h"
+#include "heatmapcommand.h"
+#include "venncommand.h"
+#include "mothur.h"
+#include "nocommands.h"
+#include "binsequencecommand.h"
 
 
 /***********************************************************/
@@ -40,7 +43,6 @@
 CommandFactory::CommandFactory(){
        command = new NoCommand();
 }
-
 /***********************************************************/
 
 /***********************************************************/
@@ -59,7 +61,6 @@ Command* CommandFactory::getCommand(string commandName){
                         if(commandName == "read.dist")                         {       command = new ReadDistCommand();                        }
                else if(commandName == "read.otu")                              {       command = new ReadOtuCommand();                         }
                else if(commandName == "read.tree")                             {       command = new ReadTreeCommand();                        }
-               else if(commandName == "read.shared")                   {       command = new ReadSharedCommand();                      }
                else if(commandName == "cluster")                               {       command = new ClusterCommand();                         }
                else if(commandName == "deconvolute")                   {       command = new DeconvoluteCommand();                     }
                else if(commandName == "parsimony")                             {       command = new ParsimonyCommand();                       }
@@ -73,9 +74,13 @@ Command* CommandFactory::getCommand(string commandName){
                else if(commandName == "summary.shared")                {       command = new SummarySharedCommand();           }
                else if(commandName == "unifrac.weighted")              {       command = new UnifracWeightedCommand();         }
                else if(commandName == "unifrac.unweighted")    {       command = new UnifracUnweightedCommand();       }
-               else if(commandName == "get.group")             {   command = new GetgroupCommand();        }
-               else if(commandName == "get.label")             {   command = new GetlabelCommand();        }
-               else if(commandName == "get.line")              {   command = new GetlineCommand();         }
+               else if(commandName == "get.group")             {   command = new GetgroupCommand();                    }
+               else if(commandName == "get.label")             {   command = new GetlabelCommand();                    }
+               else if(commandName == "get.line")              {   command = new GetlineCommand();                             }
+               else if(commandName == "libshuff")              {   command = new LibShuffCommand();                    }
+               else if(commandName == "heatmap")                               {   command = new HeatMapCommand();                             }
+               else if(commandName == "venn")                                  {   command = new VennCommand();                                }
+               else if(commandName == "bin.seqs")                              {   command = new BinSeqCommand();                              }
                else                                                                                    {       command = new NoCommand();                                      }
 
                return command;