X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=shhhercommand.cpp;h=63157820390d18e1ef598a8bf58932964cc6f369;hb=67ea6ccd74dbd64828d31b952808255f206364ff;hp=30815a077c19ff7663d498223c49e73ddc268809;hpb=7f1aca4ed9e6db70de82e80ca4771f7680b21d26;p=mothur.git diff --git a/shhhercommand.cpp b/shhhercommand.cpp index 30815a0..6315782 100644 --- a/shhhercommand.cpp +++ b/shhhercommand.cpp @@ -2236,6 +2236,8 @@ int ShhherCommand::driver(vector filenames, string thisCompositeFASTAFil double begClock = clock(); unsigned long long begTime; + string fileNameForOutput = filenames[i]; + for (int g = 0; g < theseFlowFileNames.size(); g++) { string flowFileName = theseFlowFileNames[g]; @@ -2269,7 +2271,7 @@ int ShhherCommand::driver(vector filenames, string thisCompositeFASTAFil begTime = time(NULL); - flowDistParentFork(numFlowCells, distFileName, numUniques, mapUniqueToSeq, mapSeqToUnique, lengths, flowDataPrI, flowDataIntI); + flowDistParentFork(numFlowCells, distFileName, numUniques, mapUniqueToSeq, mapSeqToUnique, lengths, flowDataPrI, flowDataIntI); m->mothurOutEndLine(); m->mothurOut("Total time: " + toString(time(NULL) - begTime) + '\t' + toString((clock() - begClock)/CLOCKS_PER_SEC) + '\n'); @@ -2434,7 +2436,7 @@ int ShhherCommand::driver(vector filenames, string thisCompositeFASTAFil } numCompleted++; - m->mothurOut("Total time to process " + flowFileName + ":\t" + toString(time(NULL) - begTime) + '\t' + toString((clock() - begClock)/(double)CLOCKS_PER_SEC) + '\n'); + m->mothurOut("Total time to process " + fileNameForOutput + ":\t" + toString(time(NULL) - begTime) + '\t' + toString((clock() - begClock)/(double)CLOCKS_PER_SEC) + '\n'); } if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { m->mothurRemove(outputNames[i]); } return 0; }