Changeset 15721 for branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs

Timestamp:

02/04/18 22:33:26 (7 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/MetaOptimizers/TimeLimitRun.cs (modified) (9 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs

@@ -214 +214 @@
 
     private void Initialize() {
-      timer = new System.Timers.Timer();
-      timer.Interval = 50;
-      timer.Elapsed += Timer_Elapsed;
       if (algorithm != null) RegisterAlgorithmEvents();
       snapshotTimes.ItemsAdded += snapshotTimes_Changed;
@@ -258 +255 @@
     }
 
-    private System.Timers.Timer timer;
-
-    private void Timer_Elapsed(object sender, EventArgs e) {
-      if (Algorithm.ExecutionState == ExecutionState.Started) {
-        if (snapshotTimesIndex < SnapshotTimes.Count && ExecutionTime >= SnapshotTimes[snapshotTimesIndex]
-          && !pausedForSnapshot) {
-          pausedForSnapshot = true;
-          Algorithm.Pause();
-        }
-        if (ExecutionTime >= MaximumExecutionTime && !pausedForTermination) {
-          pausedForTermination = true;
-          if (!pausedForSnapshot) Algorithm.Pause();
-        }
-      }
-    }
-
     #region Events
     protected override void OnNameChanged() {
@@ -292 +273 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
-    [Obsolete("Deprecated needs to be removed")]
     public event EventHandler ExecutionTimeChanged;
+    private void OnExecutionTimeChanged() {
+      var handler = ExecutionTimeChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     public event EventHandler Prepared;
     private void OnPrepared() {
@@ -301 +285 @@
     public event EventHandler Started;
     private void OnStarted() {
-      timer.Start();
       var handler = Started;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -307 +290 @@
     public event EventHandler Paused;
     private void OnPaused() {
-      timer.Stop();
       var handler = Paused;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -313 +295 @@
     public event EventHandler Stopped;
     private void OnStopped() {
-      timer.Stop();
       var handler = Stopped;
       if (handler != null) handler(this, EventArgs.Empty);
@@ -327 +308 @@
     private void RegisterAlgorithmEvents() {
       algorithm.ExceptionOccurred += Algorithm_ExceptionOccurred;
+      algorithm.ExecutionTimeChanged += Algorithm_ExecutionTimeChanged;
       algorithm.ExecutionStateChanged += Algorithm_ExecutionStateChanged;
       algorithm.Paused += Algorithm_Paused;
@@ -335 +317 @@
     private void DeregisterAlgorithmEvents() {
       algorithm.ExceptionOccurred -= Algorithm_ExceptionOccurred;
+      algorithm.ExecutionTimeChanged -= Algorithm_ExecutionTimeChanged;
       algorithm.ExecutionStateChanged -= Algorithm_ExecutionStateChanged;
       algorithm.Paused -= Algorithm_Paused;
@@ -343 +326 @@
     private void Algorithm_ExceptionOccurred(object sender, EventArgs<Exception> e) {
       OnExceptionOccurred(e.Value);
+    }
+    private void Algorithm_ExecutionTimeChanged(object sender, EventArgs e) {
+      if (snapshotTimesIndex < SnapshotTimes.Count && ExecutionTime >= SnapshotTimes[snapshotTimesIndex]
+        && !pausedForSnapshot) {
+        pausedForSnapshot = true;
+        Algorithm.Pause();
+      }
+      if (ExecutionTime >= MaximumExecutionTime && !pausedForTermination) {
+        pausedForTermination = true;
+        if (!pausedForSnapshot) Algorithm.Pause();
+      }
+      OnExecutionTimeChanged();
     }
     private void Algorithm_ExecutionStateChanged(object sender, EventArgs e) {