X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=venncommand.cpp;fp=venncommand.cpp;h=5a5b9b3481e6e784ed5ef7c920bff78814300431;hb=55386dddad84cc1140d736cabaf4dd0ae16f2e01;hp=7ee0489d8780341587f684aaac1555c97560152b;hpb=990ded2eb38078a417fa00b4fbb4d3c24f4b5046;p=mothur.git diff --git a/venncommand.cpp b/venncommand.cpp index 7ee0489..5a5b9b3 100644 --- a/venncommand.cpp +++ b/venncommand.cpp @@ -168,7 +168,7 @@ VennCommand::VennCommand(string option) { if (groups == "not found") { groups = ""; } else { m->splitAtDash(groups, Groups); - m->Groups = Groups; + m->setGroups(Groups); } calc = validParameter.validFile(parameters, "calc", false); @@ -274,7 +274,7 @@ int VennCommand::execute(){ if (m->control_pressed) { for (int i = 0; i < vennCalculators.size(); i++) { delete vennCalculators[i]; } for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; } - m->Groups.clear(); delete venn; delete input; + m->clearGroups(); delete venn; delete input; for (int i = 0; i < outputNames.size(); i++) { m->mothurRemove(outputNames[i]); } return 0; } @@ -357,7 +357,7 @@ int VennCommand::execute(){ if (m->control_pressed) { for (int i = 0; i < vennCalculators.size(); i++) { delete vennCalculators[i]; } - m->Groups.clear(); delete venn; delete input; + m->clearGroups(); delete venn; delete input; for (int i = 0; i < outputNames.size(); i++) { m->mothurRemove(outputNames[i]); } return 0; } @@ -414,10 +414,10 @@ int VennCommand::execute(){ //reset groups parameter - m->Groups.clear(); + m->clearGroups(); if (m->control_pressed) { - m->Groups.clear(); delete venn; delete input; + m->clearGroups(); delete venn; delete input; for (int i = 0; i < vennCalculators.size(); i++) { delete vennCalculators[i]; } for (int i = 0; i < outputNames.size(); i++) { m->mothurRemove(outputNames[i]); } return 0;