Changeset 1813 for trunk/eraser6

Timestamp:

2/11/2010 5:50:39 AM (3 years ago)

Author:

lowjoel

Message:

Replaced the Speed property of the ProgressManager? classes to a float so that it is unit agnostic, bearing the unit percentage points per second instead, so it is generalised to all progress manager classes.

File:

• trunk/eraser6/Eraser.Util/ProgressManager.cs (modified) (10 diffs)

trunk/eraser6/Eraser.Util/ProgressManager.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
@@ -61 +62 @@
 
         /// <summary>
-        /// Computes the speed of the erase, in units of completion per second,
+        /// Computes the speed of the erase, in percentage of completion per second,
         /// based on the information collected in the previous 15 seconds.
         /// </summary>
-        public abstract int Speed
+        public abstract float Speed
         {
             get;
@@ -156 +157 @@
         }
 
-        public override int Speed
-        {
-            get
-            {
-                if (DateTime.Now == StartTime)
-                    return 0;
-
-                if ((DateTime.Now - lastSpeedCalc).Seconds < 5 && lastSpeed != 0)
+        public override float Speed
+        {
+            get
+            {
+                if ((DateTime.Now - lastSpeedCalc).Seconds <= 1 && lastSpeed != 0)
                     return lastSpeed;
 
@@ -172 +170 @@
 
                 //Then compute the speed of the calculation
-                lastSpeed = (int)((Completed - lastCompleted) / timeElapsed);
+                lastSpeed = (float)((Completed - lastCompleted) / timeElapsed / total);
                 lastSpeedCalc = DateTime.Now;
                 lastCompleted = Completed;
@@ -183 +181 @@
             get
             {
-                if (Speed == 0)
+                float speed = Speed;
+                if (speed == 0.0)
                     return TimeSpan.Zero;
-                return new TimeSpan(0, 0, (int)((Total - Completed) / Speed));
+
+                return TimeSpan.FromSeconds((1.0f - Progress) / speed);
             }
         }
@@ -203 +203 @@
         /// The last calculated speed of the operation.
         /// </summary>
-        private int lastSpeed;
+        private float lastSpeed;
 
         /// <summary>
@@ -412 +412 @@
             get
             {
-                float result = 0.0f;
-                lock (ListLock)
-                    foreach (SteppedProgressManagerStep step in Steps)
-                        result += step.Progress.Progress * step.Weight;
-
-                return result;
-            }
-        }
-
-        public override int Speed
+                lock (ListLock)
+                    return Steps.Sum(step => step.Progress.Progress * step.Weight);
+            }
+        }
+
+        public override float Speed
         {
             get
@@ -436 +432 @@
             get
             {
-                long ticksElapsed = (DateTime.Now - StartTime).Ticks;
-                float progressRemaining = 1.0f - Progress;
-                return new TimeSpan((long)
-                    (progressRemaining * (ticksElapsed / (double)Progress)));
+                float speed = Speed;
+                if (speed == 0.0)
+                    return TimeSpan.Zero;
+
+                return TimeSpan.FromSeconds((1.0f - Progress) / speed);
             }
         }
@@ -687 +684 @@
             get
             {
-                float result = 0.0f;
                 lock (TaskLock)
-                    foreach (ProgressManagerBase subTask in Tasks)
-                        result += subTask.Progress * (1.0f / Tasks.Count);
-
-                return result;
-            }
-        }
-
-        public override int Speed
-        {
-            get
-            {
-                int maxSpeed = 0;
+                    return Tasks.Sum(task => task.Progress * (1.0f / Tasks.Count));
+            }
+        }
+
+        public override float Speed
+        {
+            get
+            {
                 lock (TaskLock)
-                    foreach (ProgressManagerBase subTask in Tasks)
-                        maxSpeed = Math.Max(subTask.Speed, maxSpeed);
-
-                return maxSpeed;
+                    return Tasks.Max(task => task.Speed);
             }
         }
@@ -713 +702 @@
             get
             {
-                TimeSpan maxTime = TimeSpan.MinValue;
                 lock (TaskLock)
-                    foreach (ProgressManagerBase subTask in Tasks)
-                        if (maxTime < subTask.TimeLeft)
-                            maxTime = subTask.TimeLeft;
-
-                return maxTime;
+                    return Tasks.Max(task => task.TimeLeft);
             }
         }