removed read.dist, read.otu, read.tree and globaldata. added current to defaults...

[mothur.git] / catchallcommand.h

diff --git a/catchallcommand.h b/catchallcommand.h
index 44bde029e382a382fcc0b407da5d789a1f302cb7..583191db8d547996bef24378fb2dfd50b7ac0a13 100644 (file)
--- a/catchallcommand.h
+++ b/catchallcommand.h
@@ -12,7 +12,6 @@
 
 #include "command.hpp"
 #include "inputdata.h"
-#include "readotu.h"
 #include "sabundvector.hpp"
 
 /* 
@@ -28,22 +27,20 @@ public:
        CatchAllCommand(string);
        CatchAllCommand();
        ~CatchAllCommand() {}
-       vector<string> getRequiredParameters();
-       vector<string> getValidParameters();
-       vector<string> getRequiredFiles();
-       map< string, vector<string> > getOutputFiles() { return outputTypes; }
-       int execute();
-       void help();    
        
-private:
-
-       GlobalData* globaldata;
+       vector<string> setParameters();
+       string getCommandName()                 { return "catchall";                    }
+       string getCommandCategory()             { return "Hypothesis Testing";  }
+       string getHelpString(); 
        
-       string outputDir, sharedfile, sabundfile, rabundfile, listfile, format, path, savedOutputDir;
+       int execute(); 
+       void help() { m->mothurOut(getHelpString()); }  
+       
+private:
+       string outputDir, sharedfile, sabundfile, format, path, savedOutputDir;
        bool abort, allLines;
        set<string> labels;
        vector<string> outputNames;
-       map< string, vector<string> > outputTypes;
        vector<string> groups;
        
        string process(SAbundVector*, string);