]> git.donarmstrong.com Git - mothur.git/blobdiff - phylodiversitycommand.cpp
fixes while testing
[mothur.git] / phylodiversitycommand.cpp
index 19c65ce9a11c30e19d6d10a477165c1bcbe164c1..efa14cd7069266ebfedb41018de0120327a145a9 100644 (file)
@@ -8,8 +8,57 @@
  */
 
 #include "phylodiversitycommand.h"
-#include "phylodiversity.h"
 
+//**********************************************************************************************************************
+vector<string> PhyloDiversityCommand::getValidParameters(){    
+       try {
+               string Array[] =  {"freq","rarefy","iters","groups","processors","summary","collect","scale","outputdir","inputdir"};
+               vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "PhyloDiversityCommand", "getValidParameters");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+PhyloDiversityCommand::PhyloDiversityCommand(){        
+       try {
+               abort = true;
+               //initialize outputTypes
+               vector<string> tempOutNames;
+               outputTypes["phylodiv"] = tempOutNames;
+               outputTypes["rarefy"] = tempOutNames;
+               outputTypes["summary"] = tempOutNames;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "PhyloDiversityCommand", "PhyloDiversityCommand");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+vector<string> PhyloDiversityCommand::getRequiredParameters(){ 
+       try {
+               vector<string> myArray;
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "PhyloDiversityCommand", "getRequiredParameters");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+vector<string> PhyloDiversityCommand::getRequiredFiles(){      
+       try {
+               string Array[] =  {"tree","group"};
+               vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "PhyloDiversityCommand", "getRequiredFiles");
+               exit(1);
+       }
+}
 //**********************************************************************************************************************
 PhyloDiversityCommand::PhyloDiversityCommand(string option)  {
        try {
@@ -21,7 +70,7 @@ PhyloDiversityCommand::PhyloDiversityCommand(string option)  {
                
                else {
                        //valid paramters for this command
-                       string Array[] =  {"freq","rarefy","iters","groups","outputdir","inputdir"};
+                       string Array[] =  {"freq","rarefy","iters","groups","processors","summary","collect","scale","outputdir","inputdir"};
                        vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
                        
                        OptionParser parser(option);
@@ -34,8 +83,14 @@ PhyloDiversityCommand::PhyloDiversityCommand(string option)  {
                                if (validParameter.isValidParameter(it->first, myArray, it->second) != true) {  abort = true;  }
                        }
                        
+                       //initialize outputTypes
+                       vector<string> tempOutNames;
+                       outputTypes["phylodiv"] = tempOutNames;
+                       outputTypes["rarefy"] = tempOutNames;
+                       outputTypes["summary"] = tempOutNames;
+                       
                        //if the user changes the output directory command factory will send this info to us in the output parameter 
-                       outputDir = validParameter.validFile(parameters, "outputdir", false);           if (outputDir == "not found"){  outputDir = "";         }
+                       outputDir = validParameter.validFile(parameters, "outputdir", false);           if (outputDir == "not found"){  outputDir = m->hasPath(globaldata->getTreeFile());              }
                        
                        if (globaldata->gTree.size() == 0) {//no trees were read
                                m->mothurOut("You must execute the read.tree command, before you may execute the phylo.diversity command."); m->mothurOutEndLine(); abort = true;  }
@@ -48,15 +103,29 @@ PhyloDiversityCommand::PhyloDiversityCommand(string option)  {
                        convert(temp, iters); 
                        
                        temp = validParameter.validFile(parameters, "rarefy", false);                   if (temp == "not found") { temp = "F"; }
-                       rarefy = isTrue(temp);
+                       rarefy = m->isTrue(temp);
                        if (!rarefy) { iters = 1;  }
                        
+                       temp = validParameter.validFile(parameters, "summary", false);                  if (temp == "not found") { temp = "T"; }
+                       summary = m->isTrue(temp);
+                       
+                       temp = validParameter.validFile(parameters, "scale", false);                    if (temp == "not found") { temp = "F"; }
+                       scale = m->isTrue(temp);
+                       
+                       temp = validParameter.validFile(parameters, "collect", false);                  if (temp == "not found") { temp = "F"; }
+                       collect = m->isTrue(temp);
+                       
+                       temp = validParameter.validFile(parameters, "processors", false);       if (temp == "not found"){       temp = "1";                             }
+                       convert(temp, processors); 
+                       
                        groups = validParameter.validFile(parameters, "groups", false);                 
                        if (groups == "not found") { groups = ""; Groups = globaldata->gTreemap->namesOfGroups;  globaldata->Groups = Groups;  }
                        else { 
-                               splitAtDash(groups, Groups);
+                               m->splitAtDash(groups, Groups);
                                globaldata->Groups = Groups;
                        }
+                       
+                       if ((!collect) && (!rarefy) && (!summary)) { m->mothurOut("No outputs selected. You must set either collect, rarefy or summary to true, summary=T by default."); m->mothurOutEndLine(); abort=true; }
                }
                
        }
@@ -70,11 +139,15 @@ PhyloDiversityCommand::PhyloDiversityCommand(string option)  {
 void PhyloDiversityCommand::help(){
        try {
                m->mothurOut("The phylo.diversity command can only be executed after a successful read.tree command.\n");
-               m->mothurOut("The phylo.diversity command parameters are groups, iters, freq and rarefy.  No parameters are required.\n");
+               m->mothurOut("The phylo.diversity command parameters are groups, iters, freq, processors, scale, rarefy, collect and summary.  No parameters are required.\n");
                m->mothurOut("The groups parameter allows you to specify which of the groups in your groupfile you would like analyzed. The group names are separated by dashes. By default all groups are used.\n");
                m->mothurOut("The iters parameter allows you to specify the number of randomizations to preform, by default iters=1000, if you set rarefy to true.\n");
                m->mothurOut("The freq parameter is used indicate when to output your data, by default it is set to 100. But you can set it to a percentage of the number of sequence. For example freq=0.10, means 10%. \n");
+               m->mothurOut("The scale parameter is used indicate that you want your ouptut scaled to the number of sequences sampled, default = false. \n");
                m->mothurOut("The rarefy parameter allows you to create a rarefaction curve. The default is false.\n");
+               m->mothurOut("The collect parameter allows you to create a collectors curve. The default is false.\n");
+               m->mothurOut("The summary parameter allows you to create a .summary file. The default is true.\n");
+               m->mothurOut("The processors parameter allows you to specify the number of processors to use. The default is 1.\n");
                m->mothurOut("The phylo.diversity command should be in the following format: phylo.diversity(groups=yourGroups, rarefy=yourRarefy, iters=yourIters).\n");
                m->mothurOut("Example phylo.diversity(groups=A-B-C, rarefy=T, iters=500).\n");
                m->mothurOut("The phylo.diversity command output two files: .phylo.diversity and if rarefy=T, .rarefaction.\n");
@@ -102,10 +175,7 @@ int PhyloDiversityCommand::execute(){
                for (int i = 0; i < globaldata->Groups.size(); i++) { if (globaldata->Groups[i] == "xxx") { globaldata->Groups.erase(globaldata->Groups.begin()+i);  break; }  }
                 
                vector<string> outputNames;
-               
-               //diversity calculator
-               PhyloDiversity phylo(globaldata->gTreemap);
-               
+                       
                vector<Tree*> trees = globaldata->gTree;
                
                //for each of the users trees
@@ -113,76 +183,90 @@ int PhyloDiversityCommand::execute(){
                
                        if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) {        remove(outputNames[i].c_str());         } return 0; }
                        
-                       phylo.setTotalGroupBranchLengths(trees[i]);
+                       ofstream outSum, outRare, outCollect;
+                       string outSumFile = outputDir + m->getRootName(m->getSimpleName(globaldata->getTreeFile()))  + toString(i+1) + ".phylodiv.summary";
+                       string outRareFile = outputDir + m->getRootName(m->getSimpleName(globaldata->getTreeFile()))  + toString(i+1) + ".phylodiv.rarefaction";
+                       string outCollectFile = outputDir + m->getRootName(m->getSimpleName(globaldata->getTreeFile()))  + toString(i+1) + ".phylodiv";
                        
-                       string outFile = outputDir + getRootName(getSimpleName(globaldata->getTreeFile()))  + toString(i+1) + ".phylo.diversity";
-                       if (rarefy) { outFile += ".rarefaction"; }
-                       outputNames.push_back(outFile);
+                       if (summary)    { m->openOutputFile(outSumFile, outSum); outputNames.push_back(outSumFile);             outputTypes["summary"].push_back(outSumFile);                   }
+                       if (rarefy)             { m->openOutputFile(outRareFile, outRare); outputNames.push_back(outRareFile);  outputTypes["rarefy"].push_back(outRareFile);                   }
+                       if (collect)    { m->openOutputFile(outCollectFile, outCollect); outputNames.push_back(outCollectFile);  outputTypes["phylodiv"].push_back(outCollectFile);  }
                        
                        int numLeafNodes = trees[i]->getNumLeaves();
                        
                        //create a vector containing indexes of leaf nodes, randomize it, select nodes to send to calculator
                        vector<int> randomLeaf;
                        for (int j = 0; j < numLeafNodes; j++) {  
-                               if (inUsersGroups(trees[i]->tree[j].getGroup(), globaldata->Groups) == true) { //is this a node from the group the user selected.
+                               if (m->inUsersGroups(trees[i]->tree[j].getGroup(), globaldata->Groups) == true) { //is this a node from the group the user selected.
                                        randomLeaf.push_back(j); 
                                }
                        }
                        
                        numLeafNodes = randomLeaf.size();  //reset the number of leaf nodes you are using 
                        
-                       //convert freq percentage to number
-                       int increment = 100;
-                       if (freq < 1.0) {  increment = numLeafNodes * freq;  }
-                       else { increment = freq;  }
+                       //each group, each sampling, if no rarefy iters = 1;
+                       map<string, vector<float> > diversity;
                        
                        //each group, each sampling, if no rarefy iters = 1;
-                       vector< vector<float> > diversity;
-                       diversity.resize(globaldata->Groups.size());
+                       map<string, vector<float> > sumDiversity;
+                       
+                       //find largest group total 
+                       int largestGroup = 0;
+                       for (int j = 0; j < globaldata->Groups.size(); j++) {  
+                               if (globaldata->gTreemap->seqsPerGroup[globaldata->Groups[j]] > largestGroup) { largestGroup = globaldata->gTreemap->seqsPerGroup[globaldata->Groups[j]]; }
+                               
+                               //initialize diversity
+                               diversity[globaldata->Groups[j]].resize(globaldata->gTreemap->seqsPerGroup[globaldata->Groups[j]]+1, 0.0);              //numSampled
+                                                                                                                                                                                                                       //groupA                0.0                     0.0
+                                                                                                                                                                                                                       
+                               //initialize sumDiversity
+                               sumDiversity[globaldata->Groups[j]].resize(globaldata->gTreemap->seqsPerGroup[globaldata->Groups[j]]+1, 0.0);
+                       }       
+
+                       //convert freq percentage to number
+                       int increment = 100;
+                       if (freq < 1.0) {  increment = largestGroup * freq;  
+                       }else { increment = freq;  }
                        
                        //initialize sampling spots
-                       vector<int> numSampledList;
-                       for(int k = 0; k < numLeafNodes; k++){  if((k == 0) || (k+1) % increment == 0){  numSampledList.push_back(k); }   }
-                       if(numLeafNodes % increment != 0){      numSampledList.push_back(numLeafNodes);   }
-                       
-                       //initialize diversity
-                       for (int j = 0; j < diversity.size(); j++) {   diversity[j].resize(numSampledList.size(), 0.0);  }  //                  10sampled       20 sampled ...
-                                                                                                                                                                                                                               //groupA                0.0                     0.0
-                                                                                                                                                                                                                       //then for each iter you add to score and then when printing divide by iters to get average
-                       for (int l = 0; l < iters; l++) {
-                               random_shuffle(randomLeaf.begin(), randomLeaf.end());
-               
-                               vector<int> leavesSampled;
-                               EstOutput data;
-                               int count = 0;
-                               for(int k = 0; k < numLeafNodes; k++){
-                                               
-                                       if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) {        remove(outputNames[i].c_str());         } return 0; }
-                                       
-                                       leavesSampled.push_back(randomLeaf[k]);
+                       set<int> numSampledList;
+                       for(int k = 1; k <= largestGroup; k++){  if((k == 1) || (k % increment == 0)){  numSampledList.insert(k); }   }
+                       if(largestGroup % increment != 0){      numSampledList.insert(largestGroup);   }
+                       
+                       //add other groups ending points
+                       for (int j = 0; j < globaldata->Groups.size(); j++) {  
+                               if (numSampledList.count(diversity[globaldata->Groups[j]].size()-1) == 0) {  numSampledList.insert(diversity[globaldata->Groups[j]].size()-1); }
+                       }
+                       
+                       #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+                               if(processors == 1){
+                                       driver(trees[i], diversity, sumDiversity, iters, increment, randomLeaf, numSampledList, outCollect, outSum, true);      
+                               }else{
+                                       if (rarefy) {
+                                               vector<int> procIters;
                                                
-                                       if((k == 0) || (k+1) % increment == 0){ //ready to calc?
+                                               int numItersPerProcessor = iters / processors;
                                                
-                                               data = phylo.getValues(trees[i], leavesSampled);
+                                               //divide iters between processes
+                                               for (int h = 0; h < processors; h++) {
+                                                       if(h == processors - 1){
+                                                               numItersPerProcessor = iters - h * numItersPerProcessor;
+                                                       }
+                                                       procIters.push_back(numItersPerProcessor);
+                                               }
                                                
-                                               //datas results are in the same order as globaldatas groups
-                                               for (int h = 0; h < data.size(); h++) {  diversity[h][count] += data[h];  }
+                                               createProcesses(procIters, trees[i], diversity, sumDiversity, iters, increment, randomLeaf, numSampledList, outCollect, outSum); 
                                                
-                                               count++;
+                                       }else{ //no need to paralellize if you dont want to rarefy
+                                               driver(trees[i], diversity, sumDiversity, iters, increment, randomLeaf, numSampledList, outCollect, outSum, true);      
                                        }
                                }
-               
-                               if(numLeafNodes % increment != 0){      
-                                       
-                                       data = phylo.getValues(trees[i], leavesSampled);
-                                       
-                                       //datas results are in the same order as globaldatas groups
-                                       for (int h = 0; h < data.size(); h++) {  diversity[h][count] += data[h];  }
-                               }
-                       }
-                       
-                       printData(numSampledList, diversity, outFile);
 
+                       #else
+                               driver(trees[i], diversity, sumDiversity, iters, increment, randomLeaf, numSampledList, outCollect, outSum, true);      
+                       #endif
+
+                       if (rarefy) {   printData(numSampledList, sumDiversity, outRare, iters);        }
                }
                
        
@@ -202,11 +286,186 @@ int PhyloDiversityCommand::execute(){
        }
 }
 //**********************************************************************************************************************
+int PhyloDiversityCommand::createProcesses(vector<int>& procIters, Tree* t, map< string, vector<float> >& div, map<string, vector<float> >& sumDiv, int numIters, int increment, vector<int>& randomLeaf, set<int>& numSampledList, ofstream& outCollect, ofstream& outSum){
+       try {
+               #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+               int process = 1;
+               int num = 0;
+               vector<int> processIDS;
+               map< string, vector<float> >::iterator itSum;
+               
+               EstOutput results;
+               
+               //loop through and create all the processes you want
+               while (process != processors) {
+                       int pid = fork();
+                       
+                       if (pid > 0) {
+                               processIDS.push_back(pid);  //create map from line number to pid so you can append files in correct order later
+                               process++;
+                       }else if (pid == 0){
+                               driver(t, div, sumDiv, procIters[process], increment, randomLeaf, numSampledList, outCollect, outSum, false);
+                               
+                               string outTemp = outputDir + toString(getpid()) + ".sumDiv.temp";
+                               ofstream out;
+                               m->openOutputFile(outTemp, out);
+                               
+                               //output the sumDIversity
+                               for (itSum = sumDiv.begin(); itSum != sumDiv.end(); itSum++) {
+                                       out << itSum->first << '\t' << (itSum->second).size() << '\t';
+                                       for (int k = 0; k < (itSum->second).size(); k++) { 
+                                               out << (itSum->second)[k] << '\t';
+                                       }
+                                       out << endl;
+                               }
+                               
+                               out.close();
+                               
+                               exit(0);
+                       }else { m->mothurOut("unable to spawn the necessary processes."); m->mothurOutEndLine(); exit(0); }
+               }
+               
+               driver(t, div, sumDiv, procIters[0], increment, randomLeaf, numSampledList, outCollect, outSum, true);
+               
+               //force parent to wait until all the processes are done
+               for (int i=0;i<(processors-1);i++) { 
+                       int temp = processIDS[i];
+                       wait(&temp);
+               }
+               
+               //get data created by processes
+               for (int i=0;i<(processors-1);i++) { 
+                       
+                       //input the sumDIversity
+                       string inTemp = outputDir + toString(processIDS[i]) + ".sumDiv.temp";
+                       ifstream in;
+                       m->openInputFile(inTemp, in);
+                               
+                       //output the sumDIversity
+                       for (int j = 0; j < sumDiv.size(); j++) { 
+                               string group = "";
+                               int size = 0;
+                               
+                               in >> group >> size; m->gobble(in);
+                               
+                               for (int k = 0; k < size; k++) { 
+                                       float tempVal;
+                                       in >> tempVal;
+                                       
+                                       sumDiv[group][k] += tempVal;
+                               }
+                               m->gobble(in);
+                       }
+                               
+                       in.close();
+                       remove(inTemp.c_str());
+               }
+               
+#endif
 
-void PhyloDiversityCommand::printData(vector<int>& num, vector< vector<float> >& div, string file){
+       return 0;               
+       
+       }
+       catch(exception& e) {
+               m->errorOut(e, "PhyloDiversityCommand", "createProcesses");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+int PhyloDiversityCommand::driver(Tree* t, map< string, vector<float> >& div, map<string, vector<float> >& sumDiv, int numIters, int increment, vector<int>& randomLeaf, set<int>& numSampledList, ofstream& outCollect, ofstream& outSum, bool doSumCollect){
+       try {
+               int numLeafNodes = randomLeaf.size();
+       
+               for (int l = 0; l < numIters; l++) {
+                               random_shuffle(randomLeaf.begin(), randomLeaf.end());
+               
+                               //initialize counts
+                               map<string, int> counts;
+                               map< string, set<int> > countedBranch;  
+                               for (int j = 0; j < globaldata->Groups.size(); j++) {  counts[globaldata->Groups[j]] = 0; countedBranch[globaldata->Groups[j]].insert(-2);  }  //add dummy index to initialize countedBranch sets
+                               
+                               for(int k = 0; k < numLeafNodes; k++){
+                                               
+                                       if (m->control_pressed) { return 0; }
+                                       
+                                       //calc branch length of randomLeaf k
+                                       vector<float> br = calcBranchLength(t, randomLeaf[k], countedBranch);
+                       
+                                       //for each group in the groups update the total branch length accounting for the names file
+                                       vector<string> groups = t->tree[randomLeaf[k]].getGroup();
+                                       
+                                       for (int j = 0; j < groups.size(); j++) {
+                                               int numSeqsInGroupJ = 0;
+                                               map<string, int>::iterator it;
+                                               it = t->tree[randomLeaf[k]].pcount.find(groups[j]);
+                                               if (it != t->tree[randomLeaf[k]].pcount.end()) { //this leaf node contains seqs from group j
+                                                       numSeqsInGroupJ = it->second;
+                                               }
+                                               
+                                               if (numSeqsInGroupJ != 0) {     div[groups[j]][(counts[groups[j]]+1)] = div[groups[j]][counts[groups[j]]] + br[j];  }
+                                               
+                                               for (int s = (counts[groups[j]]+2); s <= (counts[groups[j]]+numSeqsInGroupJ); s++) {
+                                                       div[groups[j]][s] = div[groups[j]][s-1];  //update counts, but don't add in redundant branch lengths
+                                               }
+                                               counts[groups[j]] += numSeqsInGroupJ;
+                                       }
+                               }
+                               
+                               if (rarefy) {
+                                       //add this diversity to the sum
+                                       for (int j = 0; j < globaldata->Groups.size(); j++) {  
+                                               for (int g = 0; g < div[globaldata->Groups[j]].size(); g++) {
+                                                       sumDiv[globaldata->Groups[j]][g] += div[globaldata->Groups[j]][g];
+                                               }
+                                       }
+                               }
+                               
+                               if ((collect) && (l == 0) && doSumCollect) {  printData(numSampledList, div, outCollect, 1);  }
+                               if ((summary) && (l == 0) && doSumCollect) {  printSumData(div, outSum, 1);  }
+                       }
+                       
+                       return 0;
+
+       }
+       catch(exception& e) {
+               m->errorOut(e, "PhyloDiversityCommand", "driver");
+               exit(1);
+       }
+}
+
+//**********************************************************************************************************************
+
+void PhyloDiversityCommand::printSumData(map< string, vector<float> >& div, ofstream& out, int numIters){
+       try {
+               
+               out << "Groups\tnumSampled\tphyloDiversity" << endl;
+               
+               out.setf(ios::fixed, ios::floatfield); out.setf(ios::showpoint);
+                       
+               for (int j = 0; j < globaldata->Groups.size(); j++) {
+                       int numSampled = (div[globaldata->Groups[j]].size()-1);
+                       out << globaldata->Groups[j] << '\t' << numSampled << '\t';
+               
+                        
+                       float score;
+                       if (scale)      {  score = (div[globaldata->Groups[j]][numSampled] / (float)numIters) / (float)numSampled;      }
+                       else            {       score = div[globaldata->Groups[j]][numSampled] / (float)numIters;       }
+                               
+                       out << setprecision(4) << score << endl;
+               }
+                                       
+               out.close();
+               
+       }
+       catch(exception& e) {
+               m->errorOut(e, "PhyloDiversityCommand", "printSumData");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+
+void PhyloDiversityCommand::printData(set<int>& num, map< string, vector<float> >& div, ofstream& out, int numIters){
        try {
-               ofstream out;
-               openOutputFile(file, out);
                
                out << "numSampled\t";
                for (int i = 0; i < globaldata->Groups.size(); i++) { out << globaldata->Groups[i] << '\t';  }
@@ -214,13 +473,19 @@ void PhyloDiversityCommand::printData(vector<int>& num, vector< vector<float> >&
                
                out.setf(ios::fixed, ios::floatfield); out.setf(ios::showpoint);
                
-               for (int i = 0; i < num.size(); i++) {  
-                       if (i == (num.size()-1)) {  out << num[i] << '\t';  }
-                       else {  out << (num[i]+1) << '\t';  }
+               for (set<int>::iterator it = num.begin(); it != num.end(); it++) {  
+                       int numSampled = *it;
+                       
+                       out << numSampled << '\t';  
                        
-                       for (int j = 0; j < div.size(); j++) {
-                               float score = div[j][i] / (float)iters;
-                               out << setprecision(6) << score << '\t';
+                       for (int j = 0; j < globaldata->Groups.size(); j++) {
+                               if (numSampled < div[globaldata->Groups[j]].size()) { 
+                                       float score;
+                                       if (scale)      {  score = (div[globaldata->Groups[j]][numSampled] / (float)numIters) / (float)numSampled;      }
+                                       else            {       score = div[globaldata->Groups[j]][numSampled] / (float)numIters;       }
+
+                                       out << setprecision(4) << score << '\t';
+                               }else { out << "NA" << '\t'; }
                        }
                        out << endl;
                }
@@ -233,5 +498,97 @@ void PhyloDiversityCommand::printData(vector<int>& num, vector< vector<float> >&
                exit(1);
        }
 }
-
 //**********************************************************************************************************************
+//need a vector of floats one branch length for every group the node represents.
+vector<float> PhyloDiversityCommand::calcBranchLength(Tree* t, int leaf, map< string, set<int> >& counted){
+       try {
+
+               //calc the branch length
+               //while you aren't at root
+               vector<float> sums; 
+               int index = leaf;
+               
+               vector<string> groups = t->tree[leaf].getGroup();
+               sums.resize(groups.size(), 0.0);
+               
+               map<string, map<int, double> > tempTotals; //maps node to total Branch Length
+               map< string, set<int> > tempCounted;
+               set<int>::iterator it;
+       
+               //you are a leaf
+               if(t->tree[index].getBranchLength() != -1){     
+                       for (int k = 0; k < groups.size(); k++) { 
+                               sums[k] += abs(t->tree[index].getBranchLength());       
+                               counted[groups[k]].insert(index);
+                       }
+               }
+               
+               for (int k = 0; k < groups.size(); k++) { 
+                       tempTotals[groups[k]][index] = 0.0;     
+               }
+               
+               index = t->tree[index].getParent();     
+                       
+               //while you aren't at root
+               while(t->tree[index].getParent() != -1){
+
+                       if (m->control_pressed) {  return sums; }
+                       
+                       int pcountSize = 0;     
+                       for (int k = 0; k < groups.size(); k++) {
+                               map<string, int>::iterator itGroup = t->tree[index].pcount.find(groups[k]);
+                               if (itGroup != t->tree[index].pcount.end()) { pcountSize++;  } 
+                       
+                               //do both your chidren have have descendants from the users groups? 
+                               int lc = t->tree[index].getLChild();
+                               int rc = t->tree[index].getRChild();
+                       
+                               int LpcountSize = 0;
+                               itGroup = t->tree[lc].pcount.find(groups[k]);
+                               if (itGroup != t->tree[lc].pcount.end()) { LpcountSize++;  } 
+                                                       
+                               int RpcountSize = 0;
+                               itGroup = t->tree[rc].pcount.find(groups[k]);
+                               if (itGroup != t->tree[rc].pcount.end()) { RpcountSize++;  } 
+                                                               
+                               //if yes, add your childrens tempTotals
+                               if ((LpcountSize != 0) && (RpcountSize != 0)) {
+                                       sums[k] += tempTotals[groups[k]][lc] + tempTotals[groups[k]][rc]; 
+                                       
+                                       for (it = tempCounted[groups[k]].begin(); it != tempCounted[groups[k]].end(); it++) { counted[groups[k]].insert(*it); }
+
+                                       //cout << "added to total " << tempTotals[lc] << '\t' << tempTotals[rc] << endl;
+                                       if (t->tree[index].getBranchLength() != -1) {
+                                               if (counted[groups[k]].count(index) == 0) {
+                                                       tempTotals[groups[k]][index] = abs(t->tree[index].getBranchLength());
+                                                       tempCounted[groups[k]].insert(index);
+                                               }else{
+                                                       tempTotals[groups[k]][index] = 0.0;
+                                               }
+                                       }else {
+                                               tempTotals[groups[k]][index] = 0.0;
+                                       }
+                               }else { //if no, your tempTotal is your childrens temp totals + your branch length
+                                       tempTotals[groups[k]][index] = tempTotals[groups[k]][lc] + tempTotals[groups[k]][rc]; 
+                                                                       
+                                       if (counted[groups[k]].count(index) == 0) {
+                                               tempTotals[groups[k]][index] += abs(t->tree[index].getBranchLength());
+                                               tempCounted[groups[k]].insert(index);
+                                       }
+
+                               }
+                               //cout << "temptotal = "<< tempTotals[i] << endl;
+                       }
+                       
+                       index = t->tree[index].getParent();     
+               }
+
+               return sums;
+
+       }
+       catch(exception& e) {
+               m->errorOut(e, "PhyloDiversityCommand", "calcBranchLength");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
\ No newline at end of file