X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=chimeraccodecommand.cpp;fp=chimeraccodecommand.cpp;h=7468011ee79e22c9f796733cb9db651f7e5e53f1;hb=7f0cae4f4853cc3f12bc751ee06ea31c7c97496e;hp=321ae77cf743420284e4dfac274d9c88b9b4557f;hpb=113672689e4c84383a0304bfd21fb9574a77866c;p=mothur.git diff --git a/chimeraccodecommand.cpp b/chimeraccodecommand.cpp index 321ae77..7468011 100644 --- a/chimeraccodecommand.cpp +++ b/chimeraccodecommand.cpp @@ -390,14 +390,16 @@ int ChimeraCcodeCommand::execute(){ outHeader.close(); - vector positions = m->divideFile(fastaFileNames[s], processors); - - for (int i = 0; i < (positions.size()-1); i++) { - lines.push_back(new linePair(positions[i], positions[(i+1)])); - } + //break up file #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) + vector positions = m->divideFile(fastaFileNames[s], processors); + + for (int i = 0; i < (positions.size()-1); i++) { + lines.push_back(new linePair(positions[i], positions[(i+1)])); + } + if(processors == 1){ numSeqs = driver(lines[0], outputFileName, fastaFileNames[s], accnosFileName); @@ -436,6 +438,7 @@ int ChimeraCcodeCommand::execute(){ } #else + lines.push_back(new linePair(0, 1000)); numSeqs = driver(lines[0], outputFileName, fastaFileNames[s], accnosFileName); if (m->control_pressed) { m->mothurRemove(outputFileName); m->mothurRemove(tempHeader); m->mothurRemove(accnosFileName); for (int j = 0; j < outputNames.size(); j++) { m->mothurRemove(outputNames[j]); } for (int i = 0; i < lines.size(); i++) { delete lines[i]; } outputTypes.clear(); lines.clear(); delete chimera; return 0; }