]> git.donarmstrong.com Git - mothur.git/blobdiff - unweighted.cpp
sped up unifrac unweighted.
[mothur.git] / unweighted.cpp
index 687786a71e783bdb4df476eb17d6864e07238974..d9b3b586ad7487b0782277955c3ad53e40642851 100644 (file)
@@ -19,9 +19,6 @@ EstOutput Unweighted::getValues(Tree* t) {
                double UniqueBL;  //a branch length is unique if it's chidren are from the same group
                double totalBL; //all branch lengths
                double UW;              //Unweighted Value = UniqueBL / totalBL;
-               map<string, int>::iterator it;  //iterator to traverse pgroups
-               map<string, int> copyIpcount;
-
        
                //if the users enters no groups then give them the score of all groups
                int numGroups = globaldata->Groups.size();
@@ -43,55 +40,30 @@ EstOutput Unweighted::getValues(Tree* t) {
                                UniqueBL=0.0000;  //a branch length is unique if it's chidren are from the same group
                                totalBL = 0.00; //all branch lengths
                                UW = 0.00;              //Unweighted Value = UniqueBL / totalBL;
-                               copyIpcount.clear();
+                               //copyIpcount.clear();
                                
                                //groups in this combo
                                groups.push_back(globaldata->Groups[a]); groups.push_back(globaldata->Groups[l]);
                
-                               for(int i=t->getNumLeaves();i<t->getNumNodes();i++){
-               
-                                       int lc = t->tree[i].getLChild();  //lc = vector index of left child
-                                       int rc = t->tree[i].getRChild();  //rc = vector index of right child
-                       
-                                       /**********************************************************************/
-                                       //This section adds in all lengths that are non leaf
-                       
-                                       copyIpcount = t->tree[i].pcount;
-                                       for (it = copyIpcount.begin(); it != copyIpcount.end(); it++) {
-                                               if (inUsersGroups(it->first, groups) != true) { copyIpcount.erase(it->first);   }
+                               for(int i=0;i<t->getNumNodes();i++){
+                                       if (m->control_pressed) {  return data; }
+       
+                                       //pcountSize = 0, they are from a branch that is entirely from a group the user doesn't want
+                                       //pcountSize = 2, not unique to one group
+                                       //pcountSize = 1, unique to one group
+                                       
+                                       int pcountSize = 0;
+                                       for (int j = 0; j < groups.size(); j++) {
+                                               map<string, int>::iterator itGroup = t->tree[i].pcount.find(groups[j]);
+                                               if (itGroup != t->tree[i].pcount.end()) { pcountSize++; if (pcountSize > 1) { break; } } 
                                        }
+                                       
+                                       if (pcountSize == 0) { }
+                                       else if ((t->tree[i].getBranchLength() != -1) && (pcountSize == 1)) {  UniqueBL += abs(t->tree[i].getBranchLength());   }
                        
-                                       //if i's children are from the same group then i's pcount size will be 1 
-                                       //if copyIpcount.size() = 0 they are from a branch that is entirely from a group the user doesn't want
-                                       if (copyIpcount.size() == 0) { }
-                                       else if ((t->tree[i].getBranchLength() != -1) && (copyIpcount.size() == 1)) {  UniqueBL += abs(t->tree[i].getBranchLength());   }
-                       
-                                       //add i's BL to total if it is from the groups the user wants
-                                       if ((t->tree[i].getBranchLength() != -1) && (copyIpcount.size() != 0)) {  
+                                       if ((t->tree[i].getBranchLength() != -1) && (pcountSize != 0)) {  
                                                totalBL += abs(t->tree[i].getBranchLength()); 
                                        }
-                       
-                                       /**********************************************************************/
-                                       //This section adds in all lengths that are leaf
-                       
-                                       //if i's chidren are leaves
-                                       if (t->tree[rc].getRChild() == -1) {
-                                               //if rc is a valid group and rc has a BL
-                                               if ((inUsersGroups(t->tree[rc].getGroup(), groups) == true) && (t->tree[rc].getBranchLength() != -1)) {
-                                                       UniqueBL += abs(t->tree[rc].getBranchLength());
-                                                       totalBL += abs(t->tree[rc].getBranchLength()); 
-                                               }
-                                       }
-                       
-                                       if (t->tree[lc].getLChild() == -1) {
-                                               //if lc is a valid group and lc has a BL
-                                               if ((inUsersGroups(t->tree[lc].getGroup(), groups) == true) && (t->tree[lc].getBranchLength() != -1)) {
-                                                       UniqueBL += abs(t->tree[lc].getBranchLength());
-                                                       totalBL += abs(t->tree[lc].getBranchLength()); 
-                                               }
-                                       }
-                       
-                                       /**********************************************************************/
                                }
                
                                UW = (UniqueBL / totalBL);  
@@ -122,52 +94,27 @@ EstOutput Unweighted::getValues(Tree* t) {
                        UniqueBL=0.0000;  //a branch length is unique if it's chidren are from the same group
                        totalBL = 0.00; //all branch lengths
                        UW = 0.00;              //Unweighted Value = UniqueBL / totalBL;
-                       copyIpcount.clear();
                                
-                       for(int i=t->getNumLeaves();i<t->getNumNodes();i++){
-               
-                               int lc = t->tree[i].getLChild();  //lc = vector index of left child
-                               int rc = t->tree[i].getRChild();  //rc = vector index of right child
-                       
-                               /**********************************************************************/
-                               //This section adds in all lengths that are non leaf
+                       for(int i=0;i<t->getNumNodes();i++){
                        
-                               copyIpcount = t->tree[i].pcount;
-                               for (it = copyIpcount.begin(); it != copyIpcount.end(); it++) {
-                                       if (inUsersGroups(it->first, groups) != true) { copyIpcount.erase(it->first);   }
+                               if (m->control_pressed) {  return data; }
+                               
+                               //pcountSize = 0, they are from a branch that is entirely from a group the user doesn't want
+                               //pcountSize = 2, not unique to one group
+                               //pcountSize = 1, unique to one group
+                               
+                               int pcountSize = 0;
+                               for (int j = 0; j < groups.size(); j++) {
+                                       map<string, int>::iterator itGroup = t->tree[i].pcount.find(groups[j]);
+                                       if (itGroup != t->tree[i].pcount.end()) { pcountSize++; if (pcountSize > 1) { break; } } 
                                }
-                       
-                               //if i's children are from the same group then i's pcount size will be 1 
-                               //if copyIpcount.size() = 0 they are from a branch that is entirely from a group the user doesn't want
-                               if (copyIpcount.size() == 0) { }
-                               else if ((t->tree[i].getBranchLength() != -1) && (copyIpcount.size() == 1)) {  UniqueBL += abs(t->tree[i].getBranchLength());   }
-                       
-                               //add i's BL to total if it is from the groups the user wants
-                               if ((t->tree[i].getBranchLength() != -1) && (copyIpcount.size() != 0)) {  
+                               
+                               if (pcountSize == 0) { }
+                               else if ((t->tree[i].getBranchLength() != -1) && (pcountSize == 1)) {  UniqueBL += abs(t->tree[i].getBranchLength());   }
+                                       
+                               if ((t->tree[i].getBranchLength() != -1) && (pcountSize != 0)) {  
                                        totalBL += abs(t->tree[i].getBranchLength()); 
                                }
-                       
-                               /**********************************************************************/
-                               //This section adds in all lengths that are leaf
-                       
-                               //if i's chidren are leaves
-                               if (t->tree[rc].getRChild() == -1) {
-                                       //if rc is a valid group and rc has a BL
-                                       if ((inUsersGroups(t->tree[rc].getGroup(), groups) == true) && (t->tree[rc].getBranchLength() != -1)) {
-                                               UniqueBL += abs(t->tree[rc].getBranchLength());
-                                               totalBL += abs(t->tree[rc].getBranchLength()); 
-                                       }
-                               }
-                       
-                               if (t->tree[lc].getLChild() == -1) {
-                                       //if lc is a valid group and lc has a BL
-                                       if ((inUsersGroups(t->tree[lc].getGroup(), groups) == true) && (t->tree[lc].getBranchLength() != -1)) {
-                                               UniqueBL += abs(t->tree[lc].getBranchLength());
-                                               totalBL += abs(t->tree[lc].getBranchLength()); 
-                                       }
-                               }
-                       
-                               /**********************************************************************/
                        }
                
                        UW = (UniqueBL / totalBL);  
@@ -181,7 +128,7 @@ EstOutput Unweighted::getValues(Tree* t) {
        
        }
        catch(exception& e) {
-               errorOut(e, "Unweighted", "getValues");
+               m->errorOut(e, "Unweighted", "getValues");
                exit(1);
        }
 }
@@ -196,8 +143,6 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
                double UniqueBL;  //a branch length is unique if it's chidren are from the same group
                double totalBL; //all branch lengths
                double UW;              //Unweighted Value = UniqueBL / totalBL;
-               map<string, int>::iterator it;  //iterator to traverse pgroups
-               map<string, int> copyIpcount;
                copyTree = new Tree;
 
                //if the users enters no groups then give them the score of all groups
@@ -220,7 +165,6 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
                                UniqueBL=0.0000;  //a branch length is unique if it's chidren are from the same group
                                totalBL = 0.00; //all branch lengths
                                UW = 0.00;              //Unweighted Value = UniqueBL / totalBL;
-                               copyIpcount.clear();
                                
                                //copy random tree passed in
                                copyTree->getCopy(t);
@@ -231,54 +175,31 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
                                //swap labels in the groups you want to compare
                                copyTree->assembleRandomUnifracTree(groups[0], groups[1]);
                                
-                               //copyTree->createNewickFile("random"+groupA+toString(count));
-               
-                               for(int i=copyTree->getNumLeaves();i<copyTree->getNumNodes();i++){
-               
-                                       int lc = copyTree->tree[i].getLChild();  //lc = vector index of left child
-                                       int rc = copyTree->tree[i].getRChild();  //rc = vector index of right child
-                       
-                                       /**********************************************************************/
-                                       //This section adds in all lengths that are non leaf
-                       
-                                       copyIpcount = copyTree->tree[i].pcount;
-                                       for (it = copyIpcount.begin(); it != copyIpcount.end(); it++) {
-                                               if (inUsersGroups(it->first, groups) != true) { copyIpcount.erase(it->first);   }
+                               if (m->control_pressed) { delete copyTree; return data; }
+                               
+                               for(int i=0;i<copyTree->getNumNodes();i++){
+                       
+                                       if (m->control_pressed) {  return data; }
+                                       
+                                       //pcountSize = 0, they are from a branch that is entirely from a group the user doesn't want
+                                       //pcountSize = 2, not unique to one group
+                                       //pcountSize = 1, unique to one group
+                                       
+                                       int pcountSize = 0;
+                                       for (int j = 0; j < groups.size(); j++) {
+                                               map<string, int>::iterator itGroup = copyTree->tree[i].pcount.find(groups[j]);
+                                               if (itGroup != copyTree->tree[i].pcount.end()) { pcountSize++; if (pcountSize > 1) { break; } } 
                                        }
-                       
-                                       //if i's children are from the same group then i's pcount size will be 1 
-                                       //if copyIpcount.size() = 0 they are from a branch that is entirely from a group the user doesn't want
-                                       if (copyIpcount.size() == 0) { }
-                                       else if ((copyTree->tree[i].getBranchLength() != -1) && (copyIpcount.size() == 1)) {  UniqueBL += abs(copyTree->tree[i].getBranchLength());     }
-                       
-                                       //add i's BL to total if it is from the groups the user wants
-                                       if ((copyTree->tree[i].getBranchLength() != -1) && (copyIpcount.size() != 0)) {  
+                                       
+                                       if (pcountSize == 0) { }
+                                       else if ((copyTree->tree[i].getBranchLength() != -1) && (pcountSize == 1)) {  UniqueBL += abs(copyTree->tree[i].getBranchLength());     }
+                                               
+                                       if ((copyTree->tree[i].getBranchLength() != -1) && (pcountSize != 0)) {  
                                                totalBL += abs(copyTree->tree[i].getBranchLength()); 
                                        }
-                       
-                                       /**********************************************************************/
-                                       //This section adds in all lengths that are leaf
-                       
-                                       //if i's chidren are leaves
-                                       if (copyTree->tree[rc].getRChild() == -1) {
-                                               //if rc is a valid group and rc has a BL
-                                               if ((inUsersGroups(copyTree->tree[rc].getGroup(), groups) == true) && (copyTree->tree[rc].getBranchLength() != -1)) {
-                                                       UniqueBL += abs(copyTree->tree[rc].getBranchLength());
-                                                       totalBL += abs(copyTree->tree[rc].getBranchLength()); 
-                                               }
-                                       }
-                       
-                                       if (copyTree->tree[lc].getLChild() == -1) {
-                                               //if lc is a valid group and lc has a BL
-                                               if ((inUsersGroups(copyTree->tree[lc].getGroup(), groups) == true) && (copyTree->tree[lc].getBranchLength() != -1)) {
-                                                       UniqueBL += abs(copyTree->tree[lc].getBranchLength());
-                                                       totalBL += abs(copyTree->tree[lc].getBranchLength()); 
-                                               }
-                                       }
-                       
-                                       /**********************************************************************/
                                }
-               
+
+                               
                                UW = (UniqueBL / totalBL);  
        
                                if (isnan(UW) || isinf(UW)) { UW = 0; }
@@ -307,58 +228,35 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
                        UniqueBL=0.0000;  //a branch length is unique if it's chidren are from the same group
                        totalBL = 0.00; //all branch lengths
                        UW = 0.00;              //Unweighted Value = UniqueBL / totalBL;
-                       copyIpcount.clear();
                
                        //copy random tree passed in
                        copyTree->getCopy(t);
                                
                        //swap labels in all the groups you want to compare
                        copyTree->assembleRandomUnifracTree(groups);
-
-                       for(int i=copyTree->getNumLeaves();i<copyTree->getNumNodes();i++){
-               
-                               int lc = copyTree->tree[i].getLChild();  //lc = vector index of left child
-                               int rc = copyTree->tree[i].getRChild();  //rc = vector index of right child
                        
-                               /**********************************************************************/
-                               //This section adds in all lengths that are non leaf
+                       if (m->control_pressed) { delete copyTree; return data; }
+
+                       for(int i=0;i<copyTree->getNumNodes();i++){
                        
-                               copyIpcount = copyTree->tree[i].pcount;
-                               for (it = copyIpcount.begin(); it != copyIpcount.end(); it++) {
-                                       if (inUsersGroups(it->first, groups) != true) { copyIpcount.erase(it->first);   }
+                               if (m->control_pressed) {  return data; }
+                               
+                               //pcountSize = 0, they are from a branch that is entirely from a group the user doesn't want
+                               //pcountSize = 2, not unique to one group
+                               //pcountSize = 1, unique to one group
+                               
+                               int pcountSize = 0;
+                               for (int j = 0; j < groups.size(); j++) {
+                                       map<string, int>::iterator itGroup = copyTree->tree[i].pcount.find(groups[j]);
+                                       if (itGroup != copyTree->tree[i].pcount.end()) { pcountSize++; if (pcountSize > 1) { break; } } 
                                }
-                       
-                               //if i's children are from the same group then i's pcount size will be 1 
-                               //if copyIpcount.size() = 0 they are from a branch that is entirely from a group the user doesn't want
-                               if (copyIpcount.size() == 0) { }
-                               else if ((copyTree->tree[i].getBranchLength() != -1) && (copyIpcount.size() == 1)) {  abs(UniqueBL += copyTree->tree[i].getBranchLength());     }
-                       
-                               //add i's BL to total if it is from the groups the user wants
-                               if ((copyTree->tree[i].getBranchLength() != -1) && (copyIpcount.size() != 0)) {  
+                               
+                               if (pcountSize == 0) { }
+                               else if ((copyTree->tree[i].getBranchLength() != -1) && (pcountSize == 1)) {  UniqueBL += abs(copyTree->tree[i].getBranchLength());     }
+                                       
+                               if ((copyTree->tree[i].getBranchLength() != -1) && (pcountSize != 0)) {  
                                        totalBL += abs(copyTree->tree[i].getBranchLength()); 
                                }
-                       
-                               /**********************************************************************/
-                               //This section adds in all lengths that are leaf
-                       
-                               //if i's chidren are leaves
-                               if (copyTree->tree[rc].getRChild() == -1) {
-                                       //if rc is a valid group and rc has a BL
-                                       if ((inUsersGroups(copyTree->tree[rc].getGroup(), groups) == true) && (copyTree->tree[rc].getBranchLength() != -1)) {
-                                               UniqueBL += abs(copyTree->tree[rc].getBranchLength());
-                                               totalBL += abs(copyTree->tree[rc].getBranchLength()); 
-                                       }
-                               }
-                       
-                               if (copyTree->tree[lc].getLChild() == -1) {
-                                       //if lc is a valid group and lc has a BL
-                                       if ((inUsersGroups(copyTree->tree[lc].getGroup(), groups) == true) && (copyTree->tree[lc].getBranchLength() != -1)) {
-                                               UniqueBL += abs(copyTree->tree[lc].getBranchLength());
-                                               totalBL += abs(copyTree->tree[lc].getBranchLength()); 
-                                       }
-                               }
-                       
-                               /**********************************************************************/
                        }
                
                        UW = (UniqueBL / totalBL);  
@@ -374,7 +272,7 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
        
        }
        catch(exception& e) {
-               errorOut(e, "Unweighted", "getValues");
+               m->errorOut(e, "Unweighted", "getValues");
                exit(1);
        }
 }