bugs fixes while testing for 1.5 release

[mothur.git] / unweighted.cpp

diff --git a/unweighted.cpp b/unweighted.cpp
index 405dfd2b3feaf4c1a5327526936a7baaaa4aba0a..c39e6629df1c2749928833fe24af65d48e853d64 100644 (file)
--- a/unweighted.cpp
+++ b/unweighted.cpp
@@ -57,18 +57,20 @@ EstOutput Unweighted::getValues(Tree* t) {
                                        //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 (it = copyIpcount.begin(); it != copyIpcount.end();) {
+                                               if (inUsersGroups(it->first, groups) != true) { 
+                                                       copyIpcount.erase(it++);        
+                                               }else { it++;  }
                                        }
                        
                                        //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 += t->tree[i].getBranchLength();        }
+                                       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)) {  
-                                               totalBL += t->tree[i].getBranchLength(); 
+                                               totalBL += abs(t->tree[i].getBranchLength()); 
                                        }
                        
                                        /**********************************************************************/
@@ -78,16 +80,16 @@ EstOutput Unweighted::getValues(Tree* t) {
                                        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 += t->tree[rc].getBranchLength();
-                                                       totalBL += t->tree[rc].getBranchLength(); 
+                                                       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 += t->tree[lc].getBranchLength();
-                                                       totalBL += t->tree[lc].getBranchLength(); 
+                                                       UniqueBL += abs(t->tree[lc].getBranchLength());
+                                                       totalBL += abs(t->tree[lc].getBranchLength()); 
                                                }
                                        }
                        
@@ -109,7 +111,9 @@ EstOutput Unweighted::getValues(Tree* t) {
                        if (numGroups == 0) {
                                //get score for all users groups
                                for (int i = 0; i < tmap->namesOfGroups.size(); i++) {
-                                       groups.push_back(tmap->namesOfGroups[i]);
+                                       if (tmap->namesOfGroups[i] != "xxx") {
+                                               groups.push_back(tmap->namesOfGroups[i]);
+                                       }
                                }
                        }else {
                                for (int i = 0; i < globaldata->Groups.size(); i++) {
@@ -131,18 +135,20 @@ EstOutput Unweighted::getValues(Tree* t) {
                                //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 (it = copyIpcount.begin(); it != copyIpcount.end();) {
+                                       if (inUsersGroups(it->first, groups) != true) { 
+                                               copyIpcount.erase(it++);        
+                                       }else {  it++;  }
                                }
                        
                                //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 += t->tree[i].getBranchLength();        }
+                               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)) {  
-                                       totalBL += t->tree[i].getBranchLength(); 
+                                       totalBL += abs(t->tree[i].getBranchLength()); 
                                }
                        
                                /**********************************************************************/
@@ -152,16 +158,16 @@ EstOutput Unweighted::getValues(Tree* t) {
                                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 += t->tree[rc].getBranchLength();
-                                               totalBL += t->tree[rc].getBranchLength(); 
+                                               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 += t->tree[lc].getBranchLength();
-                                               totalBL += t->tree[lc].getBranchLength(); 
+                                               UniqueBL += abs(t->tree[lc].getBranchLength());
+                                               totalBL += abs(t->tree[lc].getBranchLength()); 
                                        }
                                }
                        
@@ -179,14 +185,9 @@ EstOutput Unweighted::getValues(Tree* t) {
        
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the Unweighted class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-       catch(...) {
-               cout << "An unknown error has occurred in the Unweighted class function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               errorOut(e, "Unweighted", "getValues");
                exit(1);
        }
-
 }
 
 /**************************************************************************************************/
@@ -243,20 +244,21 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
                        
                                        /**********************************************************************/
                                        //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);   }
+                                       for (it = copyIpcount.begin(); it != copyIpcount.end();) {
+                                               if (inUsersGroups(it->first, groups) != true) { 
+                                                       copyIpcount.erase(it++);        
+                                               }else { it++;  }
                                        }
                        
                                        //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 += copyTree->tree[i].getBranchLength();  }
+                                       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)) {  
-                                               totalBL += copyTree->tree[i].getBranchLength(); 
+                                               totalBL += abs(copyTree->tree[i].getBranchLength()); 
                                        }
                        
                                        /**********************************************************************/
@@ -266,16 +268,16 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
                                        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 += copyTree->tree[rc].getBranchLength();
-                                                       totalBL += copyTree->tree[rc].getBranchLength(); 
+                                                       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 += copyTree->tree[lc].getBranchLength();
-                                                       totalBL += copyTree->tree[lc].getBranchLength(); 
+                                                       UniqueBL += abs(copyTree->tree[lc].getBranchLength());
+                                                       totalBL += abs(copyTree->tree[lc].getBranchLength()); 
                                                }
                                        }
                        
@@ -297,7 +299,9 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
                        if (numGroups == 0) {
                                //get score for all users groups
                                for (int i = 0; i < tmap->namesOfGroups.size(); i++) {
-                                       groups.push_back(tmap->namesOfGroups[i]);
+                                       if (tmap->namesOfGroups[i] != "xxx") {
+                                               groups.push_back(tmap->namesOfGroups[i]);
+                                       }
                                }
                        }else {
                                for (int i = 0; i < globaldata->Groups.size(); i++) {
@@ -325,18 +329,20 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
                                //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);   }
+                               for (it = copyIpcount.begin(); it != copyIpcount.end();) {
+                                               if (inUsersGroups(it->first, groups) != true) { 
+                                                       copyIpcount.erase(it++);        
+                                               }else { it++;  }
                                }
                        
                                //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 += copyTree->tree[i].getBranchLength();  }
+                               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)) {  
-                                       totalBL += copyTree->tree[i].getBranchLength(); 
+                                       totalBL += abs(copyTree->tree[i].getBranchLength()); 
                                }
                        
                                /**********************************************************************/
@@ -346,16 +352,16 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
                                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 += copyTree->tree[rc].getBranchLength();
-                                               totalBL += copyTree->tree[rc].getBranchLength(); 
+                                               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 += copyTree->tree[lc].getBranchLength();
-                                               totalBL += copyTree->tree[lc].getBranchLength(); 
+                                               UniqueBL += abs(copyTree->tree[lc].getBranchLength());
+                                               totalBL += abs(copyTree->tree[lc].getBranchLength()); 
                                        }
                                }
                        
@@ -375,11 +381,7 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
        
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the Unweighted class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-       catch(...) {
-               cout << "An unknown error has occurred in the Unweighted class function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               errorOut(e, "Unweighted", "getValues");
                exit(1);
        }
 }