working on testing

[mothur.git] / globaldata.hpp

diff --git a/globaldata.hpp b/globaldata.hpp
index 759bcae6fd7631988bf15407e7234330c2c9f659..b5e8c7cfc7cb246b9fbf9ca24097b1f3d190366c 100644 (file)
--- a/globaldata.hpp
+++ b/globaldata.hpp
@@ -10,6 +10,7 @@
 #include "tree.h"
 #include "sparsematrix.hpp"
 #include "sequencedb.h"
+#include "nameassignment.hpp"
 
 
 class ListVector;
@@ -42,11 +43,12 @@ public:
        TreeMap* gTreemap;
        SequenceDB* gSequenceDB;
        string inputFileName, argv;
-       bool allLines, runParse, jumble;
+       bool allLines, runParse, jumble, sim;
        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> Treenames;
+       map<string, string> names;
+       string saveNextLabel;
        
        
        string getPhylipFile();
@@ -57,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?
 
 
@@ -71,9 +75,13 @@ 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;
+       
        void clear(); 
        void clearLabels();
        void clearAbund();
@@ -81,8 +89,8 @@ public:
        void newRead();
        
 private:
-
-       string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, treefile, sharedfile, format;
+       MothurOut* m;
+       string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, treefile, sharedfile, format, distfile, ordergroup, relAbundfile;
 
        static GlobalData* _uniqueInstance;
        GlobalData( const GlobalData& ); // Disable copy constructor