X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=globaldata.hpp;h=31a63b67adad73bd7e46487a4849cee6135f6ede;hb=5e7c1cf6a6dd289a90d27c0eef7eb4675b5e17b7;hp=277d351062fd67726f0ba05d53647d8c98b2a53c;hpb=09a01fb51eea9e81409d367410c831394193fd86;p=mothur.git

diff --git a/globaldata.hpp b/globaldata.hpp
index 277d351..31a63b6 100644
--- a/globaldata.hpp
+++ b/globaldata.hpp
@@ -41,10 +41,9 @@ public:
 	TreeMap* gTreemap;
 	string inputFileName, helpRequest, commandName;
 	bool allLines;
-	vector<string> Estimators; //holds estimators to be used
+	vector<string>  Estimators, Groups; //holds estimators to be used
 	set<int> lines; //hold lines to be used
 	set<string> labels; //holds labels to be used
-	vector<string> Groups;
 	
 	string getPhylipFile();
 	string getColumnFile();
@@ -65,7 +64,9 @@ public:
 	string getIters();
 	string getJumble();
 	string getFreq();
+	string getAbund();
 	string getRandomTree();
+
 	void setListFile(string);
 	void setPhylipFile(string);
 	void setColumnFile(string);
@@ -79,11 +80,16 @@ public:
 	
 	void setListVector(ListVector*);
 	void setSparseMatrix(SparseMatrix*);
+	void clear(); 
+	void clearLabels();
+	void clearAbund();
+	
 	void parseGlobalData(string, string);
 		
 private:
 	string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, fastafile, treefile, sharedfile, line, label, randomtree, groups;
-	string cutoff, format, precision, method, fileroot, iters, jumble, freq, calc;
+	string cutoff, format, precision, method, fileroot, iters, jumble, freq, calc, abund;
+
 	static GlobalData* _uniqueInstance;
 	GlobalData( const GlobalData& ); // Disable copy constructor
 	void operator=( const GlobalData& ); // Disable assignment operator
@@ -91,7 +97,6 @@ private:
 	~GlobalData();
 	ListVector* gListVector;
 	SparseMatrix* gSparseMatrix;
-	void clear();  //clears all parameters
 	void reset();	//clears all non filename parameters