mods in testing 1.16.0

[mothur.git] / readotucommand.h

diff --git a/readotucommand.h b/readotucommand.h
index 972f30e8e0e008111d14bc49670dc926a98d360f..eb0ca8f7832e5f1877a172fa0449a3ae29e5416f 100644 (file)
--- a/readotucommand.h
+++ b/readotucommand.h
@@ -9,30 +9,38 @@
  *
  */
 
-#include <Carbon/Carbon.h>
-#include <iostream>
-#include <fstream>
 #include "command.hpp"
-#include "readmatrix.hpp"
+#include "readotu.h"
 #include "inputdata.h"
-
-/* The read.otu command parameter options are listfile, sabundfile, rabundfile and orderfile.  
-The read.otu command should be in the following format: 
-read.otu(listfile=yourListFile, orderfile=yourOrderFile). The listfile, sabundfile or rabundfile are required, but only one may be used. */
+#include "groupmap.h"
+#include "sharedcommand.h"
 
 class GlobalData;
 
 class ReadOtuCommand : public Command {
 public:
+       ReadOtuCommand(string);
        ReadOtuCommand();
        ~ReadOtuCommand();
+       vector<string> getRequiredParameters();
+       vector<string> getValidParameters();
+       vector<string> getRequiredFiles();
+       map<string, vector<string> > getOutputFiles() { return outputTypes; }
        int execute();
+       void help();
        
 private:
        GlobalData* globaldata;
-       ReadMatrix* read;
        InputData* input;
-       string filename;
+       Command* shared;
+       GroupMap* groupMap;
+       string filename, listfile, orderfile, sharedfile, label, groupfile, sabundfile, rabundfile, format, groups, outputDir, ordergroupfile, relAbundfile;
+       vector<string> Groups, outputNames;
+       map<string, vector<string> > outputTypes;
+
+       bool abort, allLines;
+       set<string> labels; //holds labels to be used
+
 };
 
-#endif
\ No newline at end of file
+#endif