Changeset 15603 for branches/GeneralizedQAP/HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationAlgorithm.cs

Timestamp:

01/12/18 13:33:23 (6 years ago)

Author:

abeham

Message:

#1614: Implemented changed behavior to measure execution time (cf. #2869)

File:

• branches/GeneralizedQAP/HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationAlgorithm.cs (modified) (3 diffs)

branches/GeneralizedQAP/HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationAlgorithm.cs

@@ -21 +21 @@
 
 using System;
+using System.Threading;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -37 +38 @@
     }
 
-    protected HeuristicOptimizationAlgorithm() : base() { }
-    protected HeuristicOptimizationAlgorithm(string name) : base(name) { }
-    protected HeuristicOptimizationAlgorithm(string name, ParameterCollection parameters) : base(name, parameters) { }
-    protected HeuristicOptimizationAlgorithm(string name, string description) : base(name, description) { }
-    protected HeuristicOptimizationAlgorithm(string name, string description, ParameterCollection parameters) : base(name, description, parameters) { }
+    [Storable]
+    private TimeSpan executionTime;
+    private DateTime startDate;
+    public override TimeSpan ExecutionTime {
+      get { return executionTime + (ExecutionState == ExecutionState.Started ? DateTime.UtcNow - startDate : TimeSpan.Zero); }
+    }
+
+    protected HeuristicOptimizationAlgorithm() : base() {
+      executionTime = TimeSpan.Zero;
+    }
+    protected HeuristicOptimizationAlgorithm(string name) : base(name) {
+      executionTime = TimeSpan.Zero;
+    }
+    protected HeuristicOptimizationAlgorithm(string name, ParameterCollection parameters) : base(name, parameters) {
+      executionTime = TimeSpan.Zero;
+    }
+    protected HeuristicOptimizationAlgorithm(string name, string description) : base(name, description) {
+      executionTime = TimeSpan.Zero;
+    }
+    protected HeuristicOptimizationAlgorithm(string name, string description, ParameterCollection parameters) : base(name, description, parameters) {
+      executionTime = TimeSpan.Zero;
+    }
 
     [StorableConstructor]
     protected HeuristicOptimizationAlgorithm(bool deserializing) : base(deserializing) { }
-    protected HeuristicOptimizationAlgorithm(HeuristicOptimizationAlgorithm original, Cloner cloner) : base(original, cloner) { }
+    protected HeuristicOptimizationAlgorithm(HeuristicOptimizationAlgorithm original, Cloner cloner)
+      : base(original, cloner) {
+      executionTime = original.executionTime;
+    }
+
+    public override void Prepare() {
+      executionTime = TimeSpan.Zero;
+      base.Prepare();
+    }
+
+    public override void Start(CancellationToken cancellationToken) {
+      startDate = DateTime.UtcNow;
+      base.Start(cancellationToken);
+    }
 
     #region Events
@@ -62 +93 @@
     protected virtual void Problem_EvaluatorChanged(object sender, EventArgs e) { }
     #endregion
+
+    protected override void OnPaused() {
+      var elapsed = DateTime.UtcNow - startDate;
+      executionTime += elapsed;
+      base.OnPaused();
+    }
+
+    protected override void OnStopped() {
+      if (ExecutionState == ExecutionState.Started) {
+        var elapsed = DateTime.UtcNow - startDate;
+        executionTime += elapsed;
+      }
+      base.OnStopped();
+    }
   }
 }