X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=unifracunweightedcommand.cpp;h=1c2db5325311d7b6d6afb52aecee51a75bdd1db8;hb=c651c46022761aef61644f78462365d8f767ff0b;hp=501e6123f3566d001e48ea266d5a64d42d14dd49;hpb=b9553248b33ebd169c6aee375c1cc1a9dda61848;p=mothur.git diff --git a/unifracunweightedcommand.cpp b/unifracunweightedcommand.cpp index 501e612..1c2db53 100644 --- a/unifracunweightedcommand.cpp +++ b/unifracunweightedcommand.cpp @@ -298,8 +298,10 @@ int UnifracUnweightedCommand::execute() { if (numComp < processors) { processors = numComp; } - outSum << "Tree#" << '\t' << "Groups" << '\t' << "UWScore" <<'\t' << "UWSig" << endl; - m->mothurOut("Tree#\tGroups\tUWScore\tUWSig"); m->mothurOutEndLine(); + outSum << "Tree#" << '\t' << "Groups" << '\t' << "UWScore" <<'\t'; + m->mothurOut("Tree#\tGroups\tUWScore\t"); + if (random) { outSum << "UWSig"; m->mothurOut("UWSig"); } + outSum << endl; m->mothurOutEndLine(); //get pscores for users trees for (int i = 0; i < T.size(); i++) { @@ -485,9 +487,9 @@ void UnifracUnweightedCommand::printUWSummaryFile(int i) { m->mothurOutJustToLog(groupComb[a] + "\t" + toString(utreeScores[a][0]) + "\t<" + toString((1/float(iters))) + "\n"); } }else{ - outSum << setprecision(6) << groupComb[a] << '\t' << utreeScores[a][0] << '\t' << "0.00" << endl; - cout << setprecision(6) << groupComb[a] << '\t' << utreeScores[a][0] << '\t' << "0.00" << endl; - m->mothurOutJustToLog(groupComb[a] + "\t" + toString(utreeScores[a][0]) + "\t0.00\n"); + outSum << setprecision(6) << groupComb[a] << '\t' << utreeScores[a][0] << endl; + cout << setprecision(6) << groupComb[a] << '\t' << utreeScores[a][0] << endl; + m->mothurOutJustToLog(groupComb[a] + "\t" + toString(utreeScores[a][0]) + "\n"); } }