X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=binsequencecommand.cpp;h=ad71d1065fb32904b365a7cd2be46a28718a7d98;hb=cc19310422f125d6628980bd1148e1e816792382;hp=7569a4be3113144a96048f5a4d624d271c15b9f4;hpb=49d2b7459c5027557564b21e9487dadafbbbdc96;p=mothur.git diff --git a/binsequencecommand.cpp b/binsequencecommand.cpp index 7569a4b..ad71d10 100644 --- a/binsequencecommand.cpp +++ b/binsequencecommand.cpp @@ -15,8 +15,9 @@ vector BinSeqCommand::setParameters(){ try { CommandParameter plist("list", "InputTypes", "", "", "none", "none", "none",false,true); parameters.push_back(plist); CommandParameter pfasta("fasta", "InputTypes", "", "", "none", "none", "none",false,true); parameters.push_back(pfasta); - CommandParameter pname("name", "InputTypes", "", "", "none", "none", "none",false,false); parameters.push_back(pname); - CommandParameter pgroup("group", "InputTypes", "", "", "none", "none", "none",false,false); parameters.push_back(pgroup); + CommandParameter pname("name", "InputTypes", "", "", "NameCount", "none", "none",false,false); parameters.push_back(pname); + CommandParameter pcount("count", "InputTypes", "", "", "NameCount-CountGroup", "none", "none",false,false); parameters.push_back(pcount); + CommandParameter pgroup("group", "InputTypes", "", "", "CountGroup", "none", "none",false,false); parameters.push_back(pgroup); CommandParameter plabel("label", "String", "", "", "", "", "",false,false); parameters.push_back(plabel); CommandParameter pinputdir("inputdir", "String", "", "", "", "", "",false,false); parameters.push_back(pinputdir); CommandParameter poutputdir("outputdir", "String", "", "", "", "", "",false,false); parameters.push_back(poutputdir); @@ -34,7 +35,7 @@ vector BinSeqCommand::setParameters(){ string BinSeqCommand::getHelpString(){ try { string helpString = ""; - helpString += "The bin.seqs command parameters are list, fasta, name, label and group. The fasta and list are required, unless you have a valid current list and fasta file.\n"; + helpString += "The bin.seqs command parameters are list, fasta, name, count, label and group. The fasta and list are required, unless you have a valid current list and fasta file.\n"; helpString += "The label parameter allows you to select what distance levels you would like a output files created for, and are separated by dashes.\n"; helpString += "The bin.seqs command should be in the following format: bin.seqs(fasta=yourFastaFile, name=yourNamesFile, group=yourGroupFile, label=yourLabels).\n"; helpString += "Example bin.seqs(fasta=amazon.fasta, group=amazon.groups, name=amazon.names).\n"; @@ -147,6 +148,14 @@ BinSeqCommand::BinSeqCommand(string option) { //if the user has not given a path then, add inputdir. else leave path alone. if (path == "") { parameters["group"] = inputDir + it->second; } } + + it = parameters.find("count"); + //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["count"] = inputDir + it->second; } + } } @@ -195,11 +204,26 @@ BinSeqCommand::BinSeqCommand(string option) { if (groupfile == "not open") { abort = true; } else if (groupfile == "not found") { groupfile = ""; } else { m->setGroupFile(groupfile); } + + countfile = validParameter.validFile(parameters, "count", true); + if (countfile == "not open") { countfile = ""; abort = true; } + else if (countfile == "not found") { countfile = ""; } + else { m->setCountTableFile(countfile); } + + if ((namesfile != "") && (countfile != "")) { + m->mothurOut("[ERROR]: you may only use one of the following: name or count."); m->mothurOutEndLine(); abort = true; + } - if (namesfile == ""){ - vector files; files.push_back(fastafile); - parser.getNameFile(files); - } + if ((groupfile != "") && (countfile != "")) { + m->mothurOut("[ERROR]: you may only use one of the following: group or count."); m->mothurOutEndLine(); abort=true; + } + + if (countfile == "") { + if (namesfile == ""){ + vector files; files.push_back(fastafile); + parser.getNameFile(files); + } + } } } @@ -229,9 +253,8 @@ int BinSeqCommand::execute(){ fasta->readFastaFile(fastafile); //if user gave a namesfile then use it - if (namesfile != "") { - readNamesFile(); - } + if (namesfile != "") { readNamesFile(); } + if (countfile != "") { ct.readTable(countfile); } input = new InputData(listfile, "list"); list = input->getListVector(); @@ -362,79 +385,71 @@ void BinSeqCommand::readNamesFile() { //return 1 if error, 0 otherwise int BinSeqCommand::process(ListVector* list) { try { - string binnames, name, sequence; - - string outputFileName = outputDir + m->getRootName(m->getSimpleName(listfile)) + list->getLabel() + getOutputFileNameTag("fasta"); + string outputFileName = outputDir + m->getRootName(m->getSimpleName(listfile)) + list->getLabel() + "." + getOutputFileNameTag("fasta"); m->openOutputFile(outputFileName, out); - - //save to output list of output file names - outputNames.push_back(outputFileName); outputTypes["fasta"].push_back(outputFileName); - - m->mothurOut(list->getLabel()); m->mothurOutEndLine(); - - //for each bin in the list vector - for (int i = 0; i < list->size(); i++) { - - if (m->control_pressed) { return 1; } - - binnames = list->get(i); - while (binnames.find_first_of(',') != -1) { - name = binnames.substr(0,binnames.find_first_of(',')); - binnames = binnames.substr(binnames.find_first_of(',')+1, binnames.length()); - - //do work for that name - sequence = fasta->getSequence(name); - if (sequence != "not found") { - //if you don't have groups - if (groupfile == "") { - name = name + "\t" + toString(i+1); - out << ">" << name << endl; - out << sequence << endl; - }else {//if you do have groups - string group = groupMap->getGroup(name); - if (group == "not found") { - m->mothurOut(name + " is missing from your group file. Please correct. "); m->mothurOutEndLine(); - return 1; - }else{ - name = name + "\t" + group + "\t" + toString(i+1); - out << ">" << name << endl; - out << sequence << endl; - } - } - }else { - m->mothurOut(name + " is missing from your fasta or name file. Please correct. "); m->mothurOutEndLine(); - return 1; - } - - } - - //get last name - sequence = fasta->getSequence(binnames); - if (sequence != "not found") { - //if you don't have groups - if (groupfile == "") { - binnames = binnames + "\t" + toString(i+1); - out << ">" << binnames << endl; - out << sequence << endl; - }else {//if you do have groups - string group = groupMap->getGroup(binnames); - if (group == "not found") { - m->mothurOut(binnames + " is missing from your group file. Please correct. "); m->mothurOutEndLine(); - return 1; - }else{ - binnames = binnames + "\t" + group + "\t" + toString(i+1); - out << ">" << binnames << endl; - out << sequence << endl; - } - } - }else { - m->mothurOut(binnames + " is missing from your fasta or name file. Please correct. "); m->mothurOutEndLine(); - return 1; - } - } - - out.close(); - return 0; + outputNames.push_back(outputFileName); outputTypes["fasta"].push_back(outputFileName); + + m->mothurOut(list->getLabel()); m->mothurOutEndLine(); + + //for each bin in the list vector + for (int i = 0; i < list->size(); i++) { + + if (m->control_pressed) { return 1; } + + string binnames = list->get(i); + vector names; + m->splitAtComma(binnames, names); + for (int j = 0; j < names.size(); j++) { + string name = names[j]; + + //do work for that name + string sequence = fasta->getSequence(name); + + if (countfile != "") { + if (sequence != "not found") { + if (ct.hasGroupInfo()) { + vector groups = ct.getGroups(name); + string groupInfo = ""; + for (int k = 0; k < groups.size()-1; k++) { + groupInfo += groups[k] + "-"; + } + if (groups.size() != 0) { groupInfo += groups[groups.size()-1]; } + else { groupInfo = "not found"; } + name = name + "\t" + groupInfo + "\t" + toString(i+1)+ "\tNumRep=" + toString(ct.getNumSeqs(name)); + out << ">" << name << endl; + out << sequence << endl; + }else { + name = name + "\t" + toString(i+1) + "\tNumRep=" + toString(ct.getNumSeqs(name)); + out << ">" << name << endl; + out << sequence << endl; + } + + }else { m->mothurOut(name + " is missing from your fasta. Does your list file contain all sequence names or just the uniques?"); m->mothurOutEndLine(); return 1; } + }else { + if (sequence != "not found") { + //if you don't have groups + if (groupfile == "") { + name = name + "\t" + toString(i+1); + out << ">" << name << endl; + out << sequence << endl; + }else {//if you do have groups + string group = groupMap->getGroup(name); + if (group == "not found") { + m->mothurOut(name + " is missing from your group file. Please correct. "); m->mothurOutEndLine(); + return 1; + }else{ + name = name + "\t" + group + "\t" + toString(i+1); + out << ">" << name << endl; + out << sequence << endl; + } + } + }else { m->mothurOut(name + " is missing from your fasta or name file. Please correct. "); m->mothurOutEndLine(); return 1; } + } + } + } + + out.close(); + return 0; } catch(exception& e) {