fixed bug with trim.seqs- when a file is blank for a grouping mothur removed it,...

[mothur.git] / matrixoutputcommand.h

diff --git a/matrixoutputcommand.h b/matrixoutputcommand.h
index d6099326a69ac5ef1daf95ce192bc3cad1fd712f..2a7908167ac1ede1d402fa26c2f9c30978b31469 100644 (file)
--- a/matrixoutputcommand.h
+++ b/matrixoutputcommand.h
@@ -18,7 +18,7 @@
 // aka. dist.shared()
 
 /* This command create a tree file for each similarity calculator at distance level, using various calculators to find the similiarity between groups. 
-       The user can select the lines or labels they wish to use as well as the groups they would like included.
+       The user can select the labels they wish to use as well as the groups they would like included.
        They can also use as many or as few calculators as they wish. */
        
 class GlobalData;
@@ -26,14 +26,19 @@ class GlobalData;
 class MatrixOutputCommand : public Command {
        
 public:
-       MatrixOutputCommand(string);    
+       MatrixOutputCommand(string);
+       MatrixOutputCommand();  
        ~MatrixOutputCommand();
+       vector<string> getRequiredParameters();
+       vector<string> getValidParameters();
+       vector<string> getRequiredFiles();
+       map<string, vector<string> > getOutputFiles() { return outputTypes; }
        int execute();  
        void help();
        
 private:
        void printSims(ostream&);
-       void process(vector<SharedRAbundVector*>);
+       int process(vector<SharedRAbundVector*>);
        
        GlobalData* globaldata;
        ReadOTUFile* read;
@@ -42,17 +47,15 @@ private:
        InputData* input;
        ValidCalculators* validCalculator;
        vector<SharedRAbundVector*> lookup;
-       string exportFileName;
+       string exportFileName, output;
        int numGroups;
        ofstream out;
-       OptionParser* parser;
-       map<string, string> parameters;
-       map<string, string>::iterator it;
+
        bool abort, allLines;
-       set<int> lines; //hold lines to be used
        set<string> labels; //holds labels to be used
-       string outputFile, calc, groups, line, label;
-       vector<string>  Estimators, Groups; //holds estimators to be used
+       string outputFile, calc, groups, label, outputDir;
+       vector<string>  Estimators, Groups, outputNames; //holds estimators to be used
+       map<string, vector<string> > outputTypes;
        
 
 };