X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=metastatscommand.cpp;h=de03dab2a147174384d3e3ffce329c1e16fa07f5;hp=de9e373194b30bc97a2afbeceb49b5303aa66de3;hb=b206f634aae1b4ce13978d203247fb64757d5482;hpb=ffa535cf04326227080b02594616971a2c3a5195 diff --git a/metastatscommand.cpp b/metastatscommand.cpp index de9e373..de03dab 100644 --- a/metastatscommand.cpp +++ b/metastatscommand.cpp @@ -256,15 +256,14 @@ int MetaStatsCommand::execute(){ else if (numGroups < 2) { m->mothurOut("Not enough sets, I need at least 2 valid sets. Unable to complete command."); m->mothurOutEndLine(); m->control_pressed = true; } if(processors != 1){ - int numPairs = namesOfGroupCombos.size(); - int numPairsPerProcessor = numPairs / processors; - - for (int i = 0; i < processors; i++) { - int startPos = i * numPairsPerProcessor; - if(i == processors - 1){ - numPairsPerProcessor = numPairs - i * numPairsPerProcessor; - } - lines.push_back(linePair(startPos, numPairsPerProcessor)); + int remainingPairs = namesOfGroupCombos.size(); + int startIndex = 0; + for (int remainingProcessors = processors; remainingProcessors > 0; remainingProcessors--) { + int numPairs = remainingPairs; //case for last processor + if (remainingProcessors != 1) { numPairs = ceil(remainingPairs / remainingProcessors); } + lines.push_back(linePair(startIndex, numPairs)); //startIndex, numPairs + startIndex = startIndex + numPairs; + remainingPairs = remainingPairs - numPairs; } }