diff --git a/checkin_notes b/checkin_notes index abf35556e2..c6503502b0 100755 --- a/checkin_notes +++ b/checkin_notes @@ -1404,3 +1404,10 @@ David 30 Jan 2007 clientgui/ ViewProjectsGrid.cpp,h + +David 30 Jan 2007 + - core client: computation of duration_correction_factor was messed up. + E.g. when the correct value is .5, it converges to sqrt(.5) + + client/ + client_types.C diff --git a/client/client_types.C b/client/client_types.C index 40b394ab2e..72bb8e3138 100644 --- a/client/client_types.C +++ b/client/client_types.C @@ -1742,7 +1742,7 @@ double RESULT::estimated_cpu_time_remaining() { // completion time for this project's results // void PROJECT::update_duration_correction_factor(RESULT* rp) { - double ratio = rp->final_cpu_time / rp->estimated_cpu_time(); + double ratio = rp->final_cpu_time / rp->estimated_cpu_time_uncorrected(); double old_dcf = duration_correction_factor; // it's OK to overestimate completion time, @@ -1751,7 +1751,7 @@ void PROJECT::update_duration_correction_factor(RESULT* rp) { // but decrease it with caution // if (ratio > 1) { - duration_correction_factor *= ratio; + duration_correction_factor = ratio; } else { // in particular, don't give much weight to results // that completed a lot earlier than expected