merged pat's trim seqs edits with sarah's major overhaul of global data; also added...

[mothur.git] / unifracweightedcommand.h

diff --git a/unifracweightedcommand.h b/unifracweightedcommand.h
index 1b8b12bf789da9892a78017e7f888e0ad54ace01..9ea78baf17370d7c068e40d56014f2f4f6d49010 100644 (file)
--- a/unifracweightedcommand.h
+++ b/unifracweightedcommand.h
@@ -13,45 +13,55 @@
 #include "command.hpp"
 #include "weighted.h"
 #include "treemap.h"
+#include "progress.hpp"
+#include "sharedutilities.h"
+#include "fileoutput.h"
 
-using namespace std;
 
 class GlobalData;
 
 class UnifracWeightedCommand : public Command {
        
        public:
-               UnifracWeightedCommand();       
-               ~UnifracWeightedCommand() { delete weighted; }
+               UnifracWeightedCommand(string); 
+               ~UnifracWeightedCommand() { delete weighted; delete util; }
                int execute();  
+               void help();
        
        private:
                GlobalData* globaldata;
+               SharedUtil* util;
+               FileOutput* output;
                vector<Tree*> T;           //user trees
-               vector<float> utreeScores;  //user tree unweighted scores
-               vector<float> WScoreSig;  //tree weighted score signifigance when compared to random trees - percentage of random trees with that score or lower.
+               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 weightedFile, sumFile, distFile;
-               int iters, numGroups, numComp;
+               string sumFile;
+               int iters, numGroups, numComp, counter;
                EstOutput userData;                     //weighted score info for user tree
                EstOutput randomData;           //weighted score info for random trees
-               vector< map<float, float> > validScores;  //vector<contains scores from both user and random> each group comb has an entry
-               vector< map<float, float> > rscoreFreq;  //vector<weighted score, number of random trees with that score.> each group comb has an entry
-               vector< map<float, float> > uscoreFreq;  //vector<weighted, number of user trees with that score.> each group comb has an entry
-               vector< map<float, float> > totalrscoreFreq;  //vector<weighted score, number of random trees with that score.> each group comb has an entry
-               vector< map<float, float> > rCumul;  //vector<weighted score, number of random trees with that score or higher.> each group comb has an entry
-               vector< map<float, float> > uCumul;  //vector<weighted, cumulative percentage of number of user trees with that score or higher.> each group comb has an entry
-               map<float, float>::iterator it;
-               map<float, float>::iterator it2;
+               vector< vector<double> > rScores;  //vector<weighted scores for random trees.> each group comb has an entry
+               vector< vector<double> > uScores;  //vector<weighted scores for user trees.> each group comb has an entry
+               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
                
-               ofstream outSum, outDist, out;
+               bool abort;
+               string groups, itersString;
+               vector<string> Groups; //holds groups to be used
+
+               
+               ofstream outSum;
                
                void printWSummaryFile();
                void printWeightedFile();  
-               void saveRandomScores(); 
+               //void removeValidScoresDuplicates();
+               int findIndex(float, int);
+               void calculateFreqsCumuls();
+               
 };