X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=parsimony.cpp;h=8c7e3e4aa8fb206d8794a63d8bd190659953ac2c;hb=20f5abcedb60b8f2acabf98b887d4d778571a297;hp=54960cc516047f0f43ff8cde28f697512d9d6c91;hpb=010638fc7580c18a51f5ed650e9ee7589c8fb2d4;p=mothur.git diff --git a/parsimony.cpp b/parsimony.cpp index 54960cc..8c7e3e4 100644 --- a/parsimony.cpp +++ b/parsimony.cpp @@ -22,7 +22,7 @@ EstOutput Parsimony::getValues(Tree* t) { for(int i=t->getNumLeaves();igetNumNodes();i++){ t->tree[i].pGroups = (t->mergeUserGroups(i)); } - + for(int i=t->getNumLeaves();igetNumNodes();i++){ int lc = t->tree[i].getLChild(); int rc = t->tree[i].getRChild(); @@ -30,25 +30,7 @@ EstOutput Parsimony::getValues(Tree* t) { int iSize = t->tree[i].pGroups.size(); int rcSize = t->tree[rc].pGroups.size(); int lcSize = t->tree[lc].pGroups.size(); -cout << " i groups "; - //add in all the groups the users wanted - for (it = t->tree[i].pGroups.begin(); it != t->tree[i].pGroups.end(); it++) { -cout << it->first << " "; - // if (inUsersGroups(it->first, globaldata->Groups) != true) { iSize--; } - } -cout << endl << " rc groups "; - //add in all the groups the users wanted - for (it = t->tree[rc].pGroups.begin(); it != t->tree[rc].pGroups.end(); it++) { -cout << it->first << " "; - //if (inUsersGroups(it->first, globaldata->Groups) != true) { rcSize--; } - } -cout << endl << " lc groups "; - //add in all the groups the users wanted - for (it = t->tree[lc].pGroups.begin(); it != t->tree[lc].pGroups.end(); it++) { -cout << it->first << " "; - //if (inUsersGroups(it->first, globaldata->Groups) != true) { lcSize--; } - } -cout << endl; + //if isize are 0 then that branch is to be ignored if (iSize == 0) { } else if ((rcSize == 0) || (lcSize == 0)) { } @@ -73,3 +55,5 @@ cout << endl; } +/**************************************************************************************************/ +