X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=binsequencecommand.cpp;h=08ae6b607a13e3406aa4fe42d8a1f5025a41bbc0;hb=f37a59b81c339f574d97042ff6e364146feb457a;hp=a291caae25782de3d9af111fc149011c77d72eea;hpb=016a30dacbe75869aef5fdb58d2d1bf9eb8f9b33;p=mothur.git diff --git a/binsequencecommand.cpp b/binsequencecommand.cpp index a291caa..08ae6b6 100644 --- a/binsequencecommand.cpp +++ b/binsequencecommand.cpp @@ -15,7 +15,6 @@ BinSeqCommand::BinSeqCommand(string option){ globaldata = GlobalData::getInstance(); abort = false; allLines = 1; - lines.clear(); labels.clear(); //allow user to run help @@ -23,7 +22,7 @@ BinSeqCommand::BinSeqCommand(string option){ else { //valid paramters for this command - string AlignArray[] = {"fasta","line","label","name", "group"}; + string AlignArray[] = {"fasta","label","name", "group"}; vector myArray (AlignArray, AlignArray+(sizeof(AlignArray)/sizeof(string))); OptionParser parser(option); @@ -37,22 +36,20 @@ BinSeqCommand::BinSeqCommand(string option){ } //make sure the user has already run the read.otu command - if (globaldata->getListFile() == "") { cout << "You must read a listfile before running the bin.seqs command." << endl; abort = true; } + if (globaldata->getListFile() == "") { + mothurOut("You must read a listfile before running the bin.seqs command."); + mothurOutEndLine(); + abort = true; + } //check for required parameters fastafile = validParameter.validFile(parameters, "fasta", true); - if (fastafile == "not found") { cout << "fasta is a required parameter for the bin.seqs command." << endl; abort = true; } + if (fastafile == "not found") { mothurOut("fasta is a required parameter for the bin.seqs command."); mothurOutEndLine(); abort = true; } else if (fastafile == "not open") { abort = true; } //check for optional parameter and set defaults // ...at some point should added some additional type checking... - line = validParameter.validFile(parameters, "line", false); - if (line == "not found") { line = ""; } - else { - if(line != "all") { splitAtDash(line, lines); allLines = 0; } - else { allLines = 1; } - } label = validParameter.validFile(parameters, "label", false); if (label == "not found") { label = ""; } @@ -61,13 +58,10 @@ BinSeqCommand::BinSeqCommand(string option){ else { allLines = 1; } } - //make sure user did not use both the line and label parameters - if ((line != "") && (label != "")) { cout << "You cannot use both the line and label parameters at the same time. " << endl; abort = true; } - //if the user has not specified any line or labels use the ones from read.otu - else if ((line == "") && (label == "")) { + //if the user has not specified any labels use the ones from read.otu + if (label == "") { allLines = globaldata->allLines; labels = globaldata->labels; - lines = globaldata->lines; } namesfile = validParameter.validFile(parameters, "name", true); @@ -90,40 +84,30 @@ BinSeqCommand::BinSeqCommand(string option){ } } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the BinSeqCommand class Function BinSeqCommand. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + errorOut(e, "BinSeqCommand", "BinSeqCommand"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the BinSeqCommand class function BinSeqCommand. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } } //********************************************************************************************************************** void BinSeqCommand::help(){ try { - cout << "The bin.seqs command can only be executed after a successful read.otu command of a listfile." << "\n"; - cout << "The bin.seqs command parameters are fasta, name, line, label and group. The fasta parameter is required, and you may not use line and label at the same time." << "\n"; - cout << "The line and label allow you to select what distance levels you would like a output files created for, and are separated by dashes." << "\n"; - cout << "The bin.seqs command should be in the following format: bin.seqs(fasta=yourFastaFile, name=yourNamesFile, group=yourGroupFile, line=yourLines, label=yourLabels)." << "\n"; - cout << "Example bin.seqs(fasta=amazon.fasta, group=amazon.groups, line=1-3-5, name=amazon.names)." << "\n"; - cout << "The default value for line and label are all lines in your inputfile." << "\n"; - cout << "The bin.seqs command outputs a .fasta file for each distance you specify appending the OTU number to each name." << "\n"; - cout << "If you provide a groupfile, then it also appends the sequences group to the name." << "\n"; - cout << "Note: No spaces between parameter labels (i.e. fasta), '=' and parameters (i.e.yourFastaFile)." << "\n" << "\n"; + mothurOut("The bin.seqs command can only be executed after a successful read.otu command of a listfile.\n"); + mothurOut("The bin.seqs command parameters are fasta, name, label and group. The fasta parameter is required.\n"); + mothurOut("The label parameter allows you to select what distance levels you would like a output files created for, and are separated by dashes.\n"); + mothurOut("The bin.seqs command should be in the following format: bin.seqs(fasta=yourFastaFile, name=yourNamesFile, group=yourGroupFile, label=yourLabels).\n"); + mothurOut("Example bin.seqs(fasta=amazon.fasta, group=amazon.groups, name=amazon.names).\n"); + mothurOut("The default value for label is all lines in your inputfile.\n"); + mothurOut("The bin.seqs command outputs a .fasta file for each distance you specify appending the OTU number to each name.\n"); + mothurOut("If you provide a groupfile, then it also appends the sequences group to the name.\n"); + mothurOut("Note: No spaces between parameter labels (i.e. fasta), '=' and parameters (i.e.yourFastaFile).\n\n"); } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the BinSeqCommand class Function help. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + errorOut(e, "BinSeqCommand", "help"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the BinSeqCommand class function help. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } } - - //********************************************************************************************************************** BinSeqCommand::~BinSeqCommand(){ @@ -143,7 +127,6 @@ int BinSeqCommand::execute(){ try { if (abort == true) { return 0; } - int count = 1; int error = 0; //read fastafile @@ -169,38 +152,34 @@ int BinSeqCommand::execute(){ //if the users enters label "0.06" and there is no "0.06" in their file use the next lowest label. set processedLabels; set userLabels = labels; - set userLines = lines; - while((list != NULL) && ((allLines == 1) || (userLabels.size() != 0) || (userLines.size() != 0))) { + while((list != NULL) && ((allLines == 1) || (userLabels.size() != 0))) { - if(allLines == 1 || lines.count(count) == 1 || labels.count(list->getLabel()) == 1){ + if(allLines == 1 || labels.count(list->getLabel()) == 1){ - error = process(list, count); + error = process(list); if (error == 1) { return 0; } processedLabels.insert(list->getLabel()); userLabels.erase(list->getLabel()); - userLines.erase(count); } if ((anyLabelsToProcess(list->getLabel(), userLabels, "") == true) && (processedLabels.count(lastLabel) != 1)) { delete list; list = input->getListVector(lastLabel); - error = process(list, count); + error = process(list); if (error == 1) { return 0; } processedLabels.insert(list->getLabel()); userLabels.erase(list->getLabel()); - } lastLabel = list->getLabel(); delete list; list = input->getListVector(); - count++; } @@ -208,21 +187,21 @@ int BinSeqCommand::execute(){ set::iterator it; bool needToRun = false; for (it = userLabels.begin(); it != userLabels.end(); it++) { - cout << "Your file does not include the label "<< *it; + mothurOut("Your file does not include the label " + *it); if (processedLabels.count(lastLabel) != 1) { - cout << ". I will use " << lastLabel << "." << endl; + mothurOut(". I will use " + lastLabel + "."); mothurOutEndLine(); needToRun = true; }else { - cout << ". Please refer to " << lastLabel << "." << endl; + mothurOut(". Please refer to " + lastLabel + "."); mothurOutEndLine(); } } - //run last line if you need to + //run last label if you need to if (needToRun == true) { - delete list; + if (list != NULL) { delete list; } list = input->getListVector(lastLabel); - error = process(list, count); + error = process(list); if (error == 1) { return 0; } delete list; @@ -231,13 +210,9 @@ int BinSeqCommand::execute(){ return 0; } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the BinSeqCommand class Function execute. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + errorOut(e, "BinSeqCommand", "execute"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the BinSeqCommand class function execute. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } } //********************************************************************************************************************** @@ -269,23 +244,19 @@ void BinSeqCommand::readNamesFile() { } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the BinSeqCommand class Function readNamesFile. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + errorOut(e, "BinSeqCommand", "readNamesFile"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the BinSeqCommand class function readNamesFile. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } } //********************************************************************************************************************** //return 1 if error, 0 otherwise -int BinSeqCommand::process(ListVector* list, int count) { +int BinSeqCommand::process(ListVector* list) { try { string binnames, name, sequence; string outputFileName = getRootName(globaldata->getListFile()) + list->getLabel() + ".fasta"; openOutputFile(outputFileName, out); - cout << list->getLabel() << '\t' << count << endl; + mothurOut(list->getLabel()); mothurOutEndLine(); //for each bin in the list vector for (int i = 0; i < list->size(); i++) { @@ -306,7 +277,7 @@ int BinSeqCommand::process(ListVector* list, int count) { }else {//if you do have groups string group = groupMap->getGroup(name); if (group == "not found") { - cout << name << " is missing from your group file. Please correct. " << endl; + mothurOut(name + " is missing from your group file. Please correct. "); mothurOutEndLine(); remove(outputFileName.c_str()); return 1; }else{ @@ -316,7 +287,7 @@ int BinSeqCommand::process(ListVector* list, int count) { } } }else { - cout << name << " is missing from your fasta or name file. Please correct. " << endl; + mothurOut(name + " is missing from your fasta or name file. Please correct. "); mothurOutEndLine(); remove(outputFileName.c_str()); return 1; } @@ -334,7 +305,7 @@ int BinSeqCommand::process(ListVector* list, int count) { }else {//if you do have groups string group = groupMap->getGroup(binnames); if (group == "not found") { - cout << binnames << " is missing from your group file. Please correct. " << endl; + mothurOut(binnames + " is missing from your group file. Please correct. "); mothurOutEndLine(); remove(outputFileName.c_str()); return 1; }else{ @@ -344,7 +315,7 @@ int BinSeqCommand::process(ListVector* list, int count) { } } }else { - cout << binnames << " is missing from your fasta or name file. Please correct. " << endl; + mothurOut(binnames + " is missing from your fasta or name file. Please correct. "); mothurOutEndLine(); remove(outputFileName.c_str()); return 1; } @@ -355,13 +326,9 @@ int BinSeqCommand::process(ListVector* list, int count) { } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the BinSeqCommand class Function readNamesFile. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + errorOut(e, "BinSeqCommand", "process"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the BinSeqCommand class function readNamesFile. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } } //**********************************************************************************************************************