a few modifications for 1.9

[mothur.git] / matrixoutputcommand.h

diff --git a/matrixoutputcommand.h b/matrixoutputcommand.h
index 07743e5b4df6d867323c89c2acd78b241486bd00..537f7916299d36c7f628a9e7e6974821746f3b12 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;
@@ -33,7 +33,7 @@ public:
        
 private:
        void printSims(ostream&);
-       void process(vector<SharedRAbundVector*>);
+       int process(vector<SharedRAbundVector*>);
        
        GlobalData* globaldata;
        ReadOTUFile* read;
@@ -42,15 +42,14 @@ private:
        InputData* input;
        ValidCalculators* validCalculator;
        vector<SharedRAbundVector*> lookup;
-       string exportFileName;
+       string exportFileName, output;
        int numGroups;
        ofstream out;
 
        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
        
 
 };