X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=globaldata.hpp;h=a5477fff1d06b95aa35b6c1dc7d697bb0288246a;hb=d5c8caf2d08b7ac6de30e33b1d19cfd246d08f03;hp=fbad525ab673467b9a0bc8e125df482c88d91893;hpb=bc9a445aa9fd0334301f9f23514de268e3b5a5e3;p=mothur.git

diff --git a/globaldata.hpp b/globaldata.hpp
index fbad525..a5477ff 100644
--- a/globaldata.hpp
+++ b/globaldata.hpp
@@ -31,7 +31,8 @@ public:
 	set<int> lines; //hold lines to be used
 	set<string> labels; //holds labels to be used
 	
-	string getDistFile();
+	string getPhylipFile();
+	string getColumnFile();
 	string getListFile();
 	string getRabundFile();
 	string getSabundFile();
@@ -47,7 +48,8 @@ public:
 	string getJumble();
 	string getFreq();
 	void setListFile(string);
-	void setDistFile(string);
+	void setPhylipFile(string);
+	void setColumnFile(string);
 	void setNameFile(string);
 	void setRabundFile(string);
 	void setSabundFile(string);
@@ -66,7 +68,7 @@ public:
 	void splitAtDash(string&, set<string>&);
 	
 private:
-	string distfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, line, label;
+	string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, line, label;
 	string cutoff, format, precision, method, fileroot, iters, jumble, freq, single, rarefaction, shared, summary, sharedsummary, sharedrarefaction;
 	static GlobalData* _uniqueInstance;
 	GlobalData( const GlobalData& ); // Disable copy constructor