From 957d67f7d8bbadfd2930de061e89fd9b149270fd Mon Sep 17 00:00:00 2001 From: Sarah Westcott Date: Tue, 19 Jun 2012 14:09:38 -0400 Subject: [PATCH] added phylip as output file type for commands that output distance matrices. added shared parameter to create.database command. --- createdatabasecommand.cpp | 300 +++++++++++++++++++++++++++-------- createdatabasecommand.h | 6 +- distancecommand.cpp | 3 +- mothurout.cpp | 40 +++++ mothurout.h | 1 + nameassignment.cpp | 2 +- pairwiseseqscommand.cpp | 3 +- unifracunweightedcommand.cpp | 3 +- unifracweightedcommand.cpp | 3 +- venncommand.cpp | 3 +- 10 files changed, 287 insertions(+), 77 deletions(-) diff --git a/createdatabasecommand.cpp b/createdatabasecommand.cpp index febd762..5919f0c 100644 --- a/createdatabasecommand.cpp +++ b/createdatabasecommand.cpp @@ -15,7 +15,8 @@ vector CreateDatabaseCommand::setParameters(){ CommandParameter pfasta("repfasta", "InputTypes", "", "", "none", "none", "none",false,true); parameters.push_back(pfasta); CommandParameter pname("repname", "InputTypes", "", "", "none", "none", "none",false,true); parameters.push_back(pname); CommandParameter pcontaxonomy("contaxonomy", "InputTypes", "", "", "none", "none", "none",false,true); parameters.push_back(pcontaxonomy); - CommandParameter plist("list", "InputTypes", "", "", "none", "none", "none",false,true); parameters.push_back(plist); + CommandParameter plist("list", "InputTypes", "", "", "ListShared", "ListShared", "none",false,false); parameters.push_back(plist); + CommandParameter pshared("shared", "InputTypes", "", "", "ListShared", "ListShared", "none",false,false); parameters.push_back(pshared); CommandParameter pgroup("group", "InputTypes", "", "", "none", "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); @@ -34,8 +35,8 @@ vector CreateDatabaseCommand::setParameters(){ string CreateDatabaseCommand::getHelpString(){ try { string helpString = ""; - helpString += "The create.database command reads a listfile, *.cons.taxonomy, *.rep.fasta, *.rep.names and optional groupfile, and creates a database file.\n"; - helpString += "The create.database command parameters are repfasta, list, repname, contaxonomy, group and label. List, repfasta, repnames, and contaxonomy are required.\n"; + helpString += "The create.database command reads a list file or a shared file, *.cons.taxonomy, *.rep.fasta, *.rep.names and optional groupfile, and creates a database file.\n"; + helpString += "The create.database command parameters are repfasta, list, shared, repname, contaxonomy, group and label. List, repfasta, repnames, and contaxonomy are required.\n"; helpString += "The repfasta file is fasta file outputted by get.oturep(fasta=yourFastaFile, list=yourListfile, column=yourDistFile, name=yourNameFile).\n"; helpString += "The repname file is the name file outputted by get.oturep(fasta=yourFastaFile, list=yourListfile, column=yourDistFile, name=yourNameFile).\n"; helpString += "The contaxonomy file is the taxonomy file outputted by classify.otu(list=yourListfile, taxonomy=yourTaxonomyFile).\n"; @@ -159,6 +160,14 @@ CreateDatabaseCommand::CreateDatabaseCommand(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("shared"); + //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["shared"] = inputDir + it->second; } + } } @@ -167,14 +176,33 @@ CreateDatabaseCommand::CreateDatabaseCommand(string option) { //check for required parameters listfile = validParameter.validFile(parameters, "list", true); - if (listfile == "not found") { - //if there is a current list file, use it + if (listfile == "not found") { listfile = ""; } + else if (listfile == "not open") { listfile = ""; abort = true; } + else { m->setListFile(listfile); } + + sharedfile = validParameter.validFile(parameters, "shared", true); + if (sharedfile == "not found") { sharedfile = ""; } + else if (sharedfile == "not open") { sharedfile = ""; abort = true; } + else { m->setSharedFile(sharedfile); } + + if ((sharedfile == "") && (listfile == "")) { + //is there are current file available for either of these? + //give priority to list, then shared listfile = m->getListFile(); if (listfile != "") { m->mothurOut("Using " + listfile + " as input file for the list parameter."); m->mothurOutEndLine(); } - else { m->mothurOut("You have no current listfile and the list parameter is required."); m->mothurOutEndLine(); abort = true; } + else { + sharedfile = m->getSharedFile(); + if (sharedfile != "") { m->mothurOut("Using " + sharedfile + " as input file for the shared parameter."); m->mothurOutEndLine(); } + else { + m->mothurOut("No valid current files. You must provide a shared or list file before you can use the create.database command."); m->mothurOutEndLine(); + abort = true; + } + } } - else if (listfile == "not open") { abort = true; } - else { m->setListFile(listfile); } + else if ((sharedfile != "") && (listfile != "")) { m->mothurOut("When executing a create.database command you must enter ONLY ONE of the following: shared or list."); m->mothurOutEndLine(); abort = true; } + + if (sharedfile != "") { if (outputDir == "") { outputDir = m->hasPath(sharedfile); } } + else { if (outputDir == "") { outputDir = m->hasPath(listfile); } } contaxonomyfile = validParameter.validFile(parameters, "contaxonomy", true); if (contaxonomyfile == "not found") { //if there is a current list file, use it @@ -219,7 +247,8 @@ int CreateDatabaseCommand::execute(){ //taxonomies holds the taxonomy info for each Otu //classifyOtuSizes holds the size info of each Otu to help with error checking vector taxonomies; - vector classifyOtuSizes = readTax(taxonomies); + vector otuLabels; + vector classifyOtuSizes = readTax(taxonomies, otuLabels); if (m->control_pressed) { return 0; } @@ -230,7 +259,7 @@ int CreateDatabaseCommand::execute(){ //names redundants to uniques. backwards to how we normally do it, but each bin is the list file will be a key entry in the map. map repNames; - int numUniqueNamesFile = m->readNames(repnamesfile, repNames); + int numUniqueNamesFile = m->readNames(repnamesfile, repNames, 1); //are there the same number of otus in the fasta and name files if (repOtusSizes.size() != numUniqueNamesFile) { m->mothurOut("[ERROR]: you have " + toString(numUniqueNamesFile) + " unique seqs in your repname file, but " + toString(repOtusSizes.size()) + " seqs in your repfasta file. These should match.\n"); m->control_pressed = true; } @@ -251,86 +280,130 @@ int CreateDatabaseCommand::execute(){ if (m->control_pressed) { return 0; } - //at this point we are fairly sure the repfasta, repnames and contaxonomy files match so lets proceed with the listfile - ListVector* list = getList(); - - if (m->control_pressed) { delete list; return 0; } - GroupMap* groupmap = NULL; - if (groupfile != "") { - groupmap = new GroupMap(groupfile); - groupmap->readMap(); - } - - if (m->control_pressed) { delete list; if (groupfile != "") { delete groupmap; } return 0; } - - if (outputDir == "") { outputDir += m->hasPath(listfile); } - string outputFileName = outputDir + m->getRootName(m->getSimpleName(listfile)) + getOutputFileNameTag("database"); + string outputFileName = ""; + if (listfile != "") { outputFileName = outputDir + m->getRootName(m->getSimpleName(listfile)) + getOutputFileNameTag("database"); } + else { outputFileName = outputDir + m->getRootName(m->getSimpleName(sharedfile)) + getOutputFileNameTag("database"); } outputNames.push_back(outputFileName); outputTypes["database"].push_back(outputFileName); ofstream out; m->openOutputFile(outputFileName, out); string header = "OTUNumber\tAbundance\t"; - if (groupfile != "") { - header = "OTUNumber\t"; - for (int i = 0; i < groupmap->getNamesOfGroups().size(); i++) { header += (groupmap->getNamesOfGroups())[i] + '\t'; } - } - header += "repSeqName\trepSeq\tOTUConTaxonomy"; - out << header << endl; + - for (int i = 0; i < list->getNumBins(); i++) { + if (listfile != "") { + //at this point we are fairly sure the repfasta, repnames and contaxonomy files match so lets proceed with the listfile + ListVector* list = getList(); - if (m->control_pressed) { break; } + if (otuLabels.size() != list->getNumBins()) { + m->mothurOut("[ERROR]: you have " + toString(otuLabels.size()) + " otus in your contaxonomy file, but your list file has " + toString(list->getNumBins()) + " otus. These should match. Make sure you are using files for the same distance.\n"); m->control_pressed = true; } - out << (i+1) << '\t'; + if (m->control_pressed) { delete list; return 0; } - vector binNames; - string bin = list->get(i); - - map::iterator it = repNames.find(bin); - if (it == repNames.end()) { - m->mothurOut("[ERROR: OTU " + toString(i+1) + " is not in the repnames file. Make sure you are using files for the same distance.\n"); m->control_pressed = true; break; + GroupMap* groupmap = NULL; + if (groupfile != "") { + groupmap = new GroupMap(groupfile); + groupmap->readMap(); } - m->splitAtComma(bin, binNames); + if (m->control_pressed) { delete list; if (groupfile != "") { delete groupmap; } return 0; } - //sanity check - if (binNames.size() != classifyOtuSizes[i]) { - m->mothurOut("[ERROR: OTU " + toString(i+1) + " contains " + toString(binNames.size()) + " sequence, but the rep and taxonomy files indicated this OTU should have " + toString(classifyOtuSizes[i]) + ". Make sure you are using files for the same distance.\n"); m->control_pressed = true; break; + if (groupfile != "") { + header = "OTUNumber\t"; + for (int i = 0; i < groupmap->getNamesOfGroups().size(); i++) { header += (groupmap->getNamesOfGroups())[i] + '\t'; } } + header += "repSeqName\trepSeq\tOTUConTaxonomy"; + out << header << endl; - //output abundances - if (groupfile != "") { - string groupAbunds = ""; - map counts; - //initialize counts to 0 - for (int j = 0; j < groupmap->getNamesOfGroups().size(); j++) { counts[(groupmap->getNamesOfGroups())[j]] = 0; } + for (int i = 0; i < list->getNumBins(); i++) { + + if (m->control_pressed) { break; } + + out << otuLabels[i] << '\t'; + + vector binNames; + string bin = list->get(i); - //find abundances by group - bool error = false; - for (int j = 0; j < binNames.size(); j++) { - string group = groupmap->getGroup(binNames[j]); - if (group == "not found") { - m->mothurOut("[ERROR]: " + binNames[j] + " is not in your groupfile, please correct.\n"); - error = true; - }else { counts[group]++; } + map::iterator it = repNames.find(bin); + if (it == repNames.end()) { + m->mothurOut("[ERROR: OTU " + otuLabels[i] + " is not in the repnames file. Make sure you are using files for the same distance.\n"); m->control_pressed = true; break; } - //output counts - for (int j = 0; j < groupmap->getNamesOfGroups().size(); j++) { out << counts[(groupmap->getNamesOfGroups())[j]] << '\t'; } + m->splitAtComma(bin, binNames); - if (error) { m->control_pressed = true; } - }else { out << binNames.size() << '\t'; } + //sanity check + if (binNames.size() != classifyOtuSizes[i]) { + m->mothurOut("[ERROR: OTU " + otuLabels[i] + " contains " + toString(binNames.size()) + " sequence, but the rep and taxonomy files indicated this OTU should have " + toString(classifyOtuSizes[i]) + ". Make sure you are using files for the same distance.\n"); m->control_pressed = true; break; + } + + //output abundances + if (groupfile != "") { + string groupAbunds = ""; + map counts; + //initialize counts to 0 + for (int j = 0; j < groupmap->getNamesOfGroups().size(); j++) { counts[(groupmap->getNamesOfGroups())[j]] = 0; } + + //find abundances by group + bool error = false; + for (int j = 0; j < binNames.size(); j++) { + string group = groupmap->getGroup(binNames[j]); + if (group == "not found") { + m->mothurOut("[ERROR]: " + binNames[j] + " is not in your groupfile, please correct.\n"); + error = true; + }else { counts[group]++; } + } + + //output counts + for (int j = 0; j < groupmap->getNamesOfGroups().size(); j++) { out << counts[(groupmap->getNamesOfGroups())[j]] << '\t'; } + + if (error) { m->control_pressed = true; } + }else { out << binNames.size() << '\t'; } + + //output repSeq + out << it->second << '\t' << seqs[i].getAligned() << '\t' << taxonomies[i] << endl; + } + + + delete list; + if (groupfile != "") { delete groupmap; } + + }else { + vector lookup = getShared(); + + header = "OTUNumber\t"; + for (int i = 0; i < lookup.size(); i++) { header += lookup[i]->getGroup() + '\t'; } + header += "repSeqName\trepSeq\tOTUConTaxonomy"; + out << header << endl; - //output repSeq - out << it->second << '\t' << seqs[i].getAligned() << '\t' << taxonomies[i] << endl; + for (int h = 0; h < lookup[0]->getNumBins(); h++) { + + if (m->control_pressed) { break; } + + int index = findIndex(otuLabels, m->currentBinLabels[h]); + if (index == -1) { m->mothurOut("[ERROR]: " + m->currentBinLabels[h] + " is not in your constaxonomy file, aborting.\n"); m->control_pressed = true; } + + if (m->control_pressed) { break; } + + out << otuLabels[index] << '\t'; + + int totalAbund = 0; + for (int i = 0; i < lookup.size(); i++) { + int abund = lookup[i]->getAbundance(h); + totalAbund += abund; + out << abund << '\t'; + } + + //sanity check + if (totalAbund != classifyOtuSizes[index]) { + m->mothurOut("[ERROR: OTU " + m->currentBinLabels[h] + " contains " + toString(totalAbund) + " sequence, but the rep and taxonomy files indicated this OTU should have " + toString(classifyOtuSizes[index]) + ". Make sure you are using files for the same distance.\n"); m->control_pressed = true; break; + } + + //output repSeq + out << seqs[index].getName() << '\t' << seqs[index].getAligned() << '\t' << taxonomies[index] << endl; + } } out.close(); - - delete list; - if (groupfile != "") { delete groupmap; } - if (m->control_pressed) { m->mothurRemove(outputFileName); return 0; } m->mothurOutEndLine(); @@ -347,7 +420,21 @@ int CreateDatabaseCommand::execute(){ } } //********************************************************************************************************************** -vector CreateDatabaseCommand::readTax(vector& taxonomies){ +int CreateDatabaseCommand::findIndex(vector& otuLabels, string label){ + try { + int index = -1; + for (int i = 0; i < otuLabels.size(); i++) { + if (otuLabels[i] == label) { index = i; break; } + } + return index; + } + catch(exception& e) { + m->errorOut(e, "CreateDatabaseCommand", "findIndex"); + exit(1); + } +} +//********************************************************************************************************************** +vector CreateDatabaseCommand::readTax(vector& taxonomies, vector& otuLabels){ try { vector sizes; @@ -369,6 +456,7 @@ vector CreateDatabaseCommand::readTax(vector& taxonomies){ sizes.push_back(size); taxonomies.push_back(tax); + otuLabels.push_back(otu); } in.close(); @@ -493,5 +581,81 @@ ListVector* CreateDatabaseCommand::getList(){ } } //********************************************************************************************************************** +vector CreateDatabaseCommand::getShared(){ + try { + InputData input(sharedfile, "sharedfile"); + vector lookup = input.getSharedRAbundVectors(); + string lastLabel = lookup[0]->getLabel(); + + if (label == "") { label = lastLabel; return lookup; } + + //if the users enters label "0.06" and there is no "0.06" in their file use the next lowest label. + set labels; labels.insert(label); + set processedLabels; + set userLabels = labels; + + //as long as you are not at the end of the file or done wih the lines you want + while((lookup[0] != NULL) && (userLabels.size() != 0)) { + if (m->control_pressed) { return lookup; } + + if(labels.count(lookup[0]->getLabel()) == 1){ + processedLabels.insert(lookup[0]->getLabel()); + userLabels.erase(lookup[0]->getLabel()); + break; + } + + if ((m->anyLabelsToProcess(lookup[0]->getLabel(), userLabels, "") == true) && (processedLabels.count(lastLabel) != 1)) { + string saveLabel = lookup[0]->getLabel(); + + for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; } + lookup = input.getSharedRAbundVectors(lastLabel); + + processedLabels.insert(lookup[0]->getLabel()); + userLabels.erase(lookup[0]->getLabel()); + + //restore real lastlabel to save below + lookup[0]->setLabel(saveLabel); + break; + } + + lastLabel = lookup[0]->getLabel(); + + //get next line to process + //prevent memory leak + for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; } + lookup = input.getSharedRAbundVectors(); + } + + + if (m->control_pressed) { return lookup; } + + //output error messages about any remaining user labels + set::iterator it; + bool needToRun = false; + for (it = userLabels.begin(); it != userLabels.end(); it++) { + m->mothurOut("Your file does not include the label " + *it); + if (processedLabels.count(lastLabel) != 1) { + m->mothurOut(". I will use " + lastLabel + "."); m->mothurOutEndLine(); + needToRun = true; + }else { + m->mothurOut(". Please refer to " + lastLabel + "."); m->mothurOutEndLine(); + } + } + + //run last label if you need to + if (needToRun == true) { + for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; } + lookup = input.getSharedRAbundVectors(lastLabel); + } + + return lookup; + } + catch(exception& e) { + m->errorOut(e, "CreateDatabaseCommand", "getList"); + exit(1); + } +} + +//********************************************************************************************************************** diff --git a/createdatabasecommand.h b/createdatabasecommand.h index 85e2367..741feba 100644 --- a/createdatabasecommand.h +++ b/createdatabasecommand.h @@ -34,13 +34,15 @@ public: private: bool abort; - string listfile, groupfile, repfastafile, repnamesfile, contaxonomyfile, label, outputDir; + string sharedfile, listfile, groupfile, repfastafile, repnamesfile, contaxonomyfile, label, outputDir; vector outputNames; vector readFasta(vector&); - vector readTax(vector&); + vector readTax(vector&, vector&); ListVector* getList(); + vector getShared(); + int findIndex(vector&, string); }; diff --git a/distancecommand.cpp b/distancecommand.cpp index 99e89ba..16407d5 100644 --- a/distancecommand.cpp +++ b/distancecommand.cpp @@ -15,7 +15,7 @@ vector DistanceCommand::setParameters(){ CommandParameter pcolumn("column", "InputTypes", "", "", "none", "none", "OldFastaColumn",false,false); parameters.push_back(pcolumn); CommandParameter poldfasta("oldfasta", "InputTypes", "", "", "none", "none", "OldFastaColumn",false,false); parameters.push_back(poldfasta); CommandParameter pfasta("fasta", "InputTypes", "", "", "none", "none", "none",false,true); parameters.push_back(pfasta); - CommandParameter poutput("output", "Multiple", "column-lt-square", "column", "", "", "",false,false); parameters.push_back(poutput); + CommandParameter poutput("output", "Multiple", "column-lt-square-phylip", "column", "", "", "",false,false); parameters.push_back(poutput); CommandParameter pcalc("calc", "Multiple", "nogaps-eachgap-onegap", "onegap", "", "", "",false,false); parameters.push_back(pcalc); CommandParameter pcountends("countends", "Boolean", "", "T", "", "", "",false,false); parameters.push_back(pcountends); CommandParameter pcompress("compress", "Boolean", "", "F", "", "", "",false,false); parameters.push_back(pcompress); @@ -210,6 +210,7 @@ DistanceCommand::DistanceCommand(string option) { convert(temp, compress); output = validParameter.validFile(parameters, "output", false); if(output == "not found"){ output = "column"; } + if (output == "phylip") { output = "lt"; } if (((column != "") && (oldfastafile == "")) || ((column == "") && (oldfastafile != ""))) { m->mothurOut("If you provide column or oldfasta, you must provide both."); m->mothurOutEndLine(); abort=true; } diff --git a/mothurout.cpp b/mothurout.cpp index eacad37..64f0bc8 100644 --- a/mothurout.cpp +++ b/mothurout.cpp @@ -1631,6 +1631,46 @@ int MothurOut::readNames(string namefile, map& nameMap, bool red } } /**********************************************************************************************************************/ +int MothurOut::readNames(string namefile, map& nameMap, int flip) { + try { + + //open input file + ifstream in; + openInputFile(namefile, in); + + string rest = ""; + char buffer[4096]; + bool pairDone = false; + bool columnOne = true; + string firstCol, secondCol; + + while (!in.eof()) { + if (control_pressed) { break; } + + in.read(buffer, 4096); + vector pieces = splitWhiteSpace(rest, buffer, in.gcount()); + + for (int i = 0; i < pieces.size(); i++) { + if (columnOne) { firstCol = pieces[i]; columnOne=false; } + else { secondCol = pieces[i]; pairDone = true; columnOne=true; } + + if (pairDone) { + nameMap[secondCol] = firstCol; + pairDone = false; + } + } + } + in.close(); + + return nameMap.size(); + + } + catch(exception& e) { + errorOut(e, "MothurOut", "readNames"); + exit(1); + } +} +/**********************************************************************************************************************/ int MothurOut::readNames(string namefile, map& nameMap, map& nameCount) { try { nameMap.clear(); nameCount.clear(); diff --git a/mothurout.h b/mothurout.h index b2c638a..968ff97 100644 --- a/mothurout.h +++ b/mothurout.h @@ -106,6 +106,7 @@ class MothurOut { int readNames(string, map&, map&); int readNames(string, map&); int readNames(string, map&, bool); + int readNames(string, map&, int); int readNames(string, map >&); int readNames(string, vector&, map&); int mothurRemove(string); diff --git a/nameassignment.cpp b/nameassignment.cpp index 3d99551..126c4e0 100644 --- a/nameassignment.cpp +++ b/nameassignment.cpp @@ -22,7 +22,7 @@ void NameAssignment::readMap(){ int rowIndex = 0; while(fileHandle){ - fileHandle >> firstCol; //read from first column + fileHandle >> firstCol; m->gobble(fileHandle); //read from first column fileHandle >> secondCol; //read from second column itData = (*this).find(firstCol); diff --git a/pairwiseseqscommand.cpp b/pairwiseseqscommand.cpp index 1fa96e3..f69faff 100644 --- a/pairwiseseqscommand.cpp +++ b/pairwiseseqscommand.cpp @@ -19,7 +19,7 @@ vector PairwiseSeqsCommand::setParameters(){ CommandParameter pgapopen("gapopen", "Number", "", "-2.0", "", "", "",false,false); parameters.push_back(pgapopen); CommandParameter pgapextend("gapextend", "Number", "", "-1.0", "", "", "",false,false); parameters.push_back(pgapextend); CommandParameter pprocessors("processors", "Number", "", "1", "", "", "",false,false); parameters.push_back(pprocessors); - CommandParameter poutput("output", "Multiple", "column-lt-square", "column", "", "", "",false,false); parameters.push_back(poutput); + CommandParameter poutput("output", "Multiple", "column-lt-square-phylip", "column", "", "", "",false,false); parameters.push_back(poutput); CommandParameter pcalc("calc", "Multiple", "nogaps-eachgap-onegap", "onegap", "", "", "",false,false); parameters.push_back(pcalc); CommandParameter pcountends("countends", "Boolean", "", "T", "", "", "",false,false); parameters.push_back(pcountends); CommandParameter pcompress("compress", "Boolean", "", "F", "", "", "",false,false); parameters.push_back(pcompress); @@ -249,6 +249,7 @@ PairwiseSeqsCommand::PairwiseSeqsCommand(string option) { align = validParameter.validFile(parameters, "align", false); if (align == "not found"){ align = "needleman"; } output = validParameter.validFile(parameters, "output", false); if(output == "not found"){ output = "column"; } + if (output=="phylip") { output = "lt"; } if ((output != "column") && (output != "lt") && (output != "square")) { m->mothurOut(output + " is not a valid output form. Options are column, lt and square. I will use column."); m->mothurOutEndLine(); output = "column"; } calc = validParameter.validFile(parameters, "calc", false); diff --git a/unifracunweightedcommand.cpp b/unifracunweightedcommand.cpp index 0650ea0..0749cb7 100644 --- a/unifracunweightedcommand.cpp +++ b/unifracunweightedcommand.cpp @@ -22,7 +22,7 @@ vector UnifracUnweightedCommand::setParameters(){ CommandParameter piters("iters", "Number", "", "1000", "", "", "",false,false); parameters.push_back(piters); CommandParameter pprocessors("processors", "Number", "", "1", "", "", "",false,false); parameters.push_back(pprocessors); CommandParameter prandom("random", "Boolean", "", "F", "", "", "",false,false); parameters.push_back(prandom); - CommandParameter pdistance("distance", "Multiple", "column-lt-square", "column", "", "", "",false,false); parameters.push_back(pdistance); + CommandParameter pdistance("distance", "Multiple", "column-lt-square-phylip", "column", "", "", "",false,false); parameters.push_back(pdistance); CommandParameter psubsample("subsample", "String", "", "", "", "", "",false,false); parameters.push_back(psubsample); CommandParameter pconsensus("consensus", "Boolean", "", "F", "", "", "",false,false); parameters.push_back(pconsensus); CommandParameter proot("root", "Boolean", "F", "", "", "", "",false,false); parameters.push_back(proot); @@ -204,6 +204,7 @@ UnifracUnweightedCommand::UnifracUnweightedCommand(string option) { string temp = validParameter.validFile(parameters, "distance", false); if (temp == "not found") { phylip = false; outputForm = ""; } else{ + if (temp=="phylip") { temp = "lt"; } if ((temp == "lt") || (temp == "column") || (temp == "square")) { phylip = true; outputForm = temp; } else { m->mothurOut("Options for distance are: lt, square, or column. Using lt."); m->mothurOutEndLine(); phylip = true; outputForm = "lt"; } } diff --git a/unifracweightedcommand.cpp b/unifracweightedcommand.cpp index 13d10fd..d1e8833 100644 --- a/unifracweightedcommand.cpp +++ b/unifracweightedcommand.cpp @@ -24,7 +24,7 @@ vector UnifracWeightedCommand::setParameters(){ CommandParameter psubsample("subsample", "String", "", "", "", "", "",false,false); parameters.push_back(psubsample); CommandParameter pconsensus("consensus", "Boolean", "", "F", "", "", "",false,false); parameters.push_back(pconsensus); CommandParameter prandom("random", "Boolean", "", "F", "", "", "",false,false); parameters.push_back(prandom); - CommandParameter pdistance("distance", "Multiple", "column-lt-square", "column", "", "", "",false,false); parameters.push_back(pdistance); + CommandParameter pdistance("distance", "Multiple", "column-lt-square-phylip", "column", "", "", "",false,false); parameters.push_back(pdistance); CommandParameter proot("root", "Boolean", "F", "", "", "", "",false,false); parameters.push_back(proot); CommandParameter pinputdir("inputdir", "String", "", "", "", "", "",false,false); parameters.push_back(pinputdir); CommandParameter poutputdir("outputdir", "String", "", "", "", "", "",false,false); parameters.push_back(poutputdir); @@ -204,6 +204,7 @@ UnifracWeightedCommand::UnifracWeightedCommand(string option) { string temp = validParameter.validFile(parameters, "distance", false); if (temp == "not found") { phylip = false; outputForm = ""; } else{ + if (temp=="phylip") { temp = "lt"; } if ((temp == "lt") || (temp == "column") || (temp == "square")) { phylip = true; outputForm = temp; } else { m->mothurOut("Options for distance are: lt, square, or column. Using lt."); m->mothurOutEndLine(); phylip = true; outputForm = "lt"; } } diff --git a/venncommand.cpp b/venncommand.cpp index 18bb635..c918500 100644 --- a/venncommand.cpp +++ b/venncommand.cpp @@ -250,8 +250,7 @@ int VennCommand::execute(){ }else if (Estimators[i] == "chao") { vennCalculators.push_back(new Chao1()); }else if (Estimators[i] == "ace") { - if(abund < 5) - abund = 10; + if(abund < 5) { abund = 10; } vennCalculators.push_back(new Ace(abund)); } } -- 2.39.2