X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=globaldata.hpp;h=b5e8c7cfc7cb246b9fbf9ca24097b1f3d190366c;hb=7c08fa69c0b89e7a08341af2aa724f206f182075;hp=35415c70c874039c99c758c24a77b7b43eeb6079;hpb=fdc1f6eaf544f695fc1511f24bddd7e6069c33ba;p=mothur.git diff --git a/globaldata.hpp b/globaldata.hpp index 35415c7..b5e8c7c 100644 --- a/globaldata.hpp +++ b/globaldata.hpp @@ -48,6 +48,7 @@ public: set labels; //holds labels to be used vector Treenames; map names; + string saveNextLabel; string getPhylipFile(); @@ -58,8 +59,10 @@ public: string getNameFile(); //do we need this? string getGroupFile(); //do we need this? string getOrderFile(); + string getOrderGroupFile(); string getTreeFile(); string getSharedFile(); + string getRelAbundFile(); string getFormat(); //do we need this? @@ -72,7 +75,9 @@ public: void setRabundFile(string); void setSabundFile(string); void setSharedFile(string); + void setRelAbundFile(string); void setOrderFile(string file); + void setOrderGroupFile(string file); void setFormat(string); //do we need this? NameAssignment* nameMap; @@ -85,7 +90,7 @@ public: private: MothurOut* m; - string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, treefile, sharedfile, format, distfile; + string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, treefile, sharedfile, format, distfile, ordergroup, relAbundfile; static GlobalData* _uniqueInstance; GlobalData( const GlobalData& ); // Disable copy constructor