added groups option to get.oturep command

[mothur.git] / unweighted.cpp

diff --git a/unweighted.cpp b/unweighted.cpp
index c39e6629df1c2749928833fe24af65d48e853d64..2a2a41cf0f6b823e3a781d9dabe53702e04d6f78 100644 (file)
--- a/unweighted.cpp
+++ b/unweighted.cpp
@@ -48,14 +48,9 @@ EstOutput Unweighted::getValues(Tree* t) {
                                //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
-                       
+                               for(int i=0;i<t->getNumNodes();i++){
+                                       if (m->control_pressed) {  return data; }
+       
                                        copyIpcount = t->tree[i].pcount;
                                        for (it = copyIpcount.begin(); it != copyIpcount.end();) {
                                                if (inUsersGroups(it->first, groups) != true) { 
@@ -73,30 +68,10 @@ EstOutput Unweighted::getValues(Tree* t) {
                                                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);  
+               //cout << globaldata->Groups[a] << globaldata->Groups[l] << '\t' << UniqueBL << '\t' << totalBL << endl;
        
                                if (isnan(UW) || isinf(UW)) { UW = 0; }
        
@@ -126,14 +101,10 @@ EstOutput Unweighted::getValues(Tree* t) {
                        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++){
                        
+                               if (m->control_pressed) {  return data; }
+                               
                                copyIpcount = t->tree[i].pcount;
                                for (it = copyIpcount.begin(); it != copyIpcount.end();) {
                                        if (inUsersGroups(it->first, groups) != true) { 
@@ -151,27 +122,6 @@ EstOutput Unweighted::getValues(Tree* t) {
                                        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);  
@@ -185,7 +135,7 @@ EstOutput Unweighted::getValues(Tree* t) {
        
        }
        catch(exception& e) {
-               errorOut(e, "Unweighted", "getValues");
+               m->errorOut(e, "Unweighted", "getValues");
                exit(1);
        }
 }
@@ -235,13 +185,14 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
                                //swap labels in the groups you want to compare
                                copyTree->assembleRandomUnifracTree(groups[0], groups[1]);
                                
+                               if (m->control_pressed) { delete copyTree; return data; }
+                               
                                //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
-                       
+                               
+                               for(int i=0;i<copyTree->getNumNodes();i++){
+                                       
+                                       if (m->control_pressed) { delete copyTree; return data; }
+                                       
                                        /**********************************************************************/
                                        //This section adds in all lengths that are non leaf
                                        copyIpcount = copyTree->tree[i].pcount;
@@ -261,27 +212,6 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
                                                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);  
@@ -319,14 +249,11 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
                                
                        //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++){
+                               if (m->control_pressed) { delete copyTree; return data; }
                        
                                copyIpcount = copyTree->tree[i].pcount;
                                for (it = copyIpcount.begin(); it != copyIpcount.end();) {
@@ -345,27 +272,6 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
                                        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);  
@@ -381,7 +287,7 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB) {
        
        }
        catch(exception& e) {
-               errorOut(e, "Unweighted", "getValues");
+               m->errorOut(e, "Unweighted", "getValues");
                exit(1);
        }
 }