parsimony command now uses groups, fixed bug with unweighted groups

[mothur.git] / globaldata.hpp

diff --git a/globaldata.hpp b/globaldata.hpp
index a2b91738e15d29d02ccdc87559b3e4441c5349db..277d351062fd67726f0ba05d53647d8c98b2a53c 100644 (file)
--- a/globaldata.hpp
+++ b/globaldata.hpp
@@ -4,15 +4,26 @@
 #include <string>
 #include <vector>
 #include <set>
+#include <iostream>
+#include <iomanip>
+#include <map>
+#include <sstream>
+#include <stdexcept>
+#include <exception>
+
 #include "groupmap.h"
+#include "treemap.h"
 
 using namespace std;
 
 class ListVector;
+class SharedListVector;
 class SparseMatrix;
+class Tree;
 class OrderVector;
 class InputData;
 class GroupMap;
+class TreeMap;
 class SAbundVector;
 
 class GlobalData {
@@ -23,13 +34,17 @@ public:
        InputData* ginput;
        OrderVector* gorder;
        ListVector* glist;
+       vector<Tree*> gTree;
+       SharedListVector* gSharedList;
        SAbundVector* sabund;
        GroupMap* gGroupmap;
+       TreeMap* gTreemap;
        string inputFileName, helpRequest, commandName;
        bool allLines;
-       vector<string> singleEstimators, summaryEstimators, sharedEstimators, rareEstimators, sharedRareEstimators, sharedSummaryEstimators; //holds estimators to be used
+       vector<string> Estimators; //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();
@@ -40,6 +55,8 @@ public:
        string getGroupFile();
        string getOrderFile();
        string getFastaFile();
+       string getTreeFile();
+       string getSharedFile();
        string getCutOff();
        string getFormat();
        string getPrecision();
@@ -48,6 +65,7 @@ public:
        string getIters();
        string getJumble();
        string getFreq();
+       string getRandomTree();
        void setListFile(string);
        void setPhylipFile(string);
        void setColumnFile(string);
@@ -55,22 +73,17 @@ public:
        void setRabundFile(string);
        void setSabundFile(string);
        void setFormat(string);
+       void setRandomTree(string);
+       void setCalc(string);
 
        
        void setListVector(ListVector*);
        void setSparseMatrix(SparseMatrix*);
-       void clear(); 
-       
        void parseGlobalData(string, string);
-       void splitAtEquals(string&, string&);
-       void splitAtComma(string&, string&);
-       void splitAtDash(string&, vector<string>&);
-       void splitAtDash(string&, set<int>&);
-       void splitAtDash(string&, set<string>&);
-       
+               
 private:
-       string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, fastafile,line, label;
-       string cutoff, format, precision, method, fileroot, iters, jumble, freq, single, rarefaction, shared, summary, sharedsummary, sharedrarefaction;
+       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;
        static GlobalData* _uniqueInstance;
        GlobalData( const GlobalData& ); // Disable copy constructor
        void operator=( const GlobalData& ); // Disable assignment operator
@@ -78,9 +91,11 @@ private:
        ~GlobalData();
        ListVector* gListVector;
        SparseMatrix* gSparseMatrix;
+       void clear();  //clears all parameters
+       void reset();   //clears all non filename parameters
+       
+       
        
 };
 
-//**********************************************************************************************************************
-
 #endif