X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=removeseqscommand.cpp;h=a8f03e06b29c505d219a8a4f5770999586e182ae;hb=315e38cf393c82be238da5b32574f225a020d25c;hp=1b9edb0e98e20f7752fb9b8aab3584c1c05bccc0;hpb=ac1da2a793271cb67f2a2155c5558e1fabdd6aba;p=mothur.git diff --git a/removeseqscommand.cpp b/removeseqscommand.cpp index 1b9edb0..a8f03e0 100644 --- a/removeseqscommand.cpp +++ b/removeseqscommand.cpp @@ -9,6 +9,7 @@ #include "removeseqscommand.h" #include "sequence.hpp" +#include "listvector.hpp" //********************************************************************************************************************** @@ -21,19 +22,78 @@ RemoveSeqsCommand::RemoveSeqsCommand(string option){ else { //valid paramters for this command - string Array[] = {"fasta","name", "group", "alignreport", "accnos" }; + string Array[] = {"fasta","name", "group", "alignreport", "accnos", "list","outputdir","inputdir" }; vector myArray (Array, Array+(sizeof(Array)/sizeof(string))); OptionParser parser(option); map parameters = parser.getParameters(); ValidParameters validParameter; + map::iterator it; //check to make sure all parameters are valid for command - for (map::iterator it = parameters.begin(); it != parameters.end(); it++) { + for (it = parameters.begin(); it != parameters.end(); it++) { if (validParameter.isValidParameter(it->first, myArray, it->second) != true) { 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 = ""; } + + //if the user changes the input directory command factory will send this info to us in the output parameter + string inputDir = validParameter.validFile(parameters, "inputdir", false); + if (inputDir == "not found"){ inputDir = ""; } + else { + string path; + it = parameters.find("alignreport"); + //user has given a template file + if(it != parameters.end()){ + path = 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; } + } + + it = parameters.find("fasta"); + //user has given a template file + if(it != parameters.end()){ + path = 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; } + } + + it = parameters.find("accnos"); + //user has given a template file + if(it != parameters.end()){ + path = 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("list"); + //user has given a template file + if(it != parameters.end()){ + path = 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; } + } + + it = parameters.find("name"); + //user has given a template file + if(it != parameters.end()){ + path = 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; } + } + + it = parameters.find("group"); + //user has given a template file + if(it != parameters.end()){ + path = 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; } + } + } + + //check for required parameters accnosfile = validParameter.validFile(parameters, "accnos", true); if (accnosfile == "not open") { abort = true; } @@ -55,9 +115,16 @@ RemoveSeqsCommand::RemoveSeqsCommand(string option){ if (alignfile == "not open") { abort = true; } else if (alignfile == "not found") { alignfile = ""; } - if ((fastafile == "") && (namefile == "") && (groupfile == "") && (alignfile == "")) { mothurOut("You must provide one of the following: fasta, name, group, alignreport."); mothurOutEndLine(); abort = true; } + listfile = validParameter.validFile(parameters, "list", true); + if (listfile == "not open") { abort = true; } + else if (listfile == "not found") { listfile = ""; } + + if ((fastafile == "") && (namefile == "") && (groupfile == "") && (alignfile == "") && (listfile == "")) { mothurOut("You must provide one of the following: fasta, name, group, alignreport or list."); mothurOutEndLine(); abort = true; } - if (parameters.size() > 2) { mothurOut("You may only enter one of the following: fasta, name, group, alignreport."); mothurOutEndLine(); abort = true; } + int okay = 2; + if (outputDir != "") { okay++; } + + if (parameters.size() > okay) { mothurOut("You may only enter one of the following: fasta, name, group, alignreport, or list."); mothurOutEndLine(); abort = true; } } } @@ -70,9 +137,9 @@ RemoveSeqsCommand::RemoveSeqsCommand(string option){ void RemoveSeqsCommand::help(){ try { - mothurOut("The remove.seqs command reads an .accnos file and one of the following file types: fasta, name, group or alignreport file.\n"); + mothurOut("The remove.seqs command reads an .accnos file and one of the following file types: fasta, name, group, list or alignreport file.\n"); mothurOut("It outputs a file containing the sequences NOT in the .accnos file.\n"); - mothurOut("The remove.seqs command parameters are accnos, fasta, name, group and alignreport. You must provide accnos and one of the other parameters.\n"); + mothurOut("The remove.seqs command parameters are accnos, fasta, name, group, list and alignreport. You must provide accnos and one of the other parameters.\n"); mothurOut("The remove.seqs command should be in the following format: remove.seqs(accnos=yourAccnos, fasta=yourFasta).\n"); mothurOut("Example remove.seqs(accnos=amazon.accnos, fasta=amazon.fasta).\n"); mothurOut("Note: No spaces between parameter labels (i.e. fasta), '=' and parameters (i.e.yourFasta).\n\n"); @@ -98,6 +165,7 @@ int RemoveSeqsCommand::execute(){ else if (namefile != "") { readName(); } else if (groupfile != "") { readGroup(); } else if (alignfile != "") { readAlign(); } + else if (listfile != "") { readList(); } return 0; } @@ -111,6 +179,7 @@ int RemoveSeqsCommand::execute(){ //********************************************************************************************************************** void RemoveSeqsCommand::readFasta(){ try { + if (outputDir == "") { outputDir += hasPath(fastafile); } string outputFileName = getRootName(fastafile) + "pick" + getExtension(fastafile); ofstream out; openOutputFile(outputFileName, out); @@ -125,13 +194,14 @@ void RemoveSeqsCommand::readFasta(){ Sequence currSeq(in); name = currSeq.getName(); - //if this name is in the accnos file - if (names.count(name) == 0) { - wroteSomething = true; - - currSeq.printSequence(out); - }else { names.erase(name); } - + if (name != "") { + //if this name is in the accnos file + if (names.count(name) == 0) { + wroteSomething = true; + + currSeq.printSequence(out); + }else { names.erase(name); } + } gobble(in); } in.close(); @@ -148,11 +218,75 @@ void RemoveSeqsCommand::readFasta(){ exit(1); } } +//********************************************************************************************************************** +void RemoveSeqsCommand::readList(){ + try { + if (outputDir == "") { outputDir += hasPath(listfile); } + string outputFileName = getRootName(listfile) + "pick" + getExtension(listfile); + ofstream out; + openOutputFile(outputFileName, out); + + ifstream in; + openInputFile(listfile, in); + + bool wroteSomething = false; + + while(!in.eof()){ + //read in list vector + ListVector list(in); + + //make a new list vector + ListVector newList; + newList.setLabel(list.getLabel()); + + //for each bin + for (int i = 0; i < list.getNumBins(); i++) { + + //parse out names that are in accnos file + string binnames = list.get(i); + + string newNames = ""; + while (binnames.find_first_of(',') != -1) { + string name = binnames.substr(0,binnames.find_first_of(',')); + binnames = binnames.substr(binnames.find_first_of(',')+1, binnames.length()); + + //if that name is in the .accnos file, add it + if (names.count(name) == 0) { newNames += name + ","; } + } + + //get last name + if (names.count(binnames) == 0) { newNames += binnames; } + //if there are names in this bin add to new list + if (newNames != "") { newList.push_back(newNames); } + } + + //print new listvector + if (newList.getNumBins() != 0) { + wroteSomething = true; + newList.print(out); + } + + gobble(in); + } + in.close(); + out.close(); + + if (wroteSomething == false) { + mothurOut("Your file contains only sequences from the .accnos file."); mothurOutEndLine(); + remove(outputFileName.c_str()); + } + + } + catch(exception& e) { + errorOut(e, "RemoveSeqsCommand", "readList"); + exit(1); + } +} //********************************************************************************************************************** void RemoveSeqsCommand::readName(){ try { - + if (outputDir == "") { outputDir += hasPath(namefile); } string outputFileName = getRootName(namefile) + "pick" + getExtension(namefile); ofstream out; @@ -235,7 +369,7 @@ void RemoveSeqsCommand::readName(){ //********************************************************************************************************************** void RemoveSeqsCommand::readGroup(){ try { - + if (outputDir == "") { outputDir += hasPath(groupfile); } string outputFileName = getRootName(groupfile) + "pick" + getExtension(groupfile); ofstream out; openOutputFile(outputFileName, out); @@ -278,6 +412,7 @@ void RemoveSeqsCommand::readGroup(){ //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 void RemoveSeqsCommand::readAlign(){ try { + if (outputDir == "") { outputDir += hasPath(alignfile); } string outputFileName = getRootName(getRootName(alignfile)) + "pick.align.report"; ofstream out; openOutputFile(outputFileName, out);