X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=classifyseqscommand.cpp;h=6cfa3321c1cfd9b14cc3bf4b86d400c46feecb3c;hb=348de0f8b17d84ede77081dcf67bd6ef43496677;hp=0635fdeb4cd9a72de87d786d6a0aa30056b99a7d;hpb=b4f80c1d2be78a8743a408a2b6d462b07f9f71ff;p=mothur.git diff --git a/classifyseqscommand.cpp b/classifyseqscommand.cpp index 0635fde..6cfa332 100644 --- a/classifyseqscommand.cpp +++ b/classifyseqscommand.cpp @@ -14,14 +14,63 @@ #include "phylosummary.h" #include "knn.h" -//********************************************************************************************************************** +//********************************************************************************************************************** +vector ClassifySeqsCommand::getValidParameters(){ + try { + string AlignArray[] = {"template","fasta","name","group","search","ksize","method","processors","taxonomy","match","mismatch","gapopen","gapextend","numwanted","cutoff","probs","iters", "outputdir","inputdir"}; + vector myArray (AlignArray, AlignArray+(sizeof(AlignArray)/sizeof(string))); + return myArray; + } + catch(exception& e) { + m->errorOut(e, "ClassifySeqsCommand", "getValidParameters"); + exit(1); + } +} +//********************************************************************************************************************** +ClassifySeqsCommand::ClassifySeqsCommand(){ + try { + abort = true; calledHelp = true; + vector tempOutNames; + outputTypes["taxonomy"] = tempOutNames; + outputTypes["taxsummary"] = tempOutNames; + outputTypes["matchdist"] = tempOutNames; + } + catch(exception& e) { + m->errorOut(e, "ClassifySeqsCommand", "ClassifySeqsCommand"); + exit(1); + } +} +//********************************************************************************************************************** +vector ClassifySeqsCommand::getRequiredParameters(){ + try { + string Array[] = {"fasta","template","taxonomy"}; + vector myArray (Array, Array+(sizeof(Array)/sizeof(string))); + return myArray; + } + catch(exception& e) { + m->errorOut(e, "ClassifySeqsCommand", "getRequiredParameters"); + exit(1); + } +} +//********************************************************************************************************************** +vector ClassifySeqsCommand::getRequiredFiles(){ + try { + vector myArray; + return myArray; + } + catch(exception& e) { + m->errorOut(e, "ClassifySeqsCommand", "getRequiredFiles"); + exit(1); + } +} +//********************************************************************************************************************** ClassifySeqsCommand::ClassifySeqsCommand(string option) { try { - abort = false; + abort = false; calledHelp = false; //allow user to run help - if(option == "help") { help(); abort = true; } + if(option == "help") { help(); abort = true; calledHelp = true; } else { @@ -40,6 +89,12 @@ ClassifySeqsCommand::ClassifySeqsCommand(string option) { if (validParameter.isValidParameter(it->first, myArray, it->second) != true) { abort = true; } } + //initialize outputTypes + vector tempOutNames; + outputTypes["taxonomy"] = tempOutNames; + outputTypes["taxsummary"] = tempOutNames; + outputTypes["matchdist"] = tempOutNames; + //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 = ""; } @@ -51,7 +106,7 @@ ClassifySeqsCommand::ClassifySeqsCommand(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; } } @@ -59,7 +114,7 @@ ClassifySeqsCommand::ClassifySeqsCommand(string option) { it = parameters.find("taxonomy"); //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["taxonomy"] = inputDir + it->second; } } @@ -67,7 +122,7 @@ ClassifySeqsCommand::ClassifySeqsCommand(string option) { it = parameters.find("group"); //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["group"] = inputDir + it->second; } } @@ -86,50 +141,45 @@ ClassifySeqsCommand::ClassifySeqsCommand(string option) { fastaFileName = validParameter.validFile(parameters, "fasta", false); if (fastaFileName == "not found") { m->mothurOut("fasta is a required parameter for the classify.seqs command."); m->mothurOutEndLine(); abort = true; } else { - splitAtDash(fastaFileName, fastaFileNames); + m->splitAtDash(fastaFileName, 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]; } } int ableToOpen; - #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 - - if (pid == 0) { - #endif - ifstream in; - ableToOpen = openInputFile(fastaFileNames[i], in, "noerror"); + ableToOpen = m->openInputFile(fastaFileNames[i], in, "noerror"); //if you can't open it, try default location if (ableToOpen == 1) { if (m->getDefaultPath() != "") { //default path is set - string tryPath = m->getDefaultPath() + getSimpleName(fastaFileNames[i]); + string tryPath = m->getDefaultPath() + m->getSimpleName(fastaFileNames[i]); m->mothurOut("Unable to open " + fastaFileNames[i] + ". Trying default " + tryPath); m->mothurOutEndLine(); - ableToOpen = openInputFile(tryPath, in, "noerror"); + ifstream in2; + ableToOpen = m->openInputFile(tryPath, in2, "noerror"); + in2.close(); 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); + if (ableToOpen == 1) { + if (m->getOutputDir() != "") { //default path is set + string tryPath = m->getOutputDir() + m->getSimpleName(fastaFileNames[i]); + m->mothurOut("Unable to open " + fastaFileNames[i] + ". Trying output directory " + tryPath); m->mothurOutEndLine(); + ifstream in2; + ableToOpen = m->openInputFile(tryPath, in2, "noerror"); + in2.close(); + fastaFileNames[i] = tryPath; } - - #endif + } + + in.close(); if (ableToOpen == 1) { m->mothurOut("Unable to open " + fastaFileNames[i] + ". It will be disregarded."); m->mothurOutEndLine(); @@ -158,49 +208,43 @@ ClassifySeqsCommand::ClassifySeqsCommand(string option) { if (namefile == "not found") { namefile = ""; } else { - splitAtDash(namefile, namefileNames); + m->splitAtDash(namefile, namefileNames); //go through files and make sure they are good, if not, then disregard them for (int i = 0; i < namefileNames.size(); i++) { if (inputDir != "") { - string path = hasPath(namefileNames[i]); + string path = m->hasPath(namefileNames[i]); //if the user has not given a path then, add inputdir. else leave path alone. if (path == "") { namefileNames[i] = inputDir + namefileNames[i]; } } int ableToOpen; - #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 - - if (pid == 0) { - #endif - ifstream in; - ableToOpen = openInputFile(namefileNames[i], in, "noerror"); + ableToOpen = m->openInputFile(namefileNames[i], in, "noerror"); //if you can't open it, try default location if (ableToOpen == 1) { if (m->getDefaultPath() != "") { //default path is set - string tryPath = m->getDefaultPath() + getSimpleName(namefileNames[i]); + string tryPath = m->getDefaultPath() + m->getSimpleName(namefileNames[i]); m->mothurOut("Unable to open " + namefileNames[i] + ". Trying default " + tryPath); m->mothurOutEndLine(); - ableToOpen = openInputFile(tryPath, in, "noerror"); + ifstream in2; + ableToOpen = m->openInputFile(tryPath, in2, "noerror"); + in2.close(); namefileNames[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); + if (ableToOpen == 1) { + if (m->getOutputDir() != "") { //default path is set + string tryPath = m->getOutputDir() + m->getSimpleName(namefileNames[i]); + m->mothurOut("Unable to open " + namefileNames[i] + ". Trying output directory " + tryPath); m->mothurOutEndLine(); + ifstream in2; + ableToOpen = m->openInputFile(tryPath, in2, "noerror"); + in2.close(); + namefileNames[i] = tryPath; } - - #endif + } + in.close(); if (ableToOpen == 1) { m->mothurOut("Unable to open " + namefileNames[i] + ". It will be disregarded."); m->mothurOutEndLine(); abort = true; @@ -219,49 +263,44 @@ ClassifySeqsCommand::ClassifySeqsCommand(string option) { groupfile = validParameter.validFile(parameters, "group", false); if (groupfile == "not found") { groupfile = ""; } else { - splitAtDash(groupfile, groupfileNames); + m->splitAtDash(groupfile, groupfileNames); //go through files and make sure they are good, if not, then disregard them for (int i = 0; i < groupfileNames.size(); i++) { if (inputDir != "") { - string path = hasPath(groupfileNames[i]); + string path = m->hasPath(groupfileNames[i]); //if the user has not given a path then, add inputdir. else leave path alone. if (path == "") { groupfileNames[i] = inputDir + groupfileNames[i]; } } int ableToOpen; - #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 - - if (pid == 0) { - #endif - ifstream in; - ableToOpen = openInputFile(groupfileNames[i], in, "noerror"); + ableToOpen = m->openInputFile(groupfileNames[i], in, "noerror"); //if you can't open it, try default location if (ableToOpen == 1) { if (m->getDefaultPath() != "") { //default path is set - string tryPath = m->getDefaultPath() + getSimpleName(groupfileNames[i]); + string tryPath = m->getDefaultPath() + m->getSimpleName(groupfileNames[i]); m->mothurOut("Unable to open " + groupfileNames[i] + ". Trying default " + tryPath); m->mothurOutEndLine(); - ableToOpen = openInputFile(tryPath, in, "noerror"); + ifstream in2; + ableToOpen = m->openInputFile(tryPath, in2, "noerror"); + in2.close(); groupfileNames[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); + if (ableToOpen == 1) { + if (m->getOutputDir() != "") { //default path is set + string tryPath = m->getOutputDir() + m->getSimpleName(groupfileNames[i]); + m->mothurOut("Unable to open " + groupfileNames[i] + ". Trying output directory " + tryPath); m->mothurOutEndLine(); + ifstream in2; + ableToOpen = m->openInputFile(tryPath, in2, "noerror"); + in2.close(); + groupfileNames[i] = tryPath; } - - #endif + } + + in.close(); if (ableToOpen == 1) { m->mothurOut("Unable to open " + groupfileNames[i] + ". It will be disregarded."); m->mothurOutEndLine(); groupfileNames[i] = ""; @@ -310,7 +349,7 @@ ClassifySeqsCommand::ClassifySeqsCommand(string option) { convert(temp, cutoff); temp = validParameter.validFile(parameters, "probs", false); if (temp == "not found"){ temp = "true"; } - probs = isTrue(temp); + probs = m->isTrue(temp); temp = validParameter.validFile(parameters, "iters", false); if (temp == "not found") { temp = "100"; } convert(temp, iters); @@ -381,7 +420,7 @@ void ClassifySeqsCommand::help(){ int ClassifySeqsCommand::execute(){ try { - if (abort == true) { return 0; } + if (abort == true) { if (calledHelp) { return 0; } return 2; } if(method == "bayesian"){ classify = new Bayesian(taxonomyFileName, templateFileName, search, kmerSize, cutoff, iters); } else if(method == "knn"){ classify = new Knn(taxonomyFileName, templateFileName, search, kmerSize, gapOpen, gapExtend, match, misMatch, numWanted); } @@ -393,26 +432,35 @@ int ClassifySeqsCommand::execute(){ if (m->control_pressed) { delete classify; return 0; } - vector outputNames; for (int s = 0; s < fastaFileNames.size(); s++) { m->mothurOut("Classifying sequences from " + fastaFileNames[s] + " ..." ); m->mothurOutEndLine(); - if (outputDir == "") { outputDir += hasPath(fastaFileNames[s]); } - string newTaxonomyFile = outputDir + getRootName(getSimpleName(fastaFileNames[s])) + getRootName(getSimpleName(taxonomyFileName)) + "taxonomy"; - string tempTaxonomyFile = outputDir + getRootName(getSimpleName(fastaFileNames[s])) + "taxonomy.temp"; - string taxSummary = outputDir + getRootName(getSimpleName(fastaFileNames[s])) + getRootName(getSimpleName(taxonomyFileName)) + "tax.summary"; + string RippedTaxName = m->getRootName(m->getSimpleName(taxonomyFileName)); + RippedTaxName = m->getExtension(RippedTaxName.substr(0, RippedTaxName.length()-1)); + if (RippedTaxName[0] == '.') { RippedTaxName = RippedTaxName.substr(1, RippedTaxName.length()); } + RippedTaxName += "."; + + if (outputDir == "") { outputDir += m->hasPath(fastaFileNames[s]); } + string newTaxonomyFile = outputDir + m->getRootName(m->getSimpleName(fastaFileNames[s])) + RippedTaxName + "taxonomy"; + string tempTaxonomyFile = outputDir + m->getRootName(m->getSimpleName(fastaFileNames[s])) + "taxonomy.temp"; + string taxSummary = outputDir + m->getRootName(m->getSimpleName(fastaFileNames[s])) + RippedTaxName + "tax.summary"; - outputNames.push_back(newTaxonomyFile); - outputNames.push_back(taxSummary); + if ((method == "knn") && (search == "distance")) { + string DistName = outputDir + m->getRootName(m->getSimpleName(fastaFileNames[s])) + "match.dist"; + classify->setDistName(DistName); outputNames.push_back(DistName); outputTypes["matchdist"].push_back(DistName); + } + + outputNames.push_back(newTaxonomyFile); outputTypes["taxonomy"].push_back(newTaxonomyFile); + outputNames.push_back(taxSummary); outputTypes["taxsummary"].push_back(taxSummary); int start = time(NULL); int numFastaSeqs = 0; for (int i = 0; i < lines.size(); i++) { delete lines[i]; } lines.clear(); #ifdef USE_MPI - int pid, end, numSeqsPerProcessor; + int pid, numSeqsPerProcessor; int tag = 2001; vector MPIPos; @@ -427,20 +475,11 @@ int ClassifySeqsCommand::execute(){ int outMode=MPI_MODE_CREATE|MPI_MODE_WRONLY; int inMode=MPI_MODE_RDONLY; - //char* outNewTax = new char[newTaxonomyFile.length()]; - //memcpy(outNewTax, newTaxonomyFile.c_str(), newTaxonomyFile.length()); - char outNewTax[1024]; strcpy(outNewTax, newTaxonomyFile.c_str()); - - //char* outTempTax = new char[tempTaxonomyFile.length()]; - //memcpy(outTempTax, tempTaxonomyFile.c_str(), tempTaxonomyFile.length()); char outTempTax[1024]; strcpy(outTempTax, tempTaxonomyFile.c_str()); - - //char* inFileName = new char[fastaFileNames[s].length()]; - //memcpy(inFileName, fastaFileNames[s].c_str(), fastaFileNames[s].length()); char inFileName[1024]; strcpy(inFileName, fastaFileNames[s].c_str()); @@ -449,15 +488,11 @@ int ClassifySeqsCommand::execute(){ MPI_File_open(MPI_COMM_WORLD, outNewTax, outMode, MPI_INFO_NULL, &outMPINewTax); MPI_File_open(MPI_COMM_WORLD, outTempTax, outMode, MPI_INFO_NULL, &outMPITempTax); - //delete outNewTax; - //delete outTempTax; - //delete inFileName; - - if (m->control_pressed) { MPI_File_close(&inMPI); MPI_File_close(&outMPINewTax); MPI_File_close(&outMPITempTax); delete classify; return 0; } + if (m->control_pressed) { outputTypes.clear(); MPI_File_close(&inMPI); MPI_File_close(&outMPINewTax); MPI_File_close(&outMPITempTax); delete classify; return 0; } if (pid == 0) { //you are the root process - MPIPos = setFilePosFasta(fastaFileNames[s], numFastaSeqs); //fills MPIPos, returns numSeqs + MPIPos = m->setFilePosFasta(fastaFileNames[s], numFastaSeqs); //fills MPIPos, returns numSeqs //send file positions to all processes for(int i = 1; i < processors; i++) { @@ -474,7 +509,7 @@ int ClassifySeqsCommand::execute(){ //align your part driverMPI(startIndex, numSeqsPerProcessor, inMPI, outMPINewTax, outMPITempTax, MPIPos); - if (m->control_pressed) { MPI_File_close(&inMPI); MPI_File_close(&outMPINewTax); MPI_File_close(&outMPITempTax); for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } delete classify; return 0; } + if (m->control_pressed) { outputTypes.clear(); MPI_File_close(&inMPI); MPI_File_close(&outMPINewTax); MPI_File_close(&outMPITempTax); for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } delete classify; return 0; } for (int i = 1; i < processors; i++) { int done; @@ -494,7 +529,7 @@ int ClassifySeqsCommand::execute(){ //align your part driverMPI(startIndex, numSeqsPerProcessor, inMPI, outMPINewTax, outMPITempTax, MPIPos); - if (m->control_pressed) { MPI_File_close(&inMPI); MPI_File_close(&outMPINewTax); MPI_File_close(&outMPITempTax); delete classify; return 0; } + if (m->control_pressed) { outputTypes.clear(); MPI_File_close(&inMPI); MPI_File_close(&outMPINewTax); MPI_File_close(&outMPITempTax); delete classify; return 0; } int done = 0; MPI_Send(&done, 1, MPI_INT, 0, tag, MPI_COMM_WORLD); @@ -507,66 +542,25 @@ int ClassifySeqsCommand::execute(){ MPI_Barrier(MPI_COMM_WORLD); //make everyone wait - just in case #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)])); + } + #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) if(processors == 1){ - ifstream inFASTA; - openInputFile(fastaFileNames[s], inFASTA); - getNumSeqs(inFASTA, numFastaSeqs); - inFASTA.close(); - - lines.push_back(new linePair(0, numFastaSeqs)); - - driver(lines[0], newTaxonomyFile, tempTaxonomyFile, fastaFileNames[s]); + numFastaSeqs = driver(lines[0], newTaxonomyFile, tempTaxonomyFile, fastaFileNames[s]); } 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] == '>'){ unsigned long int pos = inFASTA.tellg(); positions.push_back(pos - input.length() - 1); } - } - } - inFASTA.close(); - - numFastaSeqs = positions.size(); - - int numSeqsPerProcessor = numFastaSeqs / processors; - - for (int i = 0; i < processors; i++) { - unsigned long int startPos = positions[ i * numSeqsPerProcessor ]; - if(i == processors - 1){ - numSeqsPerProcessor = numFastaSeqs - i * numSeqsPerProcessor; - } - lines.push_back(new linePair(startPos, numSeqsPerProcessor)); - } - createProcesses(newTaxonomyFile, tempTaxonomyFile, fastaFileNames[s]); - - rename((newTaxonomyFile + toString(processIDS[0]) + ".temp").c_str(), newTaxonomyFile.c_str()); - rename((tempTaxonomyFile + toString(processIDS[0]) + ".temp").c_str(), tempTaxonomyFile.c_str()); - - for(int i=1;iopenInputFile(namefileNames[s], inNames); string firstCol, secondCol; while(!inNames.eof()) { - inNames >> firstCol >> secondCol; gobble(inNames); + inNames >> firstCol >> secondCol; m->gobble(inNames); vector temp; - splitAtComma(secondCol, temp); + m->splitAtComma(secondCol, temp); nameMap[firstCol] = temp; } @@ -610,18 +604,18 @@ int ClassifySeqsCommand::execute(){ PhyloSummary taxaSum(taxonomyFileName, group); - if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } delete classify; return 0; } + if (m->control_pressed) { outputTypes.clear(); for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } delete classify; return 0; } if (namefile == "") { taxaSum.summarize(tempTaxonomyFile); } else { ifstream in; - openInputFile(tempTaxonomyFile, in); + m->openInputFile(tempTaxonomyFile, in); //read in users taxonomy file and add sequences to tree string name, taxon; while(!in.eof()){ - in >> name >> taxon; gobble(in); + in >> name >> taxon; m->gobble(in); itNames = nameMap.find(name); @@ -639,31 +633,31 @@ int ClassifySeqsCommand::execute(){ } remove(tempTaxonomyFile.c_str()); - if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } delete classify; return 0; } + if (m->control_pressed) { outputTypes.clear(); for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } delete classify; return 0; } //print summary file ofstream outTaxTree; - openOutputFile(taxSummary, outTaxTree); + m->openOutputFile(taxSummary, outTaxTree); taxaSum.print(outTaxTree); outTaxTree.close(); //output taxonomy with the unclassified bins added ifstream inTax; - openInputFile(newTaxonomyFile, inTax); + m->openInputFile(newTaxonomyFile, inTax); ofstream outTax; string unclass = newTaxonomyFile + ".unclass.temp"; - openOutputFile(unclass, outTax); + m->openOutputFile(unclass, outTax); //get maxLevel from phylotree so you know how many 'unclassified's to add int maxLevel = taxaSum.getMaxLevel(); - + //read taxfile - this reading and rewriting is done to preserve the confidence scores. string name, taxon; while (!inTax.eof()) { - if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } remove(unclass.c_str()); delete classify; return 0; } + if (m->control_pressed) { outputTypes.clear(); for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } remove(unclass.c_str()); delete classify; return 0; } - inTax >> name >> taxon; gobble(inTax); + inTax >> name >> taxon; m->gobble(inTax); string newTax = addUnclassifieds(taxon, maxLevel); @@ -688,6 +682,13 @@ int ClassifySeqsCommand::execute(){ m->mothurOutEndLine(); } + //set taxonomy file as new current taxonomyfile + string current = ""; + itTypes = outputTypes.find("taxonomy"); + if (itTypes != outputTypes.end()) { + if ((itTypes->second).size() != 0) { current = (itTypes->second)[0]; m->setTaxonomyFile(current); } + } + delete classify; return 0; } @@ -728,11 +729,11 @@ string ClassifySeqsCommand::addUnclassifieds(string tax, int maxlevel) { /**************************************************************************************************/ -void ClassifySeqsCommand::createProcesses(string taxFileName, string tempTaxFile, string filename) { +int ClassifySeqsCommand::createProcesses(string taxFileName, string tempTaxFile, string filename) { try { #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) - int process = 0; - // processIDS.resize(0); + int process = 1; + int num = 0; //loop through and create all the processes you want while (process != processors) { @@ -742,16 +743,48 @@ void ClassifySeqsCommand::createProcesses(string taxFileName, string tempTaxFile 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], taxFileName + toString(getpid()) + ".temp", tempTaxFile + toString(getpid()) + ".temp", filename); + num = driver(lines[process], taxFileName + toString(getpid()) + ".temp", tempTaxFile + toString(getpid()) + ".temp", filename); + + //pass numSeqs to parent + ofstream out; + string tempFile = filename + toString(getpid()) + ".num.temp"; + m->openOutputFile(tempFile, out); + out << num << endl; + out.close(); + + exit(0); + }else { + m->mothurOut("[ERROR]: unable to spawn the necessary processes."); m->mothurOutEndLine(); + for (int i = 0; i < processIDS.size(); i++) { kill (processIDS[i], SIGINT); } exit(0); - }else { m->mothurOut("unable to spawn the necessary processes."); m->mothurOutEndLine(); exit(0); } + } } + //parent does its part + num = driver(lines[0], taxFileName, tempTaxFile, filename); + //force parent to wait until all the processes are done - for (int i=0;iopenInputFile(tempFile, in); + if (!in.eof()) { int tempNum = 0; in >> tempNum; num += tempNum; } + in.close(); remove(tempFile.c_str()); + } + + for(int i=0;iopenOutputFileAppend(filename, output); + m->openInputFile(temp, input); while(char c = input.get()){ if(input.eof()) { break; } @@ -785,27 +818,31 @@ void ClassifySeqsCommand::appendTaxFiles(string temp, string filename) { //********************************************************************************************************************** -int ClassifySeqsCommand::driver(linePair* line, string taxFName, string tempTFName, string filename){ +int ClassifySeqsCommand::driver(linePair* filePos, string taxFName, string tempTFName, string filename){ try { ofstream outTax; - openOutputFile(taxFName, outTax); + m->openOutputFile(taxFName, outTax); ofstream outTaxSimple; - openOutputFile(tempTFName, outTaxSimple); + m->openOutputFile(tempTFName, outTaxSimple); ifstream inFASTA; - openInputFile(filename, inFASTA); - - inFASTA.seekg(line->start); + m->openInputFile(filename, inFASTA); string taxonomy; - for(int i=0;inumSeqs;i++){ - if (m->control_pressed) { return 0; } + inFASTA.seekg(filePos->start); + + bool done = false; + int count = 0; - Sequence* candidateSeq = new Sequence(inFASTA); gobble(inFASTA); + while (!done) { + if (m->control_pressed) { return 0; } + Sequence* candidateSeq = new Sequence(inFASTA); m->gobble(inFASTA); + if (candidateSeq->getName() != "") { + taxonomy = classify->getTaxonomy(candidateSeq); if (m->control_pressed) { delete candidateSeq; return 0; } @@ -820,19 +857,29 @@ int ClassifySeqsCommand::driver(linePair* line, string taxFName, string tempTFNa outTaxSimple << candidateSeq->getName() << '\t' << classify->getSimpleTax() << endl; } - } + count++; + } delete candidateSeq; - if((i+1) % 100 == 0){ - m->mothurOut("Classifying sequence " + toString(i+1)); m->mothurOutEndLine(); - } + #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((count) % 100 == 0){ m->mothurOut("Processing sequence: " + toString(count)); m->mothurOutEndLine(); } + } - + //report progress + if((count) % 100 != 0){ m->mothurOut("Processing sequence: " + toString(count)); m->mothurOutEndLine(); } + inFASTA.close(); outTax.close(); outTaxSimple.close(); - return 1; + return count; } catch(exception& e) { m->errorOut(e, "ClassifySeqsCommand", "driver"); @@ -942,10 +989,10 @@ int ClassifySeqsCommand::MPIReadNamesFile(string nameFilename){ string firstCol, secondCol; while(!iss.eof()) { - iss >> firstCol >> secondCol; gobble(iss); + iss >> firstCol >> secondCol; m->gobble(iss); vector temp; - splitAtComma(secondCol, temp); + m->splitAtComma(secondCol, temp); nameMap[firstCol] = temp; }