X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=chimerapintailcommand.cpp;h=30136505f2a2136028c392c8e3e346ce878e045d;hb=f663afa231c9bc1b5e18e0ea3bdd2b2ee784f5b2;hp=4cfc3bca93a1939c9432bd3ed14873c2834963fa;hpb=52ea8f3a52c05331b9bd7519ae0b518bda233d05;p=mothur.git diff --git a/chimerapintailcommand.cpp b/chimerapintailcommand.cpp index 4cfc3bc..3013650 100644 --- a/chimerapintailcommand.cpp +++ b/chimerapintailcommand.cpp @@ -27,7 +27,7 @@ ChimeraPintailCommand::ChimeraPintailCommand(string option) { OptionParser parser(option); map parameters = parser.getParameters(); - ValidParameters validParameter; + ValidParameters validParameter("chimera.pintail"); map::iterator it; //check to make sure all parameters are valid for command @@ -43,7 +43,7 @@ ChimeraPintailCommand::ChimeraPintailCommand(string option) { it = parameters.find("template"); //user has given a template file if(it != parameters.end()){ - path = hasPath(it->second); + path = m->hasPath(it->second); //if the user has not given a path then, add inputdir. else leave path alone. if (path == "") { parameters["template"] = inputDir + it->second; } } @@ -51,7 +51,7 @@ ChimeraPintailCommand::ChimeraPintailCommand(string option) { it = parameters.find("conservation"); //user has given a template file if(it != parameters.end()){ - path = hasPath(it->second); + path = m->hasPath(it->second); //if the user has not given a path then, add inputdir. else leave path alone. if (path == "") { parameters["conservation"] = inputDir + it->second; } } @@ -59,7 +59,7 @@ ChimeraPintailCommand::ChimeraPintailCommand(string option) { it = parameters.find("quantile"); //user has given a template file if(it != parameters.end()){ - path = hasPath(it->second); + path = m->hasPath(it->second); //if the user has not given a path then, add inputdir. else leave path alone. if (path == "") { parameters["quantile"] = inputDir + it->second; } } @@ -70,12 +70,12 @@ ChimeraPintailCommand::ChimeraPintailCommand(string option) { fastafile = validParameter.validFile(parameters, "fasta", false); if (fastafile == "not found") { fastafile = ""; m->mothurOut("fasta is a required parameter for the chimera.pintail command."); m->mothurOutEndLine(); abort = true; } else { - splitAtDash(fastafile, fastaFileNames); + m->splitAtDash(fastafile, fastaFileNames); //go through files and make sure they are good, if not, then disregard them for (int i = 0; i < fastaFileNames.size(); i++) { if (inputDir != "") { - string path = hasPath(fastaFileNames[i]); + string path = m->hasPath(fastaFileNames[i]); //if the user has not given a path then, add inputdir. else leave path alone. if (path == "") { fastaFileNames[i] = inputDir + fastaFileNames[i]; } } @@ -83,30 +83,21 @@ ChimeraPintailCommand::ChimeraPintailCommand(string option) { int ableToOpen; ifstream in; - #ifdef USE_MPI - int pid; - MPI_Comm_size(MPI_COMM_WORLD, &processors); //set processors to the number of mpi processes running - MPI_Comm_rank(MPI_COMM_WORLD, &pid); //find out who we are + ableToOpen = m->openInputFile(fastaFileNames[i], in, "noerror"); - if (pid == 0) { - #endif - - ableToOpen = openInputFile(fastaFileNames[i], in); + //if you can't open it, try default location + if (ableToOpen == 1) { + if (m->getDefaultPath() != "") { //default path is set + string tryPath = m->getDefaultPath() + m->getSimpleName(fastaFileNames[i]); + m->mothurOut("Unable to open " + fastaFileNames[i] + ". Trying default " + tryPath); m->mothurOutEndLine(); + ableToOpen = m->openInputFile(tryPath, in, "noerror"); + fastaFileNames[i] = tryPath; + } + } in.close(); - #ifdef USE_MPI - for (int j = 1; j < processors; j++) { - MPI_Send(&ableToOpen, 1, MPI_INT, j, 2001, MPI_COMM_WORLD); - } - }else{ - MPI_Status status; - MPI_Recv(&ableToOpen, 1, MPI_INT, 0, 2001, MPI_COMM_WORLD, &status); - } - - #endif - if (ableToOpen == 1) { - m->mothurOut(fastaFileNames[i] + " will be disregarded."); m->mothurOutEndLine(); + m->mothurOut("Unable to open " + fastaFileNames[i] + ". It will be disregarded."); m->mothurOutEndLine(); //erase from file list fastaFileNames.erase(fastaFileNames.begin()+i); i--; @@ -119,7 +110,7 @@ ChimeraPintailCommand::ChimeraPintailCommand(string option) { string temp; temp = validParameter.validFile(parameters, "filter", false); if (temp == "not found") { temp = "F"; } - filter = isTrue(temp); + filter = m->isTrue(temp); temp = validParameter.validFile(parameters, "processors", false); if (temp == "not found") { temp = "1"; } convert(temp, processors); @@ -134,23 +125,32 @@ ChimeraPintailCommand::ChimeraPintailCommand(string option) { if (maskfile == "not found") { maskfile = ""; } else if (maskfile != "default") { if (inputDir != "") { - string path = hasPath(maskfile); + string path = m->hasPath(maskfile); //if the user has not given a path then, add inputdir. else leave path alone. if (path == "") { maskfile = inputDir + maskfile; } } ifstream in; - int ableToOpen = openInputFile(maskfile, in); - if (ableToOpen == 1) { abort = true; } - in.close(); + int ableToOpen = m->openInputFile(maskfile, in, "no error"); + if (ableToOpen == 1) { + if (m->getDefaultPath() != "") { //default path is set + string tryPath = m->getDefaultPath() + m->getSimpleName(maskfile); + m->mothurOut("Unable to open " + maskfile + ". Trying default " + tryPath); m->mothurOutEndLine(); + ableToOpen = m->openInputFile(tryPath, in, "noerror"); + maskfile = tryPath; + } + } + in.close(); + + if (ableToOpen == 1) { + m->mothurOut("Unable to open " + maskfile + "."); m->mothurOutEndLine(); + abort = true; + } } //if the user changes the output directory command factory will send this info to us in the output parameter - outputDir = validParameter.validFile(parameters, "outputdir", false); if (outputDir == "not found"){ - outputDir = ""; - outputDir += hasPath(fastafile); //if user entered a file with a path then preserve it - } + outputDir = validParameter.validFile(parameters, "outputdir", false); if (outputDir == "not found"){ outputDir = ""; } templatefile = validParameter.validFile(parameters, "template", true); if (templatefile == "not open") { abort = true; } @@ -161,14 +161,28 @@ ChimeraPintailCommand::ChimeraPintailCommand(string option) { else if (consfile == "not found") { consfile = ""; //check for consfile - string tempConsFile = getRootName(inputDir + getSimpleName(templatefile)) + "freq"; + string tempConsFile = m->getRootName(inputDir + m->getSimpleName(templatefile)) + "freq"; ifstream FileTest(tempConsFile.c_str()); - if(FileTest){ m->mothurOut("I found " + tempConsFile + " in your input file directory. I will use it to save time."); m->mothurOutEndLine(); consfile = tempConsFile; FileTest.close(); } + if(FileTest){ + bool GoodFile = m->checkReleaseVersion(FileTest, m->getVersion()); + if (GoodFile) { + m->mothurOut("I found " + tempConsFile + " in your input file directory. I will use it to save time."); m->mothurOutEndLine(); consfile = tempConsFile; FileTest.close(); + } + }else { + string tempConsFile = m->getDefaultPath() + m->getRootName(m->getSimpleName(templatefile)) + "freq"; + ifstream FileTest2(tempConsFile.c_str()); + if(FileTest2){ + bool GoodFile = m->checkReleaseVersion(FileTest2, m->getVersion()); + if (GoodFile) { + m->mothurOut("I found " + tempConsFile + " in your input file directory. I will use it to save time."); m->mothurOutEndLine(); consfile = tempConsFile; FileTest2.close(); + } + } + } } quanfile = validParameter.validFile(parameters, "quantile", true); if (quanfile == "not open") { abort = true; } - else if (quanfile == "not found") { quanfile = ""; } + else if (quanfile == "not found") { quanfile = ""; } } } catch(exception& e) { @@ -231,29 +245,54 @@ int ChimeraPintailCommand::execute(){ //check for quantile to save the time string tempQuan = ""; if ((!filter) && (maskfile == "")) { - tempQuan = inputDir + getRootName(getSimpleName(templatefile)) + "pintail.quan"; + tempQuan = inputDir + m->getRootName(m->getSimpleName(templatefile)) + "pintail.quan"; }else if ((!filter) && (maskfile != "")) { - tempQuan = inputDir + getRootName(getSimpleName(templatefile)) + "pintail.masked.quan"; + tempQuan = inputDir + m->getRootName(m->getSimpleName(templatefile)) + "pintail.masked.quan"; }else if ((filter) && (maskfile != "")) { - tempQuan = inputDir + getRootName(getSimpleName(templatefile)) + "pintail.filtered." + getSimpleName(getRootName(fastaFileNames[s])) + "masked.quan"; + tempQuan = inputDir + m->getRootName(m->getSimpleName(templatefile)) + "pintail.filtered." + m->getSimpleName(m->getRootName(fastaFileNames[s])) + "masked.quan"; }else if ((filter) && (maskfile == "")) { - tempQuan = inputDir + getRootName(getSimpleName(templatefile)) + "pintail.filtered." + getSimpleName(getRootName(fastaFileNames[s])) + "quan"; + tempQuan = inputDir + m->getRootName(m->getSimpleName(templatefile)) + "pintail.filtered." + m->getSimpleName(m->getRootName(fastaFileNames[s])) + "quan"; } ifstream FileTest(tempQuan.c_str()); - if(FileTest){ m->mothurOut("I found " + tempQuan + " in your input file directory. I will use it to save time."); m->mothurOutEndLine(); quanfile = tempQuan; FileTest.close(); } + if(FileTest){ + bool GoodFile = m->checkReleaseVersion(FileTest, m->getVersion()); + if (GoodFile) { + m->mothurOut("I found " + tempQuan + " in your input file directory. I will use it to save time."); m->mothurOutEndLine(); quanfile = tempQuan; FileTest.close(); + } + }else { + string tryPath = m->getDefaultPath(); + string tempQuan = ""; + if ((!filter) && (maskfile == "")) { + tempQuan = tryPath + m->getRootName(m->getSimpleName(templatefile)) + "pintail.quan"; + }else if ((!filter) && (maskfile != "")) { + tempQuan = tryPath + m->getRootName(m->getSimpleName(templatefile)) + "pintail.masked.quan"; + }else if ((filter) && (maskfile != "")) { + tempQuan = tryPath + m->getRootName(m->getSimpleName(templatefile)) + "pintail.filtered." + m->getSimpleName(m->getRootName(fastaFileNames[s])) + "masked.quan"; + }else if ((filter) && (maskfile == "")) { + tempQuan = tryPath + m->getRootName(m->getSimpleName(templatefile)) + "pintail.filtered." + m->getSimpleName(m->getRootName(fastaFileNames[s])) + "quan"; + } + + ifstream FileTest2(tempQuan.c_str()); + if(FileTest2){ + bool GoodFile = m->checkReleaseVersion(FileTest2, m->getVersion()); + if (GoodFile) { + m->mothurOut("I found " + tempQuan + " in your input file directory. I will use it to save time."); m->mothurOutEndLine(); quanfile = tempQuan; FileTest2.close(); + } + } + } chimera = new Pintail(fastaFileNames[s], templatefile, filter, processors, maskfile, consfile, quanfile, window, increment, outputDir); + if (outputDir == "") { outputDir = m->hasPath(fastaFileNames[s]); }//if user entered a file with a path then preserve it string outputFileName, accnosFileName; if (maskfile != "") { - outputFileName = outputDir + getRootName(getSimpleName(fastaFileNames[s])) + maskfile + ".pintail.chimeras"; - accnosFileName = outputDir + getRootName(getSimpleName(fastaFileNames[s])) + maskfile + ".pintail.accnos"; + outputFileName = outputDir + m->getRootName(m->getSimpleName(fastaFileNames[s])) + m->getSimpleName(m->getRootName(maskfile)) + ".pintail.chimeras"; + accnosFileName = outputDir + m->getRootName(m->getSimpleName(fastaFileNames[s])) + m->getSimpleName(m->getRootName(maskfile)) + ".pintail.accnos"; }else { - outputFileName = outputDir + getRootName(getSimpleName(fastaFileNames[s])) + "pintail.chimeras"; - accnosFileName = outputDir + getRootName(getSimpleName(fastaFileNames[s])) + "pintail.accnos"; + outputFileName = outputDir + m->getRootName(m->getSimpleName(fastaFileNames[s])) + "pintail.chimeras"; + accnosFileName = outputDir + m->getRootName(m->getSimpleName(fastaFileNames[s])) + "pintail.accnos"; } - bool hasAccnos = true; if (m->control_pressed) { delete chimera; for (int j = 0; j < outputNames.size(); j++) { remove(outputNames[j].c_str()); } return 0; } @@ -267,8 +306,7 @@ int ChimeraPintailCommand::execute(){ #ifdef USE_MPI int pid, end, numSeqsPerProcessor; int tag = 2001; - vector MPIPos; - MPIWroteAccnos = false; + vector MPIPos; MPI_Status status; MPI_Comm_rank(MPI_COMM_WORLD, &pid); //find out who we are @@ -298,7 +336,7 @@ int ChimeraPintailCommand::execute(){ if (pid == 0) { //you are the root process - MPIPos = setFilePosFasta(fastaFileNames[s], numSeqs); //fills MPIPos, returns numSeqs + MPIPos = m->setFilePosFasta(fastaFileNames[s], numSeqs); //fills MPIPos, returns numSeqs //send file positions to all processes for(int i = 1; i < processors; i++) { @@ -316,11 +354,6 @@ int ChimeraPintailCommand::execute(){ if (m->control_pressed) { MPI_File_close(&inMPI); MPI_File_close(&outMPI); MPI_File_close(&outMPIAccnos); remove(outputFileName.c_str()); remove(accnosFileName.c_str()); for (int j = 0; j < outputNames.size(); j++) { remove(outputNames[j].c_str()); } delete chimera; return 0; } - for (int i = 1; i < processors; i++) { - bool tempResult; - MPI_Recv(&tempResult, 1, MPI_INT, i, tag, MPI_COMM_WORLD, &status); - if (tempResult != 0) { MPIWroteAccnos = true; } - } }else{ //you are a child process MPI_Recv(&numSeqs, 1, MPI_INT, 0, tag, MPI_COMM_WORLD, &status); MPIPos.resize(numSeqs+1); @@ -335,8 +368,6 @@ int ChimeraPintailCommand::execute(){ driverMPI(startIndex, numSeqsPerProcessor, inMPI, outMPI, outMPIAccnos, MPIPos); if (m->control_pressed) { MPI_File_close(&inMPI); MPI_File_close(&outMPI); MPI_File_close(&outMPIAccnos); for (int j = 0; j < outputNames.size(); j++) { remove(outputNames[j].c_str()); } delete chimera; return 0; } - - MPI_Send(&MPIWroteAccnos, 1, MPI_INT, 0, tag, MPI_COMM_WORLD); } //close files @@ -344,97 +375,41 @@ int ChimeraPintailCommand::execute(){ MPI_File_close(&outMPI); MPI_File_close(&outMPIAccnos); MPI_Barrier(MPI_COMM_WORLD); //make everyone wait - just in case - - //delete accnos file if blank - if (pid == 0) { - if (!MPIWroteAccnos) { - hasAccnos = false; - remove(accnosFileName.c_str()); - } - } - #else - + 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) if(processors == 1){ - ifstream inFASTA; - openInputFile(fastaFileNames[s], inFASTA); - getNumSeqs(inFASTA, numSeqs); - inFASTA.close(); - - lines.push_back(new linePair(0, numSeqs)); + + numSeqs = driver(lines[0], outputFileName, fastaFileNames[s], accnosFileName); - driver(lines[0], outputFileName, fastaFileNames[s], accnosFileName); + if (m->control_pressed) { remove(outputFileName.c_str()); remove(accnosFileName.c_str()); for (int j = 0; j < outputNames.size(); j++) { remove(outputNames[j].c_str()); } for (int i = 0; i < lines.size(); i++) { delete lines[i]; } lines.clear(); delete chimera; return 0; } - if (m->control_pressed) { - remove(outputFileName.c_str()); - remove(accnosFileName.c_str()); - for (int j = 0; j < outputNames.size(); j++) { remove(outputNames[j].c_str()); } - for (int i = 0; i < lines.size(); i++) { delete lines[i]; } lines.clear(); - delete chimera; - return 0; - } - - //delete accnos file if its blank - if (isBlank(accnosFileName)) { remove(accnosFileName.c_str()); hasAccnos = false; } - }else{ - vector positions; processIDS.resize(0); - ifstream inFASTA; - openInputFile(fastaFileNames[s], inFASTA); - - string input; - while(!inFASTA.eof()){ - input = getline(inFASTA); - if (input.length() != 0) { - if(input[0] == '>'){ long int pos = inFASTA.tellg(); positions.push_back(pos - input.length() - 1); } - } - } - inFASTA.close(); - - numSeqs = positions.size(); - - int numSeqsPerProcessor = numSeqs / processors; - - for (int i = 0; i < processors; i++) { - long int startPos = positions[ i * numSeqsPerProcessor ]; - if(i == processors - 1){ - numSeqsPerProcessor = numSeqs - i * numSeqsPerProcessor; - } - lines.push_back(new linePair(startPos, numSeqsPerProcessor)); - } - - createProcesses(outputFileName, fastaFileNames[s], accnosFileName); + numSeqs = createProcesses(outputFileName, fastaFileNames[s], accnosFileName); rename((outputFileName + toString(processIDS[0]) + ".temp").c_str(), outputFileName.c_str()); + rename((accnosFileName + toString(processIDS[0]) + ".temp").c_str(), accnosFileName.c_str()); //append output files for(int i=1;iappendFiles((outputFileName + toString(processIDS[i]) + ".temp"), outputFileName); remove((outputFileName + toString(processIDS[i]) + ".temp").c_str()); } - vector nonBlankAccnosFiles; - //delete blank accnos files generated with multiple processes - for(int i=0;iappendFiles((accnosFileName + toString(processIDS[i]) + ".temp"), accnosFileName); + remove((accnosFileName + toString(processIDS[i]) + ".temp").c_str()); } - - //append accnos files - if (nonBlankAccnosFiles.size() != 0) { - rename(nonBlankAccnosFiles[0].c_str(), accnosFileName.c_str()); - - for (int h=1; h < nonBlankAccnosFiles.size(); h++) { - appendFiles(nonBlankAccnosFiles[h], accnosFileName); - remove(nonBlankAccnosFiles[h].c_str()); - } - }else{ hasAccnos = false; } - + if (m->control_pressed) { remove(outputFileName.c_str()); remove(accnosFileName.c_str()); @@ -446,25 +421,9 @@ int ChimeraPintailCommand::execute(){ } #else - ifstream inFASTA; - openInputFile(fastaFileNames[s], inFASTA); - getNumSeqs(inFASTA, numSeqs); - inFASTA.close(); - lines.push_back(new linePair(0, numSeqs)); - - driver(lines[0], outputFileName, fastaFileNames[s], accnosFileName); + numSeqs = driver(lines[0], outputFileName, fastaFileNames[s], accnosFileName); - if (m->control_pressed) { - remove(outputFileName.c_str()); - remove(accnosFileName.c_str()); - for (int j = 0; j < outputNames.size(); j++) { remove(outputNames[j].c_str()); } - for (int i = 0; i < lines.size(); i++) { delete lines[i]; } lines.clear(); - delete chimera; - return 0; - } - - //delete accnos file if its blank - if (isBlank(accnosFileName)) { remove(accnosFileName.c_str()); hasAccnos = false; } + if (m->control_pressed) { remove(outputFileName.c_str()); remove(accnosFileName.c_str()); for (int j = 0; j < outputNames.size(); j++) { remove(outputNames[j].c_str()); } for (int i = 0; i < lines.size(); i++) { delete lines[i]; } lines.clear(); delete chimera; return 0; } #endif #endif @@ -473,7 +432,7 @@ int ChimeraPintailCommand::execute(){ for (int i = 0; i < lines.size(); i++) { delete lines[i]; } lines.clear(); outputNames.push_back(outputFileName); - if (hasAccnos) { outputNames.push_back(accnosFileName); } + outputNames.push_back(accnosFileName); m->mothurOutEndLine(); m->mothurOutEndLine(); m->mothurOut("It took " + toString(time(NULL) - start) + " secs to check " + toString(numSeqs) + " sequences."); m->mothurOutEndLine(); @@ -494,24 +453,27 @@ int ChimeraPintailCommand::execute(){ } //********************************************************************************************************************** -int ChimeraPintailCommand::driver(linePair* line, string outputFName, string filename, string accnos){ +int ChimeraPintailCommand::driver(linePair* filePos, string outputFName, string filename, string accnos){ try { ofstream out; - openOutputFile(outputFName, out); + m->openOutputFile(outputFName, out); ofstream out2; - openOutputFile(accnos, out2); + m->openOutputFile(accnos, out2); ifstream inFASTA; - openInputFile(filename, inFASTA); + m->openInputFile(filename, inFASTA); - inFASTA.seekg(line->start); - - for(int i=0;inumSeqs;i++){ - + inFASTA.seekg(filePos->start); + + bool done = false; + int count = 0; + + while (!done) { + if (m->control_pressed) { return 1; } - Sequence* candidateSeq = new Sequence(inFASTA); gobble(inFASTA); + Sequence* candidateSeq = new Sequence(inFASTA); m->gobble(inFASTA); if (candidateSeq->getName() != "") { //incase there is a commented sequence at the end of a file @@ -526,20 +488,28 @@ int ChimeraPintailCommand::driver(linePair* line, string outputFName, string fil //print results chimera->print(out, out2); } + count++; } delete candidateSeq; + #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) + unsigned long int pos = inFASTA.tellg(); + if ((pos == -1) || (pos >= filePos->end)) { break; } + #else + if (inFASTA.eof()) { break; } + #endif + //report progress - if((i+1) % 100 == 0){ m->mothurOut("Processing sequence: " + toString(i+1)); m->mothurOutEndLine(); } + if((count) % 100 == 0){ m->mothurOut("Processing sequence: " + toString(count)); m->mothurOutEndLine(); } } //report progress - if((line->numSeqs) % 100 != 0){ m->mothurOut("Processing sequence: " + toString(line->numSeqs)); m->mothurOutEndLine(); } + if((count) % 100 != 0){ m->mothurOut("Processing sequence: " + toString(count)); m->mothurOutEndLine(); } out.close(); out2.close(); inFASTA.close(); - return 0; + return count; } catch(exception& e) { m->errorOut(e, "ChimeraPintailCommand", "driver"); @@ -548,7 +518,7 @@ int ChimeraPintailCommand::driver(linePair* line, string outputFName, string fil } //********************************************************************************************************************** #ifdef USE_MPI -int ChimeraPintailCommand::driverMPI(int start, int num, MPI_File& inMPI, MPI_File& outMPI, MPI_File& outAccMPI, vector& MPIPos){ +int ChimeraPintailCommand::driverMPI(int start, int num, MPI_File& inMPI, MPI_File& outMPI, MPI_File& outAccMPI, vector& MPIPos){ try { MPI_Status status; @@ -570,7 +540,7 @@ int ChimeraPintailCommand::driverMPI(int start, int num, MPI_File& inMPI, MPI_Fi istringstream iss (tempBuf,istringstream::in); delete buf4; - Sequence* candidateSeq = new Sequence(iss); gobble(iss); + Sequence* candidateSeq = new Sequence(iss); m->gobble(iss); if (candidateSeq->getName() != "") { //incase there is a commented sequence at the end of a file @@ -584,7 +554,6 @@ int ChimeraPintailCommand::driverMPI(int start, int num, MPI_File& inMPI, MPI_Fi //print results bool isChimeric = chimera->print(outMPI, outAccMPI); - if (isChimeric) { MPIWroteAccnos = true; } } } delete candidateSeq; @@ -611,7 +580,7 @@ int ChimeraPintailCommand::createProcesses(string outputFileName, string filenam try { #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) int process = 0; - // processIDS.resize(0); + int num = 0; //loop through and create all the processes you want while (process != processors) { @@ -621,7 +590,15 @@ int ChimeraPintailCommand::createProcesses(string outputFileName, string filenam processIDS.push_back(pid); //create map from line number to pid so you can append files in correct order later process++; }else if (pid == 0){ - driver(lines[process], outputFileName + toString(getpid()) + ".temp", filename, accnos + toString(getpid()) + ".temp"); + num = driver(lines[process], outputFileName + toString(getpid()) + ".temp", filename, accnos + toString(getpid()) + ".temp"); + + //pass numSeqs to parent + ofstream out; + string tempFile = outputFileName + toString(getpid()) + ".num.temp"; + m->openOutputFile(tempFile, out); + out << num << endl; + out.close(); + exit(0); }else { m->mothurOut("unable to spawn the necessary processes."); m->mothurOutEndLine(); exit(0); } } @@ -632,7 +609,15 @@ int ChimeraPintailCommand::createProcesses(string outputFileName, string filenam wait(&temp); } - return 0; + for (int i = 0; i < processIDS.size(); i++) { + ifstream in; + string tempFile = outputFileName + toString(processIDS[i]) + ".num.temp"; + m->openInputFile(tempFile, in); + if (!in.eof()) { int tempNum = 0; in >> tempNum; num += tempNum; } + in.close(); remove(tempFile.c_str()); + } + + return num; #endif } catch(exception& e) {