//**********************************************************************************************************************
vector<string> ClusterSplitCommand::setParameters(){
try {
+ CommandParameter pfile("file", "InputTypes", "", "", "PhylipColumnFasta", "PhylipColumnFasta", "none","",false,false,true); parameters.push_back(pfile);
CommandParameter ptaxonomy("taxonomy", "InputTypes", "", "", "none", "none", "FastaTaxName","",false,false,true); parameters.push_back(ptaxonomy);
CommandParameter pphylip("phylip", "InputTypes", "", "", "PhylipColumnFasta", "PhylipColumnFasta", "none","list",false,false,true); parameters.push_back(pphylip);
CommandParameter pfasta("fasta", "InputTypes", "", "", "PhylipColumnFasta", "PhylipColumnFasta", "FastaTaxName","list",false,false,true); parameters.push_back(pfasta);
string ClusterSplitCommand::getHelpString(){
try {
string helpString = "";
- helpString += "The cluster.split command parameter options are fasta, phylip, column, name, count, cutoff, precision, method, splitmethod, taxonomy, taxlevel, showabund, timing, hard, large, cluster, processors. Fasta or Phylip or column and name are required.\n";
+ helpString += "The cluster.split command parameter options are file, fasta, phylip, column, name, count, cutoff, precision, method, splitmethod, taxonomy, taxlevel, showabund, timing, hard, large, cluster, processors. Fasta or Phylip or column and name are required.\n";
helpString += "The cluster.split command can split your files in 3 ways. Splitting by distance file, by classification, or by classification also using a fasta file. \n";
helpString += "For the distance file method, you need only provide your distance file and mothur will split the file into distinct groups. \n";
helpString += "For the classification method, you need to provide your distance file and taxonomy file, and set the splitmethod to classify. \n";
helpString += "You will also need to set the taxlevel you want to split by. mothur will split the sequences into distinct taxonomy groups, and split the distance file based on those groups. \n";
helpString += "For the classification method using a fasta file, you need to provide your fasta file, names file and taxonomy file. \n";
helpString += "You will also need to set the taxlevel you want to split by. mothur will split the sequence into distinct taxonomy groups, and create distance files for each grouping. \n";
+ helpString += "The file option allows you to enter your file containing your list of column and names/count files as well as the singleton file. This file is mothur generated, when you run cluster.split() with the cluster=f parameter. This can be helpful when you have a large dataset that you may be able to use all your processors for the splitting step, but have to reduce them for the cluster step due to RAM constraints. For example: cluster.split(fasta=yourFasta, taxonomy=yourTax, count=yourCount, taxlevel=3, cluster=f, processors=8) then cluster.split(file=yourFile, processors=4). This allows your to maximize your processors during the splitting step. Also, if you are unsure if the cluster step will have RAM issue with multiple processors, you can avoid running the first part of the command multiple times.\n";
helpString += "The phylip and column parameter allow you to enter your distance file. \n";
helpString += "The fasta parameter allows you to enter your aligned fasta file. \n";
helpString += "The name parameter allows you to enter your name file. \n";
else if (type == "rabund") { pattern = "[filename],[clustertag],rabund"; }
else if (type == "sabund") { pattern = "[filename],[clustertag],sabund"; }
else if (type == "column") { pattern = "[filename],dist"; }
+ else if (type == "file") { pattern = "[filename],file"; }
else { m->mothurOut("[ERROR]: No definition for type " + type + " output pattern.\n"); m->control_pressed = true; }
return pattern;
outputTypes["rabund"] = tempOutNames;
outputTypes["sabund"] = tempOutNames;
outputTypes["column"] = tempOutNames;
+ outputTypes["file"] = tempOutNames;
}
catch(exception& e) {
m->errorOut(e, "ClusterSplitCommand", "ClusterSplitCommand");
outputTypes["rabund"] = tempOutNames;
outputTypes["sabund"] = tempOutNames;
outputTypes["column"] = tempOutNames;
+ outputTypes["file"] = 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 = ""; }
//if the user has not given a path then, add inputdir. else leave path alone.
if (path == "") { parameters["count"] = inputDir + it->second; }
}
+
+ it = parameters.find("file");
+ //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["file"] = inputDir + it->second; }
+ }
}
//check for required parameters
- phylipfile = validParameter.validFile(parameters, "phylip", true);
+ file = validParameter.validFile(parameters, "file", true);
+ if (file == "not open") { file = ""; abort = true; }
+ else if (file == "not found") { file = ""; }
+ else { distfile = file; }
+
+ phylipfile = validParameter.validFile(parameters, "phylip", true);
if (phylipfile == "not open") { abort = true; }
- else if (phylipfile == "not found") { phylipfile = ""; }
+ else if (phylipfile == "not found") { phylipfile = ""; }
else { distfile = phylipfile; format = "phylip"; m->setPhylipFile(phylipfile); }
columnfile = validParameter.validFile(parameters, "column", true);
else if (taxFile == "not found") { taxFile = ""; }
else { m->setTaxonomyFile(taxFile); if (splitmethod != "fasta") { splitmethod = "classify"; } }
- if ((phylipfile == "") && (columnfile == "") && (fastafile == "")) {
+ if ((phylipfile == "") && (columnfile == "") && (fastafile == "") && (file == "")) {
//is there are current file available for either of these?
//give priority to column, then phylip, then fasta
columnfile = m->getColumnFile();
fastafile = m->getFastaFile();
if (fastafile != "") { m->mothurOut("Using " + fastafile + " as input file for the fasta parameter."); m->mothurOutEndLine(); }
else {
- m->mothurOut("No valid current files. When executing a cluster.split command you must enter a phylip or a column or fastafile."); m->mothurOutEndLine();
+ m->mothurOut("No valid current files. When executing a cluster.split command you must enter a file, phylip or a column or fastafile."); m->mothurOutEndLine();
abort = true;
}
}
}
}
- else if ((phylipfile != "") && (columnfile != "") && (fastafile != "")) { m->mothurOut("When executing a cluster.split command you must enter ONLY ONE of the following: fasta, phylip or column."); m->mothurOutEndLine(); abort = true; }
+ else if ((phylipfile != "") && (columnfile != "") && (fastafile != "") && (file != "")) { m->mothurOut("When executing a cluster.split command you must enter ONLY ONE of the following: file, fasta, phylip or column."); m->mothurOutEndLine(); abort = true; }
if ((countfile != "") && (namefile != "")) { m->mothurOut("When executing a cluster.split command you must enter ONLY ONE of the following: count or name."); m->mothurOutEndLine(); abort = true; }
try {
if (abort == true) { if (calledHelp) { return 0; } return 2; }
-
- time_t estart;
- vector<string> listFileNames;
- set<string> labels;
- string singletonName = "";
- double saveCutoff = cutoff;
+
+ time_t estart;
+ vector<string> listFileNames;
+ vector< map<string, string> > distName;
+ set<string> labels;
+ string singletonName = "";
+
+ double saveCutoff = cutoff;
- //****************** file prep work ******************************//
- #ifdef USE_MPI
+ if (file != "") { deleteFiles = false; estart = time(NULL); singletonName = readFile(distName); }
+ else {
+
+ //****************** file prep work ******************************//
+#ifdef USE_MPI
int pid;
int tag = 2001;
- MPI_Status status;
+ MPI_Status status;
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) { //only process 0 converts and splits
-
- #endif
-
- //if user gave a phylip file convert to column file
- if (format == "phylip") {
- estart = time(NULL);
- m->mothurOut("Converting to column format..."); m->mothurOutEndLine();
-
- ReadCluster* convert = new ReadCluster(distfile, cutoff, outputDir, false);
-
- NameAssignment* nameMap = NULL;
- convert->setFormat("phylip");
- convert->read(nameMap);
-
- if (m->control_pressed) { delete convert; return 0; }
-
- distfile = convert->getOutputFile();
-
- //if no names file given with phylip file, create it
- ListVector* listToMakeNameFile = convert->getListVector();
- if ((namefile == "") && (countfile == "")) { //you need to make a namefile for split matrix
- ofstream out;
- namefile = phylipfile + ".names";
- m->openOutputFile(namefile, out);
- for (int i = 0; i < listToMakeNameFile->getNumBins(); i++) {
- string bin = listToMakeNameFile->get(i);
- out << bin << '\t' << bin << endl;
- }
- out.close();
- }
- delete listToMakeNameFile;
- delete convert;
-
- m->mothurOut("It took " + toString(time(NULL) - estart) + " seconds to convert the distance file."); m->mothurOutEndLine();
- }
- if (m->control_pressed) { return 0; }
-
- estart = time(NULL);
- m->mothurOut("Splitting the file..."); m->mothurOutEndLine();
-
- //split matrix into non-overlapping groups
- SplitMatrix* split;
- if (splitmethod == "distance") { split = new SplitMatrix(distfile, namefile, countfile, taxFile, cutoff, splitmethod, large); }
- else if (splitmethod == "classify") { split = new SplitMatrix(distfile, namefile, countfile, taxFile, taxLevelCutoff, splitmethod, large); }
- else if (splitmethod == "fasta") { split = new SplitMatrix(fastafile, namefile, countfile, taxFile, taxLevelCutoff, cutoff, splitmethod, processors, classic, outputDir); }
- else { m->mothurOut("Not a valid splitting method. Valid splitting algorithms are distance, classify or fasta."); m->mothurOutEndLine(); return 0; }
-
- split->split();
-
- if (m->control_pressed) { delete split; return 0; }
-
- singletonName = split->getSingletonNames();
- vector< map<string, string> > distName = split->getDistanceFiles(); //returns map of distance files -> namefile sorted by distance file size
- delete split;
-
- if (m->debug) { m->mothurOut("[DEBUG]: distName.size() = " + toString(distName.size()) + ".\n"); }
- //output a merged distance file
- //if (splitmethod == "fasta") { createMergedDistanceFile(distName); }
+#endif
+
+ //if user gave a phylip file convert to column file
+ if (format == "phylip") {
+ estart = time(NULL);
+ m->mothurOut("Converting to column format..."); m->mothurOutEndLine();
+
+ ReadCluster* convert = new ReadCluster(distfile, cutoff, outputDir, false);
+
+ NameAssignment* nameMap = NULL;
+ convert->setFormat("phylip");
+ convert->read(nameMap);
+
+ if (m->control_pressed) { delete convert; return 0; }
+
+ distfile = convert->getOutputFile();
+
+ //if no names file given with phylip file, create it
+ ListVector* listToMakeNameFile = convert->getListVector();
+ if ((namefile == "") && (countfile == "")) { //you need to make a namefile for split matrix
+ ofstream out;
+ namefile = phylipfile + ".names";
+ m->openOutputFile(namefile, out);
+ for (int i = 0; i < listToMakeNameFile->getNumBins(); i++) {
+ string bin = listToMakeNameFile->get(i);
+ out << bin << '\t' << bin << endl;
+ }
+ out.close();
+ }
+ delete listToMakeNameFile;
+ delete convert;
+
+ m->mothurOut("It took " + toString(time(NULL) - estart) + " seconds to convert the distance file."); m->mothurOutEndLine();
+ }
+ if (m->control_pressed) { return 0; }
+
+ estart = time(NULL);
+ m->mothurOut("Splitting the file..."); m->mothurOutEndLine();
+
+ //split matrix into non-overlapping groups
+ SplitMatrix* split;
+ if (splitmethod == "distance") { split = new SplitMatrix(distfile, namefile, countfile, taxFile, cutoff, splitmethod, large); }
+ else if (splitmethod == "classify") { split = new SplitMatrix(distfile, namefile, countfile, taxFile, taxLevelCutoff, splitmethod, large); }
+ else if (splitmethod == "fasta") { split = new SplitMatrix(fastafile, namefile, countfile, taxFile, taxLevelCutoff, cutoff, splitmethod, processors, classic, outputDir); }
+ else { m->mothurOut("Not a valid splitting method. Valid splitting algorithms are distance, classify or fasta."); m->mothurOutEndLine(); return 0; }
+
+ split->split();
+
+ if (m->control_pressed) { delete split; return 0; }
+
+ singletonName = split->getSingletonNames();
+ distName = split->getDistanceFiles(); //returns map of distance files -> namefile sorted by distance file size
+ delete split;
+
+ if (m->debug) { m->mothurOut("[DEBUG]: distName.size() = " + toString(distName.size()) + ".\n"); }
+
+ //output a merged distance file
+ //if (splitmethod == "fasta") { createMergedDistanceFile(distName); }
- if (m->control_pressed) { return 0; }
-
- m->mothurOut("It took " + toString(time(NULL) - estart) + " seconds to split the distance file."); m->mothurOutEndLine();
- estart = time(NULL);
-
- if (!runCluster) {
-
- m->mothurOutEndLine();
- m->mothurOut("Output File Names: "); m->mothurOutEndLine();
- for (int i = 0; i < distName.size(); i++) { m->mothurOut(distName[i].begin()->first); m->mothurOutEndLine(); m->mothurOut(distName[i].begin()->second); m->mothurOutEndLine(); }
- m->mothurOutEndLine();
- return 0;
+ if (m->control_pressed) { return 0; }
- }
-
+ m->mothurOut("It took " + toString(time(NULL) - estart) + " seconds to split the distance file."); m->mothurOutEndLine();
+ estart = time(NULL);
+
+ if (!runCluster) {
+ printFile(singletonName, distName);
+
+ m->mothurOutEndLine();
+ m->mothurOut("Output File Names: "); m->mothurOutEndLine();
+ for (int i = 0; i < distName.size(); i++) { m->mothurOut(distName[i].begin()->first); m->mothurOutEndLine(); m->mothurOut(distName[i].begin()->second); m->mothurOutEndLine(); }
+ m->mothurOutEndLine();
+ return 0;
+
+ }
+ deleteFiles = true;
+ }
//****************** break up files between processes and cluster each file set ******************************//
#ifdef USE_MPI
////you are process 0 from above////
mergeLists(listFileNames, labelBins, listSingle);
if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { m->mothurRemove(outputNames[i]); } return 0; }
+
+ //delete after all are complete incase a crash happens
+ if (!deleteFiles) { for (int i = 0; i < distName.size(); i++) { m->mothurRemove(distName[i].begin()->first); m->mothurRemove(distName[i].begin()->second); } }
m->mothurOut("It took " + toString(time(NULL) - estart) + " seconds to merge."); m->mothurOutEndLine();
if(namefile != ""){ delete nameMap; }
else { delete ct; }
- m->mothurRemove(thisDistFile);
- m->mothurRemove(thisNamefile);
-
+ if (deleteFiles) {
+ m->mothurRemove(thisDistFile);
+ m->mothurRemove(thisNamefile);
+ }
return listFileName;
}
return listFileName;
}
- m->mothurRemove(thisDistFile);
- m->mothurRemove(thisNamefile);
+ if (deleteFiles) {
+ m->mothurRemove(thisDistFile);
+ m->mothurRemove(thisNamefile);
+ }
if (saveCutoff != cutoff) {
if (hard) { saveCutoff = m->ceilDist(saveCutoff, precision); }
}
//**********************************************************************************************************************
+int ClusterSplitCommand::printFile(string singleton, vector< map<string, string> >& distName){
+ try {
+ ofstream out;
+ map<string, string> variables;
+ string thisOutputDir = outputDir;
+ if (outputDir == "") { thisOutputDir = m->hasPath(distfile); }
+ variables["[filename]"] = thisOutputDir + m->getRootName(m->getSimpleName(distfile));
+ string outputFileName = getOutputFileName("file", variables);
+ m->openOutputFile(outputFileName, out);
+
+ out << singleton << endl;
+ if (namefile != "") { out << "name" << endl; }
+ else if (countfile != "") { out << "count" << endl; }
+ else { out << "unknown" << endl; }
+
+ for (int i = 0; i < distName.size(); i++) { out << distName[i].begin()->first << '\t' << distName[i].begin()->second << endl; }
+ out.close();
+
+ return 0;
+ }
+ catch(exception& e) {
+ m->errorOut(e, "ClusterCommand", "printFile");
+ exit(1);
+ }
+
+}
+//**********************************************************************************************************************
+string ClusterSplitCommand::readFile(vector< map<string, string> >& distName){
+ try {
+ string singleton, thiscolumn, thisname, type;
+
+ ifstream in;
+ m->openInputFile(file, in);
+
+ in >> singleton; m->gobble(in);
+ in >> type; m->gobble(in);
+
+ if (type == "name") { namefile = "name"; }
+ else if (type == "count") { countfile = "count"; }
+ else { m->mothurOut("[ERROR]: unknown file type. Are the files in column 2 of the file name files or count files? Please change unknown to name or count.\n"); m->control_pressed = true; }
+
+
+ while(!in.eof()) {
+ if (m->control_pressed) { break; }
+
+ in >> thiscolumn; m->gobble(in);
+ in >> thisname; m->gobble(in);
+
+ map<string, string> temp;
+ temp[thiscolumn] = thisname;
+ distName.push_back(temp);
+ }
+ in.close();
+
+ return singleton;
+ }
+ catch(exception& e) {
+ m->errorOut(e, "ClusterCommand", "readFile");
+ exit(1);
+ }
+
+}
+//**********************************************************************************************************************
//append new header to reads\r
for (int i = 0; i < filehandles.size(); i++) {\r
for (int j = 0; j < filehandles[i].size(); j++) {\r
- m->appendBinaryFiles(filehandles[i][j], filehandlesHeaders[i][j]);\r
- m->renameFile(filehandlesHeaders[i][j], filehandles[i][j]);\r
- m->mothurRemove(filehandlesHeaders[i][j]);\r
- //cout << i << '\t' << '\t' << j << '\t' << filehandles[i][j] << " done appending headers and removing " << filehandlesHeaders[i][j] << endl;\r
- if (numSplitReads[i][j] == 0) { m->mothurRemove(filehandles[i][j]); }\r
+ if (filehandles[i][j] != "") {\r
+ m->appendBinaryFiles(filehandles[i][j], filehandlesHeaders[i][j]);\r
+ m->renameFile(filehandlesHeaders[i][j], filehandles[i][j]);\r
+ m->mothurRemove(filehandlesHeaders[i][j]);\r
+ //cout << i << '\t' << '\t' << j << '\t' << filehandles[i][j] << " done appending headers and removing " << filehandlesHeaders[i][j] << endl;\r
+ if (numSplitReads[i][j] == 0) { m->mothurRemove(filehandles[i][j]); }\r
+ }\r
}\r
}\r
//cout << "here3" << endl;\r
if(!success) { trashCode += 'r'; }\r
}\r
\r
+ if (trashCode.length() == 0) { //is this sequence in the ignore group\r
+ string thisGroup = "";\r
+ \r
+ if(barcodes.size() != 0){\r
+ thisGroup = barcodeNameVector[barcode];\r
+ if (numFPrimers != 0) {\r
+ if (primerNameVector[primer] != "") {\r
+ if(thisGroup != "") {\r
+ thisGroup += "." + primerNameVector[primer];\r
+ }else {\r
+ thisGroup = primerNameVector[primer];\r
+ }\r
+ }\r
+ }\r
+ }\r
+ \r
+ int pos = thisGroup.find("ignore");\r
+ if (pos != string::npos) { trashCode += "i"; }\r
+ }\r
\r
return trashCode.length();\r
}\r
string primerName = primerNameVector[itPrimer->second];\r
string barcodeName = barcodeNameVector[itBar->second];\r
\r
- string comboGroupName = "";\r
- string fastaFileName = "";\r
- string qualFileName = "";\r
- string nameFileName = "";\r
- \r
- if(primerName == ""){\r
- comboGroupName = barcodeNameVector[itBar->second];\r
- }\r
- else{\r
- if(barcodeName == ""){\r
- comboGroupName = primerNameVector[itPrimer->second];\r
- }\r
- else{\r
- comboGroupName = barcodeNameVector[itBar->second] + "." + primerNameVector[itPrimer->second];\r
- }\r
- }\r
- \r
- ofstream temp;\r
- map<string, string> variables;\r
- variables["[filename]"] = outputDir + m->getRootName(m->getSimpleName(currentFileName));\r
- variables["[group]"] = comboGroupName;\r
- string thisFilename = getOutputFileName("sff",variables);\r
- if (uniqueNames.count(thisFilename) == 0) {\r
- outputNames.push_back(thisFilename);\r
- outputTypes["sff"].push_back(thisFilename);\r
- uniqueNames.insert(thisFilename);\r
- }\r
- \r
- filehandles[itBar->second][itPrimer->second] = thisFilename;\r
- temp.open(thisFilename.c_str(), ios::binary); temp.close();\r
+ if ((primerName == "ignore") || (barcodeName == "ignore")) { } //do nothing\r
+ else {\r
+ string comboGroupName = "";\r
+ string fastaFileName = "";\r
+ string qualFileName = "";\r
+ string nameFileName = "";\r
+ \r
+ if(primerName == ""){\r
+ comboGroupName = barcodeNameVector[itBar->second];\r
+ }\r
+ else{\r
+ if(barcodeName == ""){\r
+ comboGroupName = primerNameVector[itPrimer->second];\r
+ }\r
+ else{\r
+ comboGroupName = barcodeNameVector[itBar->second] + "." + primerNameVector[itPrimer->second];\r
+ }\r
+ }\r
+ \r
+ ofstream temp;\r
+ map<string, string> variables;\r
+ variables["[filename]"] = outputDir + m->getRootName(m->getSimpleName(currentFileName));\r
+ variables["[group]"] = comboGroupName;\r
+ string thisFilename = getOutputFileName("sff",variables);\r
+ if (uniqueNames.count(thisFilename) == 0) {\r
+ outputNames.push_back(thisFilename);\r
+ outputTypes["sff"].push_back(thisFilename);\r
+ uniqueNames.insert(thisFilename);\r
+ }\r
+ \r
+ filehandles[itBar->second][itPrimer->second] = thisFilename;\r
+ temp.open(thisFilename.c_str(), ios::binary); temp.close();\r
+ }\r
}\r
}\r
}\r
else if (sfffile != "") { parseSffFile(filesBySample); }
else if (fastqfile != "") { parseFastqFile(filesBySample); }
+ for (set<string>::iterator it = uniqueNames.begin(); it != uniqueNames.end(); it++) { Groups.push_back(*it); }
+
sanityCheckMiMarksGroups();
//checks groups and files returned from parse - removes any groups that did not get reads assigned to them, orders files.
////////////////////////////////////////////////////////
for (int i = 0; i < Groups.size(); i++) {
- string barcodeForThisSample = Group2Barcode[Groups[i]];
+ string barcodeForThisSample = Group2Barcode[Groups[i]][0];
if (m->control_pressed) { break; }
out << "\t<Action>\n";
for (int i = 0; i < Groups.size(); i++) {
vector<string> thisGroupsFiles = filesBySample[Groups[i]];
- string barcodeForThisSample = Group2Barcode[Groups[i]];
+ string barcodeForThisSample = Group2Barcode[Groups[i]][0];
for (int j = 0; j < thisGroupsFiles.size(); j++) {
string libId = thisGroupsFiles[j] + "." + barcodeForThisSample;
out << "\t\t\t<File file_path=\"" + pieces[0] + "\">\n";
out << "\t\t\t\t<DataType>generic-data</DataType> \n";
out << "\t\t\t</File>\n";
- vector<string> thisBarcodes; m->splitAtChar(Group2Barcode[Groups[i]], thisBarcodes, '.');
+ vector<string> thisBarcodes; m->splitAtChar(Group2Barcode[Groups[i]][0], thisBarcodes, '.');
string forwardBarcode = thisBarcodes[0];
string reverseBarcode = thisBarcodes[1];
- vector<string> thisPrimers; m->splitAtChar(Group2Primer[Groups[i]], thisPrimers, '.');
+ vector<string> thisPrimers; m->splitAtChar(Group2Primer[Groups[i]][0], thisPrimers, '.');
string forwardPrimer = thisPrimers[0];
string reversePrimer = thisPrimers[1];
//attributes
out << "\t\t\t</File>\n";
//attributes
out << "\t\t\t<Attribute name=\"title\">" + mimarks[Groups[i]]["title"] + "</Attribute>\n";
- out << "\t\t\t<Attribute name=\"BarCode\">" + Group2Barcode[Groups[i]] + "</Attribute>\n";
- out << "\t\t\t<Attribute name=\"primer\">" + Group2Primer[Groups[i]] + "</Attribute>\n";
+ out << "\t\t\t<Attribute name=\"BarCode\">" + Group2Barcode[Groups[i]][0] + "</Attribute>\n";
+ out << "\t\t\t<Attribute name=\"primer\">" + Group2Primer[Groups[i]][0] + "</Attribute>\n";
out << "\t\t\t<Attribute name=\"read_type\">" + orientation + "</Attribute>\n";
out << "\t\t\t<Attribute name=\"library_name\">" + libId + "</Attribute>\n";
out << "\t\t\t<Attribute name=\"library_strategy\">" + libStrategy + "</Attribute>\n";
if (headers[i] == "organism") {
if (!m->inUsersGroups(linePieces[i], acceptableOrganisms)) { //not an acceptable organism
organismError = true;
- m->mothurOut("[WARNING]: " + linePieces[i]+ " is not an acceptable organism, changing to metagenome. You can correct the issue and rerun the command, or NCBI will allow you to modify the organism after submission.\n"); linePieces[i] = "metagenome"; categories[headers[i]] = linePieces[i];
+ m->mothurOut("[WARNING]: " + linePieces[i]+ " is not an acceptable organism, changing to acceptable 'metagenome'. NCBI will allow you to modify the organism after submission.\n"); linePieces[i] = "metagenome"; categories[headers[i]] = linePieces[i];
}
Group2Organism[linePieces[0]] = linePieces[i];
}
string organismTypes = "";
for (int i = 0; i < acceptableOrganisms.size()-1; i++) { organismTypes += acceptableOrganisms[i] + ", "; }
organismTypes += acceptableOrganisms[acceptableOrganisms.size()-1];
- m->mothurOut("[WARNING]: The acceptable organism choices are: " + organismTypes + ".\n");
+ m->mothurOut("\n[WARNING]: The acceptable organism choices are: " + organismTypes + ".\n\n\n");
}
return 0;
primerNameVector.push_back("");
}
- set<string> uniqueNames; //used to cleanup outputFileNames
if (pairedOligos) {
for(map<int, oligosPair>::iterator itBar = pairedBarcodes.begin();itBar != pairedBarcodes.end();itBar++){
for(map<int, oligosPair>::iterator itPrimer = pairedPrimers.begin();itPrimer != pairedPrimers.end(); itPrimer++){
}
}
uniqueNames.insert(comboGroupName);
- Group2Barcode[comboGroupName] = (itBar->second).forward+"."+(itBar->second).reverse;
- Group2Primer[comboGroupName] = (itPrimer->second).forward+"."+(itPrimer->second).reverse;
+
+ map<string, vector<string> >::iterator itGroup2Barcode = Group2Barcode.find(comboGroupName);
+ if (itGroup2Barcode == Group2Barcode.end()) {
+ vector<string> tempBarcodes; tempBarcodes.push_back((itBar->second).forward+"."+(itBar->second).reverse);
+ Group2Barcode[comboGroupName] = tempBarcodes;
+ }else {
+ Group2Barcode[comboGroupName].push_back((itBar->second).forward+"."+(itBar->second).reverse);
+ }
+
+ itGroup2Barcode = Group2Primer.find(comboGroupName);
+ if (itGroup2Barcode == Group2Primer.end()) {
+ vector<string> tempPrimers; tempPrimers.push_back((itPrimer->second).forward+"."+(itPrimer->second).reverse);
+ Group2Primer[comboGroupName] = tempPrimers;
+ }else {
+ Group2Primer[comboGroupName].push_back((itPrimer->second).forward+"."+(itPrimer->second).reverse);
+ }
}
}
}
}
}
uniqueNames.insert(comboGroupName);
- Group2Barcode[comboGroupName] = itBar->first;
- Group2Primer[comboGroupName] = itPrimer->first;
+
+ map<string, vector<string> >::iterator itGroup2Barcode = Group2Barcode.find(comboGroupName);
+ if (itGroup2Barcode == Group2Barcode.end()) {
+ vector<string> tempBarcodes; tempBarcodes.push_back(itBar->first);
+ Group2Barcode[comboGroupName] = tempBarcodes;
+ }else {
+ Group2Barcode[comboGroupName].push_back(itBar->first);
+ }
+
+ itGroup2Barcode = Group2Primer.find(comboGroupName);
+ if (itGroup2Barcode == Group2Primer.end()) {
+ vector<string> tempPrimers; tempPrimers.push_back(itPrimer->first);
+ Group2Primer[comboGroupName] = tempPrimers;
+ }else {
+ Group2Primer[comboGroupName].push_back(itPrimer->first);
+ }
}
}
}
if (m->debug) { int count = 0; for (set<string>::iterator it = uniqueNames.begin(); it != uniqueNames.end(); it++) { m->mothurOut("[DEBUG]: " + toString(count) + " groupName = " + *it + "\n"); count++; } }
- for (set<string>::iterator it = uniqueNames.begin(); it != uniqueNames.end(); it++) { Groups.push_back(*it); }
return true;
projects / mothur.git / commitdiff