Changeset 3261 for trunk/sources/HeuristicLab.Optimization/3.3

Timestamp:

04/04/10 00:03:13 (15 years ago)

Author:

swagner

Message:

Continued work on algorithm batch processing (#947).

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• Algorithm.cs (modified) (2 diffs)
• BatchRun.cs (modified) (3 diffs)
• EngineAlgorithm.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/Algorithm.cs

@@ -112 +112 @@
     }
     public void Start() {
+      OnStarted();
       Running = true;
       Canceled = false;
-      OnStarted();
     }
     public void Stop() {
@@ -157 +157 @@
     public event EventHandler Stopped;
     protected virtual void OnStopped() {
+      Canceled = false;
+      Running = false;
       if (Stopped != null)
         Stopped(this, EventArgs.Empty);
-      Canceled = false;
-      Running = false;
     }
     protected virtual void OnCanceledChanged() { }

trunk/sources/HeuristicLab.Optimization/3.3/BatchRun.cs

@@ -142 +142 @@
     }
     public void Start() {
-      if (Algorithm != null) Algorithm.Start();
+      if (Algorithm != null) {
+        OnStarted();
+        Running = true;
+        canceled = false;
+        Algorithm.Start();
+      }
     }
     public void Stop() {
@@ -186 +191 @@
       if (Stopped != null)
         Stopped(this, EventArgs.Empty);
-      canceled = false;
-      Running = false;
     }
     public event EventHandler<HeuristicLab.Common.EventArgs<Exception>> ExceptionOccurred;
@@ -195 +198 @@
     }
 
+    private void RegisterAlgorithmEvents() {
+      algorithm.ExceptionOccurred += new EventHandler<HeuristicLab.Common.EventArgs<Exception>>(Algorithm_ExceptionOccurred);
+      algorithm.Started += new EventHandler(Algorithm_Started);
+      algorithm.Stopped += new EventHandler(Algorithm_Stopped);
+    }
     private void DeregisterAlgorithmEvents() {
-      algorithm.RunningChanged -= new EventHandler(Algorithm_RunningChanged);
       algorithm.ExceptionOccurred -= new EventHandler<HeuristicLab.Common.EventArgs<Exception>>(Algorithm_ExceptionOccurred);
-    }
-
-    private void RegisterAlgorithmEvents() {
-      algorithm.RunningChanged += new EventHandler(Algorithm_RunningChanged);
-      algorithm.ExceptionOccurred += new EventHandler<HeuristicLab.Common.EventArgs<Exception>>(Algorithm_ExceptionOccurred);
-    }
-
-    private void Algorithm_RunningChanged(object sender, EventArgs e) {
-      if (Algorithm.Running) {
-        Running = true;
-        OnStarted();
-      } else {
-        if (!canceled) {
-          ExecutionTime += Algorithm.ExecutionTime;
-          runs.Add(new Run("Run " + Algorithm.ExecutionTime.ToString(), Algorithm));
-          Algorithm.Prepare();
-          if (runs.Count < repetitions) Algorithm.Start();
-          else OnStopped();
-        } else {
-          OnStopped();
-        }
-      }
-    }
+      algorithm.Started -= new EventHandler(Algorithm_Started);
+      algorithm.Stopped -= new EventHandler(Algorithm_Stopped);
+    }
+
     private void Algorithm_ExceptionOccurred(object sender, HeuristicLab.Common.EventArgs<Exception> e) {
       OnExceptionOccurred(e.Value);
+    }
+    private void Algorithm_Started(object sender, EventArgs e) {
+      if (!Running) {
+        OnStarted();
+        Running = true;
+        canceled = false;
+      }
+    }
+    private void Algorithm_Stopped(object sender, EventArgs e) {
+      if (!canceled) {
+        ExecutionTime += Algorithm.ExecutionTime;
+        runs.Add(new Run("Run " + Algorithm.ExecutionTime.ToString(), Algorithm));
+        Algorithm.Prepare();
+
+        if (runs.Count < repetitions)
+          Algorithm.Start();
+        else {
+          Running = false;
+          OnStopped();
+        }
+      } else {
+        canceled = false;
+        Running = false;
+        OnStopped();
+      }
     }
     #endregion

trunk/sources/HeuristicLab.Optimization/3.3/EngineAlgorithm.cs

@@ -216 +216 @@
       Engine.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(Engine_ExceptionOccurred);
       Engine.ExecutionTimeChanged += new EventHandler(Engine_ExecutionTimeChanged);
-      Engine.RunningChanged += new EventHandler(Engine_RunningChanged);
-    }
+      Engine.Stopped += new EventHandler(Engine_Stopped);
+    }
+
     private void DeregisterEngineEvents() {
       Engine.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(Engine_ExceptionOccurred);
       Engine.ExecutionTimeChanged -= new EventHandler(Engine_ExecutionTimeChanged);
-      Engine.RunningChanged -= new EventHandler(Engine_RunningChanged);
+      Engine.Stopped -= new EventHandler(Engine_Stopped);
     }
 
@@ -230 +231 @@
       OnExecutionTimeChanged();
     }
-    private void Engine_RunningChanged(object sender, EventArgs e) {
-      if (!Engine.Running) OnStopped();
+    private void Engine_Stopped(object sender, EventArgs e) {
+      OnStopped();
     }
   }