X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=getseqscommand.cpp;h=68d0d2b4e4a8f9addeb39d4ee853d12aef61592f;hb=348de0f8b17d84ede77081dcf67bd6ef43496677;hp=a9463a076cfee738f5171575325a6a92881744d9;hpb=14edc148cb299c5624f72bb681375b704aa74f43;p=mothur.git diff --git a/getseqscommand.cpp b/getseqscommand.cpp index a9463a0..68d0d2b 100644 --- a/getseqscommand.cpp +++ b/getseqscommand.cpp @@ -12,17 +12,70 @@ #include "listvector.hpp" //********************************************************************************************************************** - +vector GetSeqsCommand::getValidParameters(){ + try { + string Array[] = {"fasta","name", "group", "qfile","alignreport", "accnos", "accnos2","dups", "list","taxonomy","outputdir","inputdir"}; + vector myArray (Array, Array+(sizeof(Array)/sizeof(string))); + return myArray; + } + catch(exception& e) { + m->errorOut(e, "GetSeqsCommand", "getValidParameters"); + exit(1); + } +} +//********************************************************************************************************************** +GetSeqsCommand::GetSeqsCommand(){ + try { + abort = true; calledHelp = true; + vector tempOutNames; + outputTypes["fasta"] = tempOutNames; + outputTypes["taxonomy"] = tempOutNames; + outputTypes["name"] = tempOutNames; + outputTypes["group"] = tempOutNames; + outputTypes["alignreport"] = tempOutNames; + outputTypes["list"] = tempOutNames; + outputTypes["qfile"] = tempOutNames; + outputTypes["accnosreport"] = tempOutNames; + } + catch(exception& e) { + m->errorOut(e, "GetSeqsCommand", "GetSeqsCommand"); + exit(1); + } +} +//********************************************************************************************************************** +vector GetSeqsCommand::getRequiredParameters(){ + try { + string Array[] = {"accnos"}; + vector myArray (Array, Array+(sizeof(Array)/sizeof(string))); + return myArray; + } + catch(exception& e) { + m->errorOut(e, "GetSeqsCommand", "getRequiredParameters"); + exit(1); + } +} +//********************************************************************************************************************** +vector GetSeqsCommand::getRequiredFiles(){ + try { + vector myArray; + return myArray; + } + catch(exception& e) { + m->errorOut(e, "GetSeqsCommand", "getRequiredFiles"); + exit(1); + } +} +//********************************************************************************************************************** GetSeqsCommand::GetSeqsCommand(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 { //valid paramters for this command - string Array[] = {"fasta","name", "group", "alignreport", "accnos", "list","taxonomy","outputdir","inputdir"}; + string Array[] = {"fasta","name", "group", "alignreport", "qfile", "accnos", "accnos2","dups", "list","taxonomy","outputdir","inputdir"}; vector myArray (Array, Array+(sizeof(Array)/sizeof(string))); OptionParser parser(option); @@ -36,6 +89,17 @@ GetSeqsCommand::GetSeqsCommand(string option) { if (validParameter.isValidParameter(it->first, myArray, it->second) != true) { abort = true; } } + //initialize outputTypes + vector tempOutNames; + outputTypes["fasta"] = tempOutNames; + outputTypes["taxonomy"] = tempOutNames; + outputTypes["name"] = tempOutNames; + outputTypes["group"] = tempOutNames; + outputTypes["alignreport"] = tempOutNames; + outputTypes["list"] = tempOutNames; + outputTypes["qfile"] = tempOutNames; + outputTypes["accnosreport"] = 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 = ""; } @@ -47,7 +111,7 @@ GetSeqsCommand::GetSeqsCommand(string option) { it = parameters.find("alignreport"); //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["alignreport"] = inputDir + it->second; } } @@ -55,7 +119,7 @@ GetSeqsCommand::GetSeqsCommand(string option) { it = parameters.find("fasta"); //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["fasta"] = inputDir + it->second; } } @@ -63,15 +127,23 @@ GetSeqsCommand::GetSeqsCommand(string option) { it = parameters.find("accnos"); //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["accnos"] = inputDir + it->second; } } + it = parameters.find("accnos2"); + //user has given a template file + if(it != parameters.end()){ + path = m->hasPath(it->second); + //if the user has not given a path then, add inputdir. else leave path alone. + if (path == "") { parameters["accnos2"] = inputDir + it->second; } + } + it = parameters.find("list"); //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["list"] = inputDir + it->second; } } @@ -79,7 +151,7 @@ GetSeqsCommand::GetSeqsCommand(string option) { it = parameters.find("name"); //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["name"] = inputDir + it->second; } } @@ -87,7 +159,7 @@ GetSeqsCommand::GetSeqsCommand(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; } } @@ -95,10 +167,18 @@ GetSeqsCommand::GetSeqsCommand(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; } } + + it = parameters.find("qfile"); + //user has given a template file + if(it != parameters.end()){ + path = m->hasPath(it->second); + //if the user has not given a path then, add inputdir. else leave path alone. + if (path == "") { parameters["qfile"] = inputDir + it->second; } + } } @@ -107,6 +187,8 @@ GetSeqsCommand::GetSeqsCommand(string option) { if (accnosfile == "not open") { abort = true; } else if (accnosfile == "not found") { accnosfile = ""; m->mothurOut("You must provide an accnos file."); m->mothurOutEndLine(); abort = true; } + if (accnosfile2 == "not found") { accnosfile2 = ""; } + fastafile = validParameter.validFile(parameters, "fasta", true); if (fastafile == "not open") { abort = true; } else if (fastafile == "not found") { fastafile = ""; } @@ -130,9 +212,19 @@ GetSeqsCommand::GetSeqsCommand(string option) { taxfile = validParameter.validFile(parameters, "taxonomy", true); if (taxfile == "not open") { abort = true; } else if (taxfile == "not found") { taxfile = ""; } - - if ((fastafile == "") && (namefile == "") && (groupfile == "") && (alignfile == "") && (listfile == "") && (taxfile == "")) { m->mothurOut("You must provide one of the following: fasta, name, group, alignreport, taxonomy or listfile."); m->mothurOutEndLine(); abort = true; } + qualfile = validParameter.validFile(parameters, "qfile", true); + if (qualfile == "not open") { abort = true; } + else if (qualfile == "not found") { qualfile = ""; } + + string usedDups = "true"; + string temp = validParameter.validFile(parameters, "dups", false); if (temp == "not found") { temp = "false"; usedDups = ""; } + dups = m->isTrue(temp); + + if ((fastafile == "") && (namefile == "") && (groupfile == "") && (alignfile == "") && (listfile == "") && (taxfile == "") && (qualfile == "") && (accnosfile2 == "")) { m->mothurOut("You must provide one of the following: fasta, name, group, alignreport, taxonomy, quality or listfile."); m->mothurOutEndLine(); abort = true; } + + if ((usedDups != "") && (namefile == "")) { m->mothurOut("You may only use dups with the name option."); m->mothurOutEndLine(); abort = true; } + } } @@ -145,9 +237,10 @@ GetSeqsCommand::GetSeqsCommand(string option) { void GetSeqsCommand::help(){ try { - m->mothurOut("The get.seqs command reads an .accnos file and any of the following file types: fasta, name, group, list, taxonomy or alignreport file.\n"); + m->mothurOut("The get.seqs command reads an .accnos file and any of the following file types: fasta, name, group, list, taxonomy, quality or alignreport file.\n"); m->mothurOut("It outputs a file containing only the sequences in the .accnos file.\n"); - m->mothurOut("The get.seqs command parameters are accnos, fasta, name, group, list, taxonomy and alignreport. You must provide accnos and at least one of the other parameters.\n"); + m->mothurOut("The get.seqs command parameters are accnos, fasta, name, group, list, taxonomy, qfile, alignreport and dups. You must provide accnos and at least one of the other parameters.\n"); + m->mothurOut("The dups parameter allows you to add the entire line from a name file if you add any name from the line. default=false. \n"); m->mothurOut("The get.seqs command should be in the following format: get.seqs(accnos=yourAccnos, fasta=yourFasta).\n"); m->mothurOut("Example get.seqs(accnos=amazon.accnos, fasta=amazon.fasta).\n"); m->mothurOut("Note: No spaces between parameter labels (i.e. fasta), '=' and parameters (i.e.yourFasta).\n\n"); @@ -163,7 +256,7 @@ void GetSeqsCommand::help(){ int GetSeqsCommand::execute(){ try { - if (abort == true) { return 0; } + if (abort == true) { if (calledHelp) { return 0; } return 2; } //get names you want to keep readAccnos(); @@ -171,20 +264,57 @@ int GetSeqsCommand::execute(){ if (m->control_pressed) { return 0; } //read through the correct file and output lines you want to keep - if (fastafile != "") { readFasta(); } - if (namefile != "") { readName(); } - if (groupfile != "") { readGroup(); } - if (alignfile != "") { readAlign(); } - if (listfile != "") { readList(); } - if (taxfile != "") { readTax(); } + if (namefile != "") { readName(); } + if (fastafile != "") { readFasta(); } + if (groupfile != "") { readGroup(); } + if (alignfile != "") { readAlign(); } + if (listfile != "") { readList(); } + if (taxfile != "") { readTax(); } + if (qualfile != "") { readQual(); } + if (accnosfile2 != "") { compareAccnos(); } - if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } return 0; } + if (m->control_pressed) { outputTypes.clear(); for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } return 0; } + + m->mothurOut("Selected " + toString(names.size()) + " sequences."); m->mothurOutEndLine(); if (outputNames.size() != 0) { m->mothurOutEndLine(); m->mothurOut("Output File Names: "); m->mothurOutEndLine(); for (int i = 0; i < outputNames.size(); i++) { m->mothurOut(outputNames[i]); m->mothurOutEndLine(); } m->mothurOutEndLine(); + + //set fasta file as new current fastafile + string current = ""; + itTypes = outputTypes.find("fasta"); + if (itTypes != outputTypes.end()) { + if ((itTypes->second).size() != 0) { current = (itTypes->second)[0]; m->setFastaFile(current); } + } + + itTypes = outputTypes.find("name"); + if (itTypes != outputTypes.end()) { + if ((itTypes->second).size() != 0) { current = (itTypes->second)[0]; m->setNameFile(current); } + } + + itTypes = outputTypes.find("group"); + if (itTypes != outputTypes.end()) { + if ((itTypes->second).size() != 0) { current = (itTypes->second)[0]; m->setGroupFile(current); } + } + + itTypes = outputTypes.find("list"); + if (itTypes != outputTypes.end()) { + if ((itTypes->second).size() != 0) { current = (itTypes->second)[0]; m->setListFile(current); } + } + + itTypes = outputTypes.find("taxonomy"); + if (itTypes != outputTypes.end()) { + if ((itTypes->second).size() != 0) { current = (itTypes->second)[0]; m->setTaxonomyFile(current); } + } + + itTypes = outputTypes.find("qfile"); + if (itTypes != outputTypes.end()) { + if ((itTypes->second).size() != 0) { current = (itTypes->second)[0]; m->setQualFile(current); } + } + } return 0; @@ -199,14 +329,15 @@ int GetSeqsCommand::execute(){ //********************************************************************************************************************** int GetSeqsCommand::readFasta(){ try { - if (outputDir == "") { outputDir += hasPath(fastafile); } - string outputFileName = outputDir + getRootName(getSimpleName(fastafile)) + "pick" + getExtension(fastafile); + string thisOutputDir = outputDir; + if (outputDir == "") { thisOutputDir += m->hasPath(fastafile); } + string outputFileName = thisOutputDir + m->getRootName(m->getSimpleName(fastafile)) + "pick" + m->getExtension(fastafile); ofstream out; - openOutputFile(outputFileName, out); + m->openOutputFile(outputFileName, out); ifstream in; - openInputFile(fastafile, in); + m->openInputFile(fastafile, in); string name; bool wroteSomething = false; @@ -220,21 +351,20 @@ int GetSeqsCommand::readFasta(){ if (name != "") { //if this name is in the accnos file - if (names.count(name) == 1) { + if (names.count(name) != 0) { wroteSomething = true; currSeq.printSequence(out); } } - gobble(in); + m->gobble(in); } in.close(); out.close(); - if (wroteSomething == false) { - m->mothurOut("Your file does not contain any sequence from the .accnos file."); m->mothurOutEndLine(); - remove(outputFileName.c_str()); - }else { outputNames.push_back(outputFileName); } + + if (wroteSomething == false) { m->mothurOut("Your file does not contain any sequence from the .accnos file."); m->mothurOutEndLine(); } + outputNames.push_back(outputFileName); outputTypes["fasta"].push_back(outputFileName); return 0; @@ -245,15 +375,81 @@ int GetSeqsCommand::readFasta(){ } } //********************************************************************************************************************** +int GetSeqsCommand::readQual(){ + try { + string thisOutputDir = outputDir; + if (outputDir == "") { thisOutputDir += m->hasPath(qualfile); } + string outputFileName = thisOutputDir + m->getRootName(m->getSimpleName(qualfile)) + "pick" + m->getExtension(qualfile); + ofstream out; + m->openOutputFile(outputFileName, out); + + + ifstream in; + m->openInputFile(qualfile, in); + string name; + + bool wroteSomething = false; + + + while(!in.eof()){ + string saveName = ""; + string name = ""; + string scores = ""; + + in >> name; + + if (name.length() != 0) { + saveName = name.substr(1); + while (!in.eof()) { + char c = in.get(); + if (c == 10 || c == 13){ break; } + else { name += c; } + } + m->gobble(in); + } + + while(in){ + char letter= in.get(); + if(letter == '>'){ in.putback(letter); break; } + else{ scores += letter; } + } + + m->gobble(in); + + if (names.count(saveName) != 0) { + wroteSomething = true; + + out << name << endl << scores; + } + + m->gobble(in); + } + in.close(); + out.close(); + + + if (wroteSomething == false) { m->mothurOut("Your file does not contain any sequence from the .accnos file."); m->mothurOutEndLine(); } + outputNames.push_back(outputFileName); outputTypes["qfile"].push_back(outputFileName); + + return 0; + + } + catch(exception& e) { + m->errorOut(e, "GetSeqsCommand", "readQual"); + exit(1); + } +} +//********************************************************************************************************************** int GetSeqsCommand::readList(){ try { - if (outputDir == "") { outputDir += hasPath(listfile); } - string outputFileName = outputDir + getRootName(getSimpleName(listfile)) + "pick" + getExtension(listfile); + string thisOutputDir = outputDir; + if (outputDir == "") { thisOutputDir += m->hasPath(listfile); } + string outputFileName = thisOutputDir + m->getRootName(m->getSimpleName(listfile)) + "pick" + m->getExtension(listfile); ofstream out; - openOutputFile(outputFileName, out); + m->openOutputFile(outputFileName, out); ifstream in; - openInputFile(listfile, in); + m->openInputFile(listfile, in); bool wroteSomething = false; @@ -280,11 +476,11 @@ int GetSeqsCommand::readList(){ binnames = binnames.substr(binnames.find_first_of(',')+1, binnames.length()); //if that name is in the .accnos file, add it - if (names.count(name) == 1) { newNames += name + ","; } + if (names.count(name) != 0) { newNames += name + ","; } } //get last name - if (names.count(binnames) == 1) { newNames += binnames + ","; } + if (names.count(binnames) != 0) { newNames += binnames + ","; } //if there are names in this bin add to new list if (newNames != "") { @@ -299,15 +495,13 @@ int GetSeqsCommand::readList(){ newList.print(out); } - gobble(in); + m->gobble(in); } in.close(); out.close(); - if (wroteSomething == false) { - m->mothurOut("Your file does not contain any sequence from the .accnos file."); m->mothurOutEndLine(); - remove(outputFileName.c_str()); - }else { outputNames.push_back(outputFileName); } + if (wroteSomething == false) { m->mothurOut("Your file does not contain any sequence from the .accnos file."); m->mothurOutEndLine(); } + outputNames.push_back(outputFileName); outputTypes["list"].push_back(outputFileName); return 0; @@ -320,14 +514,15 @@ int GetSeqsCommand::readList(){ //********************************************************************************************************************** int GetSeqsCommand::readName(){ try { - if (outputDir == "") { outputDir += hasPath(namefile); } - string outputFileName = outputDir + getRootName(getSimpleName(namefile)) + "pick" + getExtension(namefile); + string thisOutputDir = outputDir; + if (outputDir == "") { thisOutputDir += m->hasPath(namefile); } + string outputFileName = thisOutputDir + m->getRootName(m->getSimpleName(namefile)) + "pick" + m->getExtension(namefile); ofstream out; - openOutputFile(outputFileName, out); + m->openOutputFile(outputFileName, out); ifstream in; - openInputFile(namefile, in); + m->openInputFile(namefile, in); string name, firstCol, secondCol; bool wroteSomething = false; @@ -338,7 +533,10 @@ int GetSeqsCommand::readName(){ if (m->control_pressed) { in.close(); out.close(); remove(outputFileName.c_str()); return 0; } in >> firstCol; - in >> secondCol; + in >> secondCol; + + string hold = ""; + if (dups) { hold = secondCol; } vector parsedNames; //parse second column saving each name @@ -353,48 +551,50 @@ int GetSeqsCommand::readName(){ vector validSecond; for (int i = 0; i < parsedNames.size(); i++) { - if (names.count(parsedNames[i]) == 1) { + if (names.count(parsedNames[i]) != 0) { validSecond.push_back(parsedNames[i]); } } - - //if the name in the first column is in the set then print it and any other names in second column also in set - if (names.count(firstCol) == 1) { - + if ((dups) && (validSecond.size() != 0)) { //dups = true and we want to add someone, then add everyone + for (int i = 0; i < parsedNames.size(); i++) { names.insert(parsedNames[i]); } + out << firstCol << '\t' << hold << endl; wroteSomething = true; - - out << firstCol << '\t'; - - //you know you have at least one valid second since first column is valid - for (int i = 0; i < validSecond.size()-1; i++) { out << validSecond[i] << ','; } - out << validSecond[validSecond.size()-1] << endl; - - - //make first name in set you come to first column and then add the remaining names to second column }else { - //you want part of this row - if (validSecond.size() != 0) { + //if the name in the first column is in the set then print it and any other names in second column also in set + if (names.count(firstCol) != 0) { wroteSomething = true; - out << validSecond[0] << '\t'; - + out << firstCol << '\t'; + //you know you have at least one valid second since first column is valid for (int i = 0; i < validSecond.size()-1; i++) { out << validSecond[i] << ','; } out << validSecond[validSecond.size()-1] << endl; + + + //make first name in set you come to first column and then add the remaining names to second column + }else { + //you want part of this row + if (validSecond.size() != 0) { + + wroteSomething = true; + + out << validSecond[0] << '\t'; + + //you know you have at least one valid second since first column is valid + for (int i = 0; i < validSecond.size()-1; i++) { out << validSecond[i] << ','; } + out << validSecond[validSecond.size()-1] << endl; + } } } - - gobble(in); + m->gobble(in); } in.close(); out.close(); - if (wroteSomething == false) { - m->mothurOut("Your file does not contain any sequence from the .accnos file."); m->mothurOutEndLine(); - remove(outputFileName.c_str()); - }else { outputNames.push_back(outputFileName); } + if (wroteSomething == false) { m->mothurOut("Your file does not contain any sequence from the .accnos file."); m->mothurOutEndLine(); } + outputNames.push_back(outputFileName); outputTypes["name"].push_back(outputFileName); return 0; @@ -408,14 +608,15 @@ int GetSeqsCommand::readName(){ //********************************************************************************************************************** int GetSeqsCommand::readGroup(){ try { - if (outputDir == "") { outputDir += hasPath(groupfile); } - string outputFileName = outputDir + getRootName(getSimpleName(groupfile)) + "pick" + getExtension(groupfile); + string thisOutputDir = outputDir; + if (outputDir == "") { thisOutputDir += m->hasPath(groupfile); } + string outputFileName = thisOutputDir + m->getRootName(m->getSimpleName(groupfile)) + "pick" + m->getExtension(groupfile); ofstream out; - openOutputFile(outputFileName, out); + m->openOutputFile(outputFileName, out); ifstream in; - openInputFile(groupfile, in); + m->openInputFile(groupfile, in); string name, group; bool wroteSomething = false; @@ -429,21 +630,19 @@ int GetSeqsCommand::readGroup(){ in >> group; //read from second column //if this name is in the accnos file - if (names.count(name) == 1) { + if (names.count(name) != 0) { wroteSomething = true; out << name << '\t' << group << endl; } - gobble(in); + m->gobble(in); } in.close(); out.close(); - if (wroteSomething == false) { - m->mothurOut("Your file does not contain any sequence from the .accnos file."); m->mothurOutEndLine(); - remove(outputFileName.c_str()); - }else { outputNames.push_back(outputFileName); } + if (wroteSomething == false) { m->mothurOut("Your file does not contain any sequence from the .accnos file."); m->mothurOutEndLine(); } + outputNames.push_back(outputFileName); outputTypes["group"].push_back(outputFileName); return 0; @@ -456,13 +655,14 @@ int GetSeqsCommand::readGroup(){ //********************************************************************************************************************** int GetSeqsCommand::readTax(){ try { - if (outputDir == "") { outputDir += hasPath(taxfile); } - string outputFileName = outputDir + getRootName(getSimpleName(taxfile)) + "pick" + getExtension(taxfile); + string thisOutputDir = outputDir; + if (outputDir == "") { thisOutputDir += m->hasPath(taxfile); } + string outputFileName = thisOutputDir + m->getRootName(m->getSimpleName(taxfile)) + "pick" + m->getExtension(taxfile); ofstream out; - openOutputFile(outputFileName, out); + m->openOutputFile(outputFileName, out); ifstream in; - openInputFile(taxfile, in); + m->openInputFile(taxfile, in); string name, tax; bool wroteSomething = false; @@ -475,22 +675,20 @@ int GetSeqsCommand::readTax(){ in >> tax; //read from second column //if this name is in the accnos file - if (names.count(name) == 1) { + if (names.count(name) != 0) { wroteSomething = true; out << name << '\t' << tax << endl; } - gobble(in); + m->gobble(in); } in.close(); out.close(); - if (wroteSomething == false) { - m->mothurOut("Your file does not contain any sequence from the .accnos file."); m->mothurOutEndLine(); - remove(outputFileName.c_str()); - }else { outputNames.push_back(outputFileName); } - + if (wroteSomething == false) { m->mothurOut("Your file does not contain any sequence from the .accnos file."); m->mothurOutEndLine(); } + outputNames.push_back(outputFileName); outputTypes["taxonomy"].push_back(outputFileName); + return 0; } @@ -503,14 +701,15 @@ int GetSeqsCommand::readTax(){ //alignreport file has a column header line then all other lines contain 16 columns. we just want the first column since that contains the name int GetSeqsCommand::readAlign(){ try { - if (outputDir == "") { outputDir += hasPath(alignfile); } - string outputFileName = outputDir + getRootName(getSimpleName(alignfile)) + "pick.align.report"; + string thisOutputDir = outputDir; + if (outputDir == "") { thisOutputDir += m->hasPath(alignfile); } + string outputFileName = thisOutputDir + m->getRootName(m->getSimpleName(alignfile)) + "pick.align.report"; ofstream out; - openOutputFile(outputFileName, out); + m->openOutputFile(outputFileName, out); ifstream in; - openInputFile(alignfile, in); + m->openInputFile(alignfile, in); string name, junk; bool wroteSomething = false; @@ -530,7 +729,7 @@ int GetSeqsCommand::readAlign(){ in >> name; //read from first column //if this name is in the accnos file - if (names.count(name) == 1) { + if (names.count(name) != 0) { wroteSomething = true; out << name << '\t'; @@ -550,15 +749,13 @@ int GetSeqsCommand::readAlign(){ } } - gobble(in); + m->gobble(in); } in.close(); out.close(); - if (wroteSomething == false) { - m->mothurOut("Your file does not contain any sequence from the .accnos file."); m->mothurOutEndLine(); - remove(outputFileName.c_str()); - }else { outputNames.push_back(outputFileName); } + if (wroteSomething == false) { m->mothurOut("Your file does not contain any sequence from the .accnos file."); m->mothurOutEndLine(); } + outputNames.push_back(outputFileName); outputTypes["alignreport"].push_back(outputFileName); return 0; @@ -574,7 +771,7 @@ int GetSeqsCommand::readAccnos(){ try { ifstream in; - openInputFile(accnosfile, in); + m->openInputFile(accnosfile, in); string name; while(!in.eof()){ @@ -582,7 +779,7 @@ int GetSeqsCommand::readAccnos(){ names.insert(name); - gobble(in); + m->gobble(in); } in.close(); @@ -594,6 +791,103 @@ int GetSeqsCommand::readAccnos(){ exit(1); } } +//********************************************************************************************************************** + +int GetSeqsCommand::compareAccnos(){ + try { + + string thisOutputDir = outputDir; + if (outputDir == "") { thisOutputDir += m->hasPath(accnosfile); } + string outputFileName = thisOutputDir + m->getRootName(m->getSimpleName(accnosfile)) + "accnos.report"; + ofstream out; + m->openOutputFile(outputFileName, out); + + ifstream in; + m->openInputFile(accnosfile2, in); + string name; + + set namesAccnos2; + set namesDups; + set namesAccnos = names; + + map nameCount; + + if (namefile != "") { + ifstream inName; + m->openInputFile(namefile, inName); + + + while(!inName.eof()){ + + if (m->control_pressed) { inName.close(); return 0; } + + string thisname, repnames; + + inName >> thisname; m->gobble(inName); //read from first column + inName >> repnames; //read from second column + + int num = m->getNumNames(repnames); + nameCount[thisname] = num; + + m->gobble(inName); + } + inName.close(); + } + + while(!in.eof()){ + in >> name; + + if (namesAccnos.count(name) == 0){ //name unique to accnos2 + namesAccnos2.insert(name); + }else { //you are in both so erase + namesAccnos.erase(name); + namesDups.insert(name); + } + + m->gobble(in); + } + in.close(); + + out << "Names in both files : " + toString(namesDups.size()) << endl; + m->mothurOut("Names in both files : " + toString(namesDups.size())); m->mothurOutEndLine(); + + for (set::iterator it = namesDups.begin(); it != namesDups.end(); it++) { + out << (*it); + if (namefile != "") { out << '\t' << nameCount[(*it)]; } + out << endl; + } + + out << "Names unique to " + accnosfile + " : " + toString(namesAccnos.size()) << endl; + m->mothurOut("Names unique to " + accnosfile + " : " + toString(namesAccnos.size())); m->mothurOutEndLine(); + + for (set::iterator it = namesAccnos.begin(); it != namesAccnos.end(); it++) { + out << (*it); + if (namefile != "") { out << '\t' << nameCount[(*it)]; } + out << endl; + } + + out << "Names unique to " + accnosfile2 + " : " + toString(namesAccnos2.size()) << endl; + m->mothurOut("Names unique to " + accnosfile2 + " : " + toString(namesAccnos2.size())); m->mothurOutEndLine(); + + for (set::iterator it = namesAccnos2.begin(); it != namesAccnos2.end(); it++) { + out << (*it); + if (namefile != "") { out << '\t' << nameCount[(*it)]; } + out << endl; + } + + out.close(); + + outputNames.push_back(outputFileName); outputTypes["accnosreport"].push_back(outputFileName); + + return 0; + + } + catch(exception& e) { + m->errorOut(e, "GetSeqsCommand", "readAccnos"); + exit(1); + } +} + //**********************************************************************************************************************