From 95d6ddc38c58bdd50c4bbbb41f34cec15aa82db5 Mon Sep 17 00:00:00 2001 From: rpoplin Date: Fri, 21 Jan 2011 22:23:14 +0000 Subject: [PATCH] lastProgressPrintTime should only be updated when a progress log is printed not when a performance log is printed git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5050 348d0f76-0448-11de-a6fe-93d51630548a --- .../gatk/traversals/TraversalEngine.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/java/src/org/broadinstitute/sting/gatk/traversals/TraversalEngine.java b/java/src/org/broadinstitute/sting/gatk/traversals/TraversalEngine.java index ce7e28697..e3b51a344 100755 --- a/java/src/org/broadinstitute/sting/gatk/traversals/TraversalEngine.java +++ b/java/src/org/broadinstitute/sting/gatk/traversals/TraversalEngine.java @@ -258,7 +258,6 @@ public abstract class TraversalEngine,Provide boolean printLog = performanceLog != null && maxElapsedIntervalForPrinting(curTime, lastPerformanceLogPrintTime, PERFORMANCE_LOG_PRINT_FREQUENCY); if ( printProgress || printLog ) { - lastProgressPrintTime = curTime; ProcessingHistory last = updateHistory(loc, metrics); final MyTime elapsed = new MyTime(last.elapsedSeconds); @@ -268,15 +267,17 @@ public abstract class TraversalEngine,Provide final MyTime estTotalRuntime = new MyTime(elapsed.t / fractionGenomeTargetCompleted); final MyTime timeToCompletion = new MyTime(estTotalRuntime.t - elapsed.t); - // dynamically change the update rate so that short running jobs receive frequent updates while longer jobs receive fewer updates - if ( estTotalRuntime.t > TWELVE_HOURS_IN_SECONDS ) - PROGRESS_PRINT_FREQUENCY = 60 * 1000; // in milliseconds - else if ( estTotalRuntime.t > TWO_HOURS_IN_SECONDS ) - PROGRESS_PRINT_FREQUENCY = 30 * 1000; // in milliseconds - else - PROGRESS_PRINT_FREQUENCY = 10 * 1000; // in milliseconds - if ( printProgress ) { + lastProgressPrintTime = curTime; + + // dynamically change the update rate so that short running jobs receive frequent updates while longer jobs receive fewer updates + if ( estTotalRuntime.t > TWELVE_HOURS_IN_SECONDS ) + PROGRESS_PRINT_FREQUENCY = 60 * 1000; // in milliseconds + else if ( estTotalRuntime.t > TWO_HOURS_IN_SECONDS ) + PROGRESS_PRINT_FREQUENCY = 30 * 1000; // in milliseconds + else + PROGRESS_PRINT_FREQUENCY = 10 * 1000; // in milliseconds + // String common = String.format("%4.1e %s in %s, %s per 1M %s, %4.1f%% complete, est. runtime %s, %s remaining", // nRecords*1.0, getTraversalType(), elapsed, unitRate, // getTraversalType(), 100*fractionGenomeTargetCompleted,