X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=unifracweightedcommand.cpp;h=7cb8f058e8a36cea95dcefd32196b3acab024b5e;hb=9ca2caadbeac83bb84b3330d9204b1b659d62941;hp=49f6631b4ef0822defad95a1ce81372fa455d9e6;hpb=a85da7303079652b569291eacb9c2964060e072b;p=mothur.git diff --git a/unifracweightedcommand.cpp b/unifracweightedcommand.cpp index 49f6631..7cb8f05 100644 --- a/unifracweightedcommand.cpp +++ b/unifracweightedcommand.cpp @@ -51,7 +51,7 @@ int UnifracWeightedCommand::execute() { uScores.resize(numComp); //data[0] = weightedscore AB, data[1] = weightedscore AC... weightedFile = globaldata->getTreeFile() + toString(i+1) + ".weighted"; weightedFileout = globaldata->getTreeFile() + "temp." + toString(i+1) + ".weighted"; - + userData = weighted->getValues(T[i]); //userData[0] = weightedscore //save users score @@ -175,11 +175,11 @@ void UnifracWeightedCommand::printWSummaryFile() { for (int i = 0; i < T.size(); i++) { for (int j = 0; j < numComp; j++) { if (WScoreSig[count] > (1/(float)iters)) { - outSum << setprecision(globaldata->getIters().length()) << i+1 << '\t' << groupComb[j] << '\t' << utreeScores[count] << '\t' << WScoreSig[count] << endl; - cout << setprecision(globaldata->getIters().length()) << i+1 << '\t' << groupComb[j] << '\t' << utreeScores[count] << '\t' << WScoreSig[count] << endl; + outSum << setprecision(6) << i+1 << '\t' << groupComb[j] << '\t' << utreeScores[count] << '\t' << setprecision(globaldata->getIters().length()) << WScoreSig[count] << endl; + cout << setprecision(6) << i+1 << '\t' << groupComb[j] << '\t' << utreeScores[count] << '\t' << setprecision(globaldata->getIters().length()) << WScoreSig[count] << endl; }else{ - outSum << setprecision(globaldata->getIters().length()) << i+1 << '\t' << groupComb[j] << '\t' << utreeScores[count] << '\t' << "<" << (1/float(iters)) << endl; - cout << setprecision(globaldata->getIters().length()) << i+1 << '\t' << groupComb[j] << '\t' << utreeScores[count] << '\t' << "<" << (1/float(iters)) << endl; + outSum << setprecision(6) << i+1 << '\t' << groupComb[j] << '\t' << utreeScores[count] << '\t' << setprecision(globaldata->getIters().length()) << "<" << (1/float(iters)) << endl; + cout << setprecision(6) << i+1 << '\t' << groupComb[j] << '\t' << utreeScores[count] << '\t' << setprecision(globaldata->getIters().length()) << "<" << (1/float(iters)) << endl; } count++; } @@ -366,11 +366,12 @@ void UnifracWeightedCommand::output(vector data){ if(counter != 0){ string inputBuffer; getline(inFile, inputBuffer); - - out << inputBuffer << setprecision(globaldata->getIters().length()-1) << '\t' << data[1] << '\t' << data[2] << endl; + + out << inputBuffer << '\t' << setprecision(6) << data[0] << setprecision(globaldata->getIters().length()) << '\t' << data[1] << '\t' << data[2] << endl; } else{ - out << setprecision(6) << data[0] << setprecision(globaldata->getIters().length()-1) << '\t' << data[1] << '\t' << data[2] << endl; + out << setprecision(6) << data[0] << setprecision(globaldata->getIters().length()) << '\t' << data[1] << '\t' << data[2] << endl; + } }