X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=globaldata.hpp;h=759bcae6fd7631988bf15407e7234330c2c9f659;hb=30b3ffcd1cfd08e7144ae721bb53e27eb3f7a5d1;hp=309ab4a09c712132617c1fab8bd96e7849f4643b;hpb=3c5c4e255ee8c36feb9e97aebc4e792e6ff8c440;p=mothur.git

diff --git a/globaldata.hpp b/globaldata.hpp
index 309ab4a..759bcae 100644
--- a/globaldata.hpp
+++ b/globaldata.hpp
@@ -4,94 +4,91 @@
 #include "mothur.h"
 #include "groupmap.h"
 #include "treemap.h"
+#include "rabundvector.hpp"
+#include "sabundvector.hpp"
+#include "listvector.hpp"
+#include "tree.h"
+#include "sparsematrix.hpp"
+#include "sequencedb.h"
 
-using namespace std;
 
 class ListVector;
 class SharedListVector;
 class SparseMatrix;
+class FullMatrix;
 class Tree;
 class OrderVector;
 class InputData;
 class GroupMap;
 class TreeMap;
 class SAbundVector;
+class RAbundVector;
+class SequenceDB;
 
 class GlobalData {
 public:
 	static GlobalData* getInstance();
-	ListVector* getListVector();
-	SparseMatrix* getSparseMatrix();
+	ListVector* gListVector;
+	SparseMatrix* gSparseMatrix;
 	InputData* ginput;
 	OrderVector* gorder;
 	ListVector* glist;
 	vector<Tree*> gTree;
 	SharedListVector* gSharedList;
 	SAbundVector* sabund;
+	RAbundVector* rabund;
 	GroupMap* gGroupmap;
+	FullMatrix* gMatrix;
 	TreeMap* gTreemap;
-	string inputFileName, helpRequest, commandName;
-	bool allLines;
+	SequenceDB* gSequenceDB;
+	string inputFileName, argv;
+	bool allLines, runParse, jumble;
 	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;
+	
 	
 	string getPhylipFile();
 	string getColumnFile();
 	string getListFile();
 	string getRabundFile();
 	string getSabundFile();
-	string getNameFile();
-	string getGroupFile();
+	string getNameFile();	//do we need this?
+	string getGroupFile();	//do we need this?
 	string getOrderFile();
-	string getFastaFile();
 	string getTreeFile();
 	string getSharedFile();
-	string getCutOff();
-	string getFormat();
-	string getPrecision();
-	string getMethod();
-	string getFileRoot();
-	string getIters();
-	string getJumble();
-	string getFreq();
-	string getAbund();
-	string getRandomTree();
-	string getGroups();
+	string getFormat();	//do we need this?
+
 
 	void setListFile(string);
+	void setTreeFile(string);
+	void setGroupFile(string);		//do we need this?
 	void setPhylipFile(string);
 	void setColumnFile(string);
-	void setNameFile(string);
+	void setNameFile(string);	//do we need this?
 	void setRabundFile(string);
 	void setSabundFile(string);
-	void setFormat(string);
-	void setRandomTree(string);
-	void setGroups(string);
-	void setCalc(string);
-
+	void setSharedFile(string);
+	void setOrderFile(string file);
+	void setFormat(string);	//do we need this?
 	
-	void setListVector(ListVector*);
-	void setSparseMatrix(SparseMatrix*);
 	void clear(); 
 	void clearLabels();
 	void clearAbund();
 	
-	void parseGlobalData(string, string);
-		
+	void newRead();
+	
 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, abund;
+
+	string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, treefile, sharedfile, format;
 
 	static GlobalData* _uniqueInstance;
 	GlobalData( const GlobalData& ); // Disable copy constructor
 	void operator=( const GlobalData& ); // Disable assignment operator
 	GlobalData();
 	~GlobalData();
-	ListVector* gListVector;
-	SparseMatrix* gSparseMatrix;
-	void reset();	//clears all non filename parameters
-	
 	
 	
 };