weightedcommand

[mothur.git] / unifracweightedcommand.h

diff --git a/unifracweightedcommand.h b/unifracweightedcommand.h
index 9deef732bfe100e27b99fb2e30551de0256e453e..d309566e45b0d58fb2631eeb1a0ad1816907f437 100644 (file)
--- a/unifracweightedcommand.h
+++ b/unifracweightedcommand.h
@@ -38,20 +38,16 @@ class UnifracWeightedCommand : public Command {
                int iters, numGroups, numComp;
                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<float> > validScores;  //vector<contains scores from both user and random> each group comb has an entry
+               vector< vector<float> > rScores;  //vector<weighted scores for random trees.> each group comb has an entry
+               vector< vector<float> > uScores;  //vector<weighted scores for user trees.> each group comb has an entry
+                                                               
                ofstream outSum, out;
                
                void printWSummaryFile();
-               void printWeightedFile();  
-               void saveRandomScores();
+       //      void printWeightedFile();  
+               void removeValidScoresDuplicates();
+               int findIndex(float);
                void setGroups(); 
 };