X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=otuhierarchycommand.h;h=2b9e8e7f042e5f63a8805a427a8c3f8693f6cad9;hb=b206f634aae1b4ce13978d203247fb64757d5482;hp=ad6da0cf529121202b3bfc5d1c1d6bdc166cba16;hpb=49d2b7459c5027557564b21e9487dadafbbbdc96;p=mothur.git

diff --git a/otuhierarchycommand.h b/otuhierarchycommand.h
index ad6da0c..2b9e8e7 100644
--- a/otuhierarchycommand.h
+++ b/otuhierarchycommand.h
@@ -24,8 +24,9 @@ public:
 	vector<string> setParameters();
 	string getCommandName()			{ return "otu.hierarchy";			}
 	string getCommandCategory()		{ return "OTU-Based Approaches";	}
-	string getOutputFileNameTag(string, string);
+	
 	string getHelpString();	
+    string getOutputPattern(string);	
 	string getCitation() { return "http://www.mothur.org/wiki/Otu.hierarchy"; }
 	string getDescription()		{ return "relates OTUs at different distances"; }
 
@@ -36,11 +37,12 @@ public:
 	
 private:
 	bool abort;
-	set<string> labels; //holds labels to be used
-	string label, listFile, outputDir, output;
+	set<string> mylabels; //holds labels to be used
+	string label, listFile, outputDir, output, list1Label, list2Label;
 	vector<string> outputNames;
 	
-	vector<ListVector> getListVectors();
+	vector< vector<string> > getListVectors();
+    vector< vector<string> > getListVector(string, string&);
 		
 };