Changeset 15603 for branches/GeneralizedQAP/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.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/Algorithm.cs (modified) (10 diffs)

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

@@ -64 +64 @@
       }
     }
-
-    [Storable]
-    private TimeSpan executionTime;
-    public TimeSpan ExecutionTime {
-      get { return executionTime; }
-      protected set {
-        executionTime = value;
-        OnExecutionTimeChanged();
-      }
-    }
+    
+    public abstract TimeSpan ExecutionTime { get; }
 
     public virtual Type ProblemType {
@@ -133 +125 @@
       : base() {
       executionState = ExecutionState.Stopped;
-      executionTime = TimeSpan.Zero;
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
@@ -141 +132 @@
       : base(name) {
       executionState = ExecutionState.Stopped;
-      executionTime = TimeSpan.Zero;
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
@@ -149 +139 @@
       : base(name, parameters) {
       executionState = ExecutionState.Stopped;
-      executionTime = TimeSpan.Zero;
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
@@ -157 +146 @@
       : base(name, description) {
       executionState = ExecutionState.Stopped;
-      executionTime = TimeSpan.Zero;
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
@@ -165 +153 @@
       : base(name, description, parameters) {
       executionState = ExecutionState.Stopped;
-      executionTime = TimeSpan.Zero;
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
@@ -181 +168 @@
       if (ExecutionState == ExecutionState.Started) throw new InvalidOperationException(string.Format("Clone not allowed in execution state \"{0}\".", ExecutionState));
       executionState = original.executionState;
-      executionTime = original.executionTime;
       problem = cloner.Clone(original.problem);
       storeAlgorithmInEachRun = original.storeAlgorithmInEachRun;
@@ -259 +245 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
-    public event EventHandler ExecutionTimeChanged;
-    protected virtual void OnExecutionTimeChanged() {
-      EventHandler handler = ExecutionTimeChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
     public event EventHandler ProblemChanged;
     protected virtual void OnProblemChanged() {
@@ -276 +257 @@
     public event EventHandler Prepared;
     protected virtual void OnPrepared() {
-      ExecutionTime = TimeSpan.Zero;
       foreach (IStatefulItem statefulObject in this.GetObjectGraphObjects(new HashSet<object>() { Runs }).OfType<IStatefulItem>()) {
         statefulObject.InitializeState();
@@ -347 +327 @@
     }
     #endregion
+
+    [Obsolete("Deprecate, does nothing, needs to be removed from IExecutable")]
+    public event EventHandler ExecutionTimeChanged;
   }
 }