X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=summaryqualcommand.cpp;h=5c175106ecb2584d07ca15a06c71f27284a3571c;hb=e0ce7cbc93d7d2fbb753ca694182db092a0ea0e7;hp=a0d786f47518290bd71b88d15f386326d61acd64;hpb=b302d221847b504388ec044c6929e9dde42f9bb1;p=mothur.git diff --git a/summaryqualcommand.cpp b/summaryqualcommand.cpp index a0d786f..5c17510 100644 --- a/summaryqualcommand.cpp +++ b/summaryqualcommand.cpp @@ -162,7 +162,7 @@ int SummaryQualCommand::execute(){ if (namefile != "") { nameMap = m->readNames(namefile); } vector positions; -#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) +#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix) positions = m->divideFile(qualfile, processors); for (int i = 0; i < (positions.size()-1); i++) { lines.push_back(linePair(positions[i], positions[(i+1)])); } #else @@ -170,6 +170,7 @@ int SummaryQualCommand::execute(){ lines.push_back(linePair(0, 1000)); }else { positions = m->setFilePosFasta(qualfile, numSeqs); + if (positions.size() < processors) { processors = positions.size(); } //figure out how many sequences you have to process int numSeqsPerProcessor = numSeqs / processors; @@ -267,7 +268,7 @@ int SummaryQualCommand::driverCreateSummary(vector& position, vector& count += num; } -#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) +#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix) unsigned long long pos = in.tellg(); if ((pos == -1) || (pos >= filePos.end)) { break; } #else @@ -291,7 +292,7 @@ int SummaryQualCommand::createProcessesCreateSummary(vector& position, vect int numSeqs = 0; processIDS.clear(); -#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) +#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix) //loop through and create all the processes you want while (process != processors) {