X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=summarysharedcommand.cpp;fp=summarysharedcommand.cpp;h=6147832f70a750e1424939c9928a50db643fb8b8;hb=ce8794490ab1d83adcdb2b92e0302a1e43e17adf;hp=50fbd32c3bcfa39e6b3b9c1014338eceeb7d8a8d;hpb=1f3d51cfdbe3e28c780501b7ed82d64fe27dba98;p=mothur.git diff --git a/summarysharedcommand.cpp b/summarysharedcommand.cpp index 50fbd32..6147832 100644 --- a/summarysharedcommand.cpp +++ b/summarysharedcommand.cpp @@ -74,7 +74,7 @@ string SummarySharedCommand::getOutputFileNameTag(string type, string inputName= if (it == outputTypes.end()) { m->mothurOut("[ERROR]: this command doesn't create a " + type + " output file.\n"); } else { if (type == "summary") { outputFileName = "shared.summary"; } - if (type == "phylip") { outputFileName = "dist"; } + else if (type == "phylip") { outputFileName = "dist"; } else { m->mothurOut("[ERROR]: No definition for type " + type + " output file tag.\n"); m->control_pressed = true; } } return outputFileName; @@ -879,7 +879,7 @@ int SummarySharedCommand::process(vector thisLookup, string stdmatrix[column][row] = stdDist; } - string distFileName = outputDir + m->getRootName(m->getSimpleName(sharedfile)) + sumCalculators[i]->getName() + "." + thisLookup[0]->getLabel() + "." + output + ".ave." + getOutputFileNameTag("phylip");; + string distFileName = outputDir + m->getRootName(m->getSimpleName(sharedfile)) + sumCalculators[i]->getName() + "." + thisLookup[0]->getLabel() + "." + output + ".ave." + getOutputFileNameTag("phylip"); outputNames.push_back(distFileName); outputTypes["phylip"].push_back(distFileName); ofstream outAve; m->openOutputFile(distFileName, outAve);