adding treeclimber and unifrac pieces

[mothur.git] / globaldata.hpp

diff --git a/globaldata.hpp b/globaldata.hpp
index f513d526c478e9b2160c51e42f9ce9bac6f58fdb..80891677d6e27d9f9e1e9671df4b128a962da116 100644 (file)
--- a/globaldata.hpp
+++ b/globaldata.hpp
@@ -27,7 +27,7 @@ public:
        InputData* ginput;
        OrderVector* gorder;
        ListVector* glist;
-       Tree* gTree;
+       vector<Tree*> gTree;
        SharedListVector* gSharedList;
        SAbundVector* sabund;
        GroupMap* gGroupmap;
@@ -37,6 +37,7 @@ public:
        vector<string> singleEstimators, summaryEstimators, sharedEstimators, rareEstimators, sharedRareEstimators, sharedSummaryEstimators; //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();
@@ -56,6 +57,7 @@ public:
        string getIters();
        string getJumble();
        string getFreq();
+       string getRandomTree();
        void setListFile(string);
        void setPhylipFile(string);
        void setColumnFile(string);
@@ -63,6 +65,7 @@ public:
        void setRabundFile(string);
        void setSabundFile(string);
        void setFormat(string);
+       void setRandomTree(string);
 
        
        void setListVector(ListVector*);
@@ -77,7 +80,7 @@ public:
        void splitAtDash(string&, set<string>&);
        
 private:
-       string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, fastafile, treefile, line, label;
+       string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, fastafile, treefile, line, label, randomtree, groups;
        string cutoff, format, precision, method, fileroot, iters, jumble, freq, single, rarefaction, shared, summary, sharedsummary, sharedrarefaction;
        static GlobalData* _uniqueInstance;
        GlobalData( const GlobalData& ); // Disable copy constructor