X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=treegroupscommand.h;h=3e8fbb01c4df3c34540a11342a5a960a03788145;hb=ccaad73f103d8f105264d65491ce19e5df80477d;hp=1e1f28480082903227d77b4b92666c0bec021fc3;hpb=cd37904452dc95b183ff313ff05720c562902487;p=mothur.git

diff --git a/treegroupscommand.h b/treegroupscommand.h
index 1e1f284..3e8fbb0 100644
--- a/treegroupscommand.h
+++ b/treegroupscommand.h
@@ -40,10 +40,10 @@ public:
 	void help();
 	
 private:
-	void createTree();
+	int createTree();
 	void printSims(ostream&);
-	void makeSimsShared();
-	void makeSimsDist();
+	int makeSimsShared();
+	int makeSimsDist();
 	
 	GlobalData* globaldata;
 	ReadOTUFile* read;
@@ -59,20 +59,19 @@ private:
 	InputData* input;
 	ValidCalculators* validCalculator;
 	vector<SharedRAbundVector*> lookup;
-	vector<SharedRAbundVector*> lastLookup;
+	string lastLabel;
 	string format, outputFile, groupNames, filename;
 	int numGroups;
 	ofstream out;
 	float precision, cutoff;
 
 	bool abort, allLines;
-	set<int> lines; //hold lines to be used
 	set<string> labels; //holds labels to be used
-	string phylipfile, columnfile, namefile, calc, groups, line, label;
-	vector<string>  Estimators, Groups; //holds estimators to be used
+	string phylipfile, columnfile, namefile, calc, groups, label, outputDir;
+	vector<string>  Estimators, Groups, outputNames; //holds estimators to be used
 	
 	//if the users enters label "0.06" and there is no "0.06" in their file use the next lowest label.
-	void process(vector<SharedRAbundVector*>);
+	int process(vector<SharedRAbundVector*>);