Changeset 3262 for trunk/sources/HeuristicLab.Optimization/3.3/EngineAlgorithm.cs

Timestamp:

04/04/10 05:22:47 (14 years ago)

Author:

swagner

Message:

Continued work on algorithm batch processing (#947).

File:

• trunk/sources/HeuristicLab.Optimization/3.3/EngineAlgorithm.cs (modified) (4 diffs)

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

@@ -94 +94 @@
     }
 
-    public override TimeSpan ExecutionTime {
-      get {
-        if (engine == null) return TimeSpan.Zero;
-        else return engine.ExecutionTime;
-      }
-    }
-
-    public override bool Finished {
-      get {
-        if (engine == null) return true;
-        else return engine.Finished;
-      }
-    }
-
     protected EngineAlgorithm()
       : base() {
@@ -172 +158 @@
     }
 
-    protected override void OnCanceledChanged() {
-      if (Canceled && (engine != null))
-        engine.Stop();
-    }
-    protected override void OnPrepared() {
+    public override void Prepare() {
+      base.Prepare();
       globalScope.Clear();
       globalScope.Variables.Add(new Variable("Results", new ResultCollection()));
@@ -195 +178 @@
         engine.Prepare(context);
       }
-      base.OnPrepared();
-    }
-    protected override void OnStarted() {
+    }
+    public override void Start() {
+      base.Start();
       if (engine != null) engine.Start();
-      base.OnStarted();
-    }
-
-    protected virtual void OnOperatorGraphChanged() { }
-
+    }
+    public override void Pause() {
+      base.Pause();
+      if (engine != null) engine.Pause();
+    }
+    public override void Stop() {
+      base.Stop();
+      if (engine != null) engine.Stop();
+    }
+
+    #region Events
     public event EventHandler EngineChanged;
     protected virtual void OnEngineChanged() {
@@ -209 +198 @@
         EngineChanged(this, EventArgs.Empty);
     }
-
-    private void OperatorGraph_InitialOperatorChanged(object sender, EventArgs e) {
-      Prepare();
-    }
+    protected virtual void OnOperatorGraphChanged() { }
+
     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);
+      Engine.Started += new EventHandler(Engine_Started);
       Engine.Stopped += new EventHandler(Engine_Stopped);
     }
-
     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);
+      Engine.Started -= new EventHandler(Engine_Started);
       Engine.Stopped -= new EventHandler(Engine_Stopped);
     }
-
     private void Engine_ExceptionOccurred(object sender, EventArgs<Exception> e) {
       OnExceptionOccurred(e.Value);
     }
     private void Engine_ExecutionTimeChanged(object sender, EventArgs e) {
-      OnExecutionTimeChanged();
+      ExecutionTime = Engine.ExecutionTime;
+    }
+    private void Engine_Paused(object sender, EventArgs e) {
+      OnPaused();
+    }
+    private void Engine_Prepared(object sender, EventArgs e) {
+      OnPrepared();
+    }
+    private void Engine_Started(object sender, EventArgs e) {
+      OnStarted();
     }
     private void Engine_Stopped(object sender, EventArgs e) {
       OnStopped();
     }
+
+    private void OperatorGraph_InitialOperatorChanged(object sender, EventArgs e) {
+      Prepare();
+    }
+    #endregion
   }
 }