X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=metastatscommand.cpp;h=9dff3543f49efa25037ce7fb3dd9eeeebbe8c787;hb=541bab1dac00688b4c3a8c4a95ab464412663c50;hp=3eaee9652fa230281e47d77bfcf0430b3be4afa5;hpb=1a5c2356c1b955c6ec024b2baf9f46377ee7c72e;p=mothur.git diff --git a/metastatscommand.cpp b/metastatscommand.cpp index 3eaee96..9dff354 100644 --- a/metastatscommand.cpp +++ b/metastatscommand.cpp @@ -65,7 +65,7 @@ string MetaStatsCommand::getOutputPattern(string type) { try { string pattern = ""; - if (type == "metastats") { pattern = "[filename],[distance],[groups],metastats"; } + if (type == "metastats") { pattern = "[filename],[distance],[group],metastats"; } else { m->mothurOut("[ERROR]: No definition for type " + type + " output pattern.\n"); m->control_pressed = true; } return pattern; @@ -431,6 +431,9 @@ int MetaStatsCommand::process(vector& thisLookUp){ //Close all thread handles and free memory allocations. for(int i=0; i < pDataArray.size(); i++){ + if (pDataArray[i]->count != (pDataArray[i]->num)) { + m->mothurOut("[ERROR]: process " + toString(i) + " only processed " + toString(pDataArray[i]->count) + " of " + toString(pDataArray[i]->num) + " groups assigned to it, quitting. \n"); m->control_pressed = true; + } for (int j = 0; j < pDataArray[i]->thisLookUp.size(); j++) { delete pDataArray[i]->thisLookUp[j]; } for (int j = 0; j < pDataArray[i]->outputNames.size(); j++) { outputNames.push_back(pDataArray[i]->outputNames[j]);