unifrac parallelization done, changed dist.seqs output=square to calc all distance...

[mothur.git] / unifracweightedcommand.h

diff --git a/unifracweightedcommand.h b/unifracweightedcommand.h
index 491d3846f65ae135d458c947b3f4a7539a5acde8..7317c8a43092a5712a06dda00589d1eb4528c649 100644 (file)
--- a/unifracweightedcommand.h
+++ b/unifracweightedcommand.h
@@ -23,11 +23,19 @@ class GlobalData;
 class UnifracWeightedCommand : public Command {
        
        public:
-               UnifracWeightedCommand();       
-               ~UnifracWeightedCommand() { delete weighted; delete util; }
+               UnifracWeightedCommand(string);
+               ~UnifracWeightedCommand() { if (abort == false) {  delete weighted; delete util; } }
                int execute();  
+               void help();
        
        private:
+               struct linePair {
+                       int start;
+                       int num;
+                       linePair(int i, int j) : start(i), num(j) {}
+               };
+               vector<linePair> lines;
+               
                GlobalData* globaldata;
                SharedUtil* util;
                FileOutput* output;
@@ -35,10 +43,9 @@ class UnifracWeightedCommand : public Command {
                vector<double> utreeScores;  //user tree unweighted scores
                vector<double> WScoreSig;  //tree weighted score signifigance when compared to random trees - percentage of random trees with that score or lower.
                vector<string> groupComb; // AB. AC, BC...
-               Tree* randT;  //random tree
                TreeMap* tmap;
                Weighted* weighted;
-               string sumFile;
+               string sumFile, outputDir;
                int iters, numGroups, numComp, counter;
                EstOutput userData;                     //weighted score info for user tree
                EstOutput randomData;           //weighted score info for random trees
@@ -47,17 +54,23 @@ class UnifracWeightedCommand : public Command {
                vector< map<float, float> > rScoreFreq;  //map <weighted score, number of random trees with that score.> -vector entry for each combination.
                vector< map<float, float> > rCumul;  //map <weighted score, cumulative percentage of number of random trees with that score or higher.> -vector entry for each c                                                                
                map<float, float>  validScores;  //map contains scores from random
-               map<float, float>::iterator it2;
-               map<float, float>::iterator it;
                
-               ofstream outSum, out;
-               ifstream inFile;
+               bool abort, phylip, random;
+               string groups, itersString;
+               vector<string> Groups, outputNames; //holds groups to be used
+               int processors;
+
+               
+               ofstream outSum;
                
                void printWSummaryFile();
                void printWeightedFile();  
+               void createPhylipFile();
                //void removeValidScoresDuplicates();
                int findIndex(float, int);
                void calculateFreqsCumuls();
+               int createProcesses(Tree*,  vector< vector<string> >, vector<double>&, vector< vector<double> >&);
+               int driver(Tree*, vector< vector<string> >, int, int, vector<double>&, vector< vector<double> >&);
                
 };