Changeset 15721 for branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

Timestamp:

02/04/18 22:33:26 (6 years ago)

Author:

abeham

Message:

#1614:

• reverted r15603 by reverse merging
• added expert system plugins from #2457

File:

• branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs (modified) (10 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

@@ -64 +64 @@
       }
     }
-    
-    public abstract TimeSpan ExecutionTime { get; }
+
+    [Storable]
+    private TimeSpan executionTime;
+    public TimeSpan ExecutionTime {
+      get { return executionTime; }
+      protected set {
+        executionTime = value;
+        OnExecutionTimeChanged();
+      }
+    }
 
     public virtual Type ProblemType {
@@ -125 +133 @@
       : base() {
       executionState = ExecutionState.Stopped;
+      executionTime = TimeSpan.Zero;
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
@@ -132 +141 @@
       : base(name) {
       executionState = ExecutionState.Stopped;
+      executionTime = TimeSpan.Zero;
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
@@ -139 +149 @@
       : base(name, parameters) {
       executionState = ExecutionState.Stopped;
+      executionTime = TimeSpan.Zero;
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
@@ -146 +157 @@
       : base(name, description) {
       executionState = ExecutionState.Stopped;
+      executionTime = TimeSpan.Zero;
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
@@ -153 +165 @@
       : base(name, description, parameters) {
       executionState = ExecutionState.Stopped;
+      executionTime = TimeSpan.Zero;
       storeAlgorithmInEachRun = false;
       runsCounter = 0;
@@ -168 +181 @@
       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;
@@ -246 +260 @@
       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() {
@@ -258 +277 @@
     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();
@@ -328 +348 @@
     }
     #endregion
-
-    [Obsolete("Deprecate, does nothing, needs to be removed from IExecutable")]
-    public event EventHandler ExecutionTimeChanged;
   }
 }