Changeset 2160

Timestamp:

6/13/2010 2:09:53 AM (3 years ago)

Author:

lowjoel

Message:

Fix the calculation interval expansion/contraction:

• a geometric growth of the amount of time between samples would take too long to get an accurate reading, grow by 30% each time
• reduction by subtracting 3 must only be done if we have sufficient time, otherwise we must maintain the 3-second interval

File:

• trunk/eraser/Eraser.Util/ProgressManager.cs (modified) (1 diff)

trunk/eraser/Eraser.Util/ProgressManager.cs

@@ -500 +500 @@
 
                 //If the progress delta is zero, it usually means that the amount
-                //completed within the calculatin interval is too short -- lengthen
+                //completed within the calculation interval is too short -- lengthen
                 //the interval so we can get a small difference, significant to make
                 //a speed calculation. Likewise, if it is too great a difference,
                 //we need to shorten the interval to get more accurate calculations
                 if (progressDelta == 0.0)
-                    SpeedCalcInterval *= 2;
-                else if (progressDelta > 3.0)
+                    SpeedCalcInterval += SpeedCalcInterval / 3;
+                else if (progressDelta > 0.01 && SpeedCalcInterval > 6)
                     SpeedCalcInterval -= 3;