Changeset 15721 for branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/Algorithms/EngineAlgorithm.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/EngineAlgorithm.cs (modified) (4 diffs)

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

@@ -71 +71 @@
     }
 
-    public override TimeSpan ExecutionTime {
-      get { return engine.ExecutionTime; }
-    }
-
     public override ResultCollection Results {
       get {
@@ -200 +196 @@
     private void RegisterEngineEvents() {
       Engine.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(Engine_ExceptionOccurred);
+      Engine.ExecutionTimeChanged += new EventHandler(Engine_ExecutionTimeChanged);
       Engine.Paused += new EventHandler(Engine_Paused);
       Engine.Prepared += new EventHandler(Engine_Prepared);
@@ -207 +204 @@
     private void DeregisterEngineEvents() {
       Engine.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(Engine_ExceptionOccurred);
+      Engine.ExecutionTimeChanged -= new EventHandler(Engine_ExecutionTimeChanged);
       Engine.Paused -= new EventHandler(Engine_Paused);
       Engine.Prepared -= new EventHandler(Engine_Prepared);
@@ -214 +212 @@
     private void Engine_ExceptionOccurred(object sender, EventArgs<Exception> e) {
       OnExceptionOccurred(e.Value);
+    }
+    private void Engine_ExecutionTimeChanged(object sender, EventArgs e) {
+      ExecutionTime = Engine.ExecutionTime;
     }
     private void Engine_Paused(object sender, EventArgs e) {