X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=makebiomcommand.cpp;h=03e7baf2b9888fc7f52cbe6076ea8fdfa472b584;hb=36a6b02cf7f09d2bc34376b588944a9ca73429c5;hp=eb46b97b9566773d5e02b3d5e4c38e50fae94719;hpb=aa23898d895a8c04cc4582a8809343df0aef6622;p=mothur.git diff --git a/makebiomcommand.cpp b/makebiomcommand.cpp index eb46b97..03e7baf 100644 --- a/makebiomcommand.cpp +++ b/makebiomcommand.cpp @@ -112,12 +112,12 @@ vector MakeBiomCommand::setParameters(){ string MakeBiomCommand::getHelpString(){ try { string helpString = ""; - helpString += "The make.biom command parameters are shared, groups, matrixtype and label. shared is required, unless you have a valid current file.\n"; + helpString += "The make.biom command parameters are shared, contaxonomy, groups, matrixtype and label. shared is required, unless you have a valid current file.\n"; helpString += "The groups parameter allows you to specify which of the groups in your groupfile you would like included. The group names are separated by dashes.\n"; helpString += "The label parameter allows you to select what distance levels you would like, and are also separated by dashes.\n"; helpString += "The matrixtype parameter allows you to select what type you would like to make. Choices are sparse and dense, default is sparse.\n"; + helpString += "The contaxonomy file is the taxonomy file outputted by classify.otu(list=yourListfile, taxonomy=yourTaxonomyFile). Be SURE that the you are the constaxonomy file distance matches the shared file distance. ie, for *.0.03.cons.taxonomy set label=0.03. Mothur is smart enough to handle shared files that have been subsampled.\n"; helpString += "The make.biom command should be in the following format: make.biom(shared=yourShared, groups=yourGroups, label=yourLabels).\n"; - helpString += "The contaxonomy file is the taxonomy file outputted by classify.otu(list=yourListfile, taxonomy=yourTaxonomyFile). Be SURE that the you are the constaxonomy file distance matches the shared file distance. ie, for *.0.03.cons.taxonomy set label=0.03. Mothur is smart enough to handle shared files that have been subsampled after the classify.otu command was run on the list and taxonomy file.\n"; helpString += "Example make.biom(shared=abrecovery.an.shared, groups=A-B-C).\n"; helpString += "The default value for groups is all the groups in your groupfile, and all labels in your inputfile will be used.\n"; helpString += "The make.biom command outputs a .biom file.\n"; @@ -165,10 +165,10 @@ MakeBiomCommand::MakeBiomCommand(string option) { for (it = parameters.begin(); it != parameters.end(); it++) { if (validParameter.isValidParameter(it->first, myArray, it->second) != true) { abort = true; } } - + //initialize outputTypes vector tempOutNames; - outputTypes["relabund"] = tempOutNames; + outputTypes["biom"] = tempOutNames; //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); @@ -328,6 +328,14 @@ int MakeBiomCommand::execute(){ if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { m->mothurRemove(outputNames[i]); } return 0; } + //set sabund file as new current sabundfile + string current = ""; + itTypes = outputTypes.find("biom"); + if (itTypes != outputTypes.end()) { + if ((itTypes->second).size() != 0) { current = (itTypes->second)[0]; m->setBiomFile(current); } + } + + m->mothurOutEndLine(); m->mothurOut("Output File Names: "); m->mothurOutEndLine(); for (int i = 0; i < outputNames.size(); i++) { m->mothurOut(outputNames[i]); m->mothurOutEndLine(); } @@ -513,7 +521,7 @@ vector MakeBiomCommand::getMetaData(vector& lookup) //convert list file bin labels to shared file bin labels //parse tax strings //save in map - map > labelTaxMap; + map labelTaxMap; string snumBins = toString(otuLabels.size()); for (int i = 0; i < otuLabels.size(); i++) { @@ -528,11 +536,7 @@ vector MakeBiomCommand::getMetaData(vector& lookup) } binLabel += sbinNumber; - vector taxString; - m->splitAtChar(taxs[i], taxString, ';'); - taxString.pop_back(); //adds blank string because taxonomies end in ; - - labelTaxMap[binLabel] = taxString; + labelTaxMap[binLabel] = taxs[i]; } @@ -540,7 +544,7 @@ vector MakeBiomCommand::getMetaData(vector& lookup) //traverse the binLabels forming the metadata strings and saving them //make sure to sanity check - map >::iterator it; + map::iterator it; for (int i = 0; i < m->currentBinLabels.size(); i++) { if (m->control_pressed) { return metadata; } @@ -549,37 +553,24 @@ vector MakeBiomCommand::getMetaData(vector& lookup) if (it == labelTaxMap.end()) { m->mothurOut("[ERROR]: can't find taxonomy information for " + m->currentBinLabels[i] + ".\n"); m->control_pressed = true; } else { + vector bootstrapValues; string data = "{\"taxonomy\":["; - for (int j = 0; j < (it->second).size()-1; j ++) { - - string taxon = (it->second)[j]; - - //strip "" if they are there - int pos = taxon.find("\""); - if (pos != string::npos) { - string newTax = ""; - for (int k = 0; k < taxon.length(); k++) { - if (taxon[k] != '\"') { newTax += taxon[k]; } - } - taxon = newTax; - } - - data += "\"" + taxon + "\", "; - } + + vector scores; + vector taxonomies = parseTax(it->second, scores); - string taxon = (it->second)[(it->second).size()-1]; + for (int j = 0; j < taxonomies.size()-1; j ++) { data += "\"" + taxonomies[j] + "\", "; } + data += "\"" + taxonomies[taxonomies.size()-1] + "\"]"; - //strip "" if they are there - int pos = taxon.find("\""); - if (pos != string::npos) { - string newTax = ""; - for (int k = 0; k < taxon.length(); k++) { - if (taxon[k] != '\"') { newTax += taxon[k]; } - } - taxon = newTax; + //add bootstrap values if available + if (scores[0] != "null") { + data += ", \"bootstrap\":["; + + for (int j = 0; j < scores.size()-1; j ++) { data += scores[j] + ", "; } + data += scores[scores.size()-1] + "]"; + } - - data += "\"" + taxon + "\"]} "; + data += "}"; metadata.push_back(data); } @@ -594,7 +585,58 @@ vector MakeBiomCommand::getMetaData(vector& lookup) exit(1); } -} +} +/**************************************************************************************************/ +//returns {Bacteria, Bacteroidetes, ..} and scores is filled with {100, 98, ...} or {null, null, null} +vector MakeBiomCommand::parseTax(string tax, vector& scores) { + try { + + string taxon; + vector taxs; + + while (tax.find_first_of(';') != -1) { + + if (m->control_pressed) { return taxs; } + + //get taxon + taxon = tax.substr(0,tax.find_first_of(';')); + + int pos = taxon.find_last_of('('); + if (pos != -1) { + //is it a number? + int pos2 = taxon.find_last_of(')'); + if (pos2 != -1) { + string confidenceScore = taxon.substr(pos+1, (pos2-(pos+1))); + if (m->isNumeric1(confidenceScore)) { + taxon = taxon.substr(0, pos); //rip off confidence + scores.push_back(confidenceScore); + }else{ scores.push_back("null"); } + } + }else{ scores.push_back("null"); } + + //strip "" if they are there + pos = taxon.find("\""); + if (pos != string::npos) { + string newTax = ""; + for (int k = 0; k < taxon.length(); k++) { + if (taxon[k] != '\"') { newTax += taxon[k]; } + } + taxon = newTax; + } + + //look for bootstrap value + taxs.push_back(taxon); + tax = tax.substr(tax.find_first_of(';')+1, tax.length()); + } + + return taxs; + } + catch(exception& e) { + m->errorOut(e, "MakeBiomCommand", "parseTax"); + exit(1); + } +} + //**********************************************************************************************************************