X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=matrixoutputcommand.h;h=537f7916299d36c7f628a9e7e6974821746f3b12;hb=aa9238c0a9e6e7aa0ed8b8b606b08ad4fd7dcfe3;hp=04d0ccbf8e46145591acca443d37039809da88d0;hpb=b22853b5cfbf5c47949ad2a084f2fad88b2e4be4;p=mothur.git

diff --git a/matrixoutputcommand.h b/matrixoutputcommand.h
index 04d0ccb..537f791 100644
--- a/matrixoutputcommand.h
+++ b/matrixoutputcommand.h
@@ -15,8 +15,10 @@
 #include "readotu.h"
 #include "validcalculator.h"
 
+// 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;
@@ -24,12 +26,14 @@ class GlobalData;
 class MatrixOutputCommand : public Command {
 	
 public:
-	MatrixOutputCommand();	
+	MatrixOutputCommand(string);	
 	~MatrixOutputCommand();
 	int execute();	
+	void help();
 	
 private:
 	void printSims(ostream&);
+	int process(vector<SharedRAbundVector*>);
 	
 	GlobalData* globaldata;
 	ReadOTUFile* read;
@@ -38,10 +42,16 @@ private:
 	InputData* input;
 	ValidCalculators* validCalculator;
 	vector<SharedRAbundVector*> lookup;
-	string exportFileName;
+	string exportFileName, output;
 	int numGroups;
 	ofstream out;
 
+	bool abort, allLines;
+	set<string> labels; //holds labels to be used
+	string outputFile, calc, groups, label, outputDir;
+	vector<string>  Estimators, Groups, outputNames; //holds estimators to be used
+	
+
 };