Changeset 6725 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/Tasks

Timestamp:

09/08/11 16:38:28 (13 years ago)

Author:

ascheibe

Message:

#1233 more renaming for more consistency

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/Tasks

Files:

• . (added)
• EngineTask.cs (copied) (copied from branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/Jobs/EngineJob.cs) (7 diffs)
• ItemTask.cs (copied) (copied from branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/Jobs/ItemJob.cs) (4 diffs)
• OptimizerTask.cs (copied) (copied from branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/Jobs/OptimizerJob.cs) (7 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs

@@ -7 +7 @@
 namespace HeuristicLab.Clients.Hive {
   [StorableClass]
-  public class EngineJob : ItemJob {
+  public class EngineTask : ItemTask {
     [Storable]
     protected IOperation initialOperation;
@@ -29 +29 @@
 
     #region constructors and cloning
-    public EngineJob() { }
-    public EngineJob(IOperation initialOperation, IEngine engine) {
+    public EngineTask() { }
+    public EngineTask(IOperation initialOperation, IEngine engine) {
       this.initialOperation = initialOperation;
       this.Item = engine;
@@ -36 +36 @@
 
     [StorableConstructor]
-    protected EngineJob(bool deserializing) : base(deserializing) { }
-    protected EngineJob(EngineJob original, Cloner cloner)
+    protected EngineTask(bool deserializing) : base(deserializing) { }
+    protected EngineTask(EngineTask original, Cloner cloner)
       : base(original, cloner) {
       this.initialOperation = cloner.Clone(original.initialOperation);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new EngineJob(this, cloner);
+      return new EngineTask(this, cloner);
     }
     #endregion
@@ -56 +56 @@
       Item.Start();
     }
-    
+
     public override void Pause() {
       Item.Pause();
@@ -86 +86 @@
 
     private void engine_ExceptionOccurred(object sender, EventArgs<Exception> e) {
-      OnJobFailed(e);
+      OnTaskFailed(e);
     }
 
     private void engine_Stopped(object sender, EventArgs e) {
-      OnJobStopped();
+      OnTaskStopped();
     }
 
     private void Item_Paused(object sender, EventArgs e) {
-      OnJobPaused();
+      OnTaskPaused();
     }
 
@@ -106 +106 @@
 
     private void Item_Started(object sender, EventArgs e) {
-      OnJobStarted();
+      OnTaskStarted();
     }
 
@@ -134 +134 @@
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Operator; }
     }
-    
+
     public override string ItemName {
-      get { return "EngineJob"; }
+      get { return "EngineTask"; }
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Clients.Hive {
-  [Item("Item Task", "Represents a executable hive job which contains a HeuristicLab Item.")]
+  [Item("Item Task", "Represents a executable hive task which contains a HeuristicLab Item.")]
   [StorableClass]
-  public abstract class ItemJob : NamedItem, IJob {
+  public abstract class ItemTask : NamedItem, ITask {
     public virtual bool IsParallelizable {
       get { return true; }
@@ -62 +62 @@
 
     #region Constructors and Cloning
-    public ItemJob() { }
+    public ItemTask() { }
 
     [StorableConstructor]
-    protected ItemJob(bool deserializing) { }
-    protected ItemJob(ItemJob original, Cloner cloner)
+    protected ItemTask(bool deserializing) { }
+    protected ItemTask(ItemTask original, Cloner cloner)
       : base(original, cloner) {
       this.ComputeInParallel = original.ComputeInParallel;
@@ -98 +98 @@
     #endregion
 
-    #region IJob Members
+    #region ITask Members
 
     public abstract ExecutionState ExecutionState { get; }
@@ -112 +112 @@
     public abstract void Stop();
 
-    public event EventHandler JobStarted;
-    protected virtual void OnJobStarted() {
-      EventHandler handler = JobStarted;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    public event EventHandler JobStopped;
-    protected virtual void OnJobStopped() {
-      EventHandler handler = JobStopped;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    public event EventHandler JobPaused;
-    protected virtual void OnJobPaused() {
-      EventHandler handler = JobPaused;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    public event EventHandler JobFailed;
-    protected virtual void OnJobFailed(EventArgs<Exception> e) {
-      EventHandler handler = JobFailed;
+    public event EventHandler TaskStarted;
+    protected virtual void OnTaskStarted() {
+      EventHandler handler = TaskStarted;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+
+    public event EventHandler TaskStopped;
+    protected virtual void OnTaskStopped() {
+      EventHandler handler = TaskStopped;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+
+    public event EventHandler TaskPaused;
+    protected virtual void OnTaskPaused() {
+      EventHandler handler = TaskPaused;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+
+    public event EventHandler TaskFailed;
+    protected virtual void OnTaskFailed(EventArgs<Exception> e) {
+      EventHandler handler = TaskFailed;
       if (handler != null) handler(this, e);
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Hive;
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -31 +29 @@
   [Item("Optimizer Task", "Represents Task which executes a IOptimizer object.")]
   [StorableClass]
-  public class OptimizerJob : ItemJob {
+  public class OptimizerTask : ItemTask {
     public override bool IsParallelizable {
       get { return this.Item is Experiment || this.Item is BatchRun; }
@@ -48 +46 @@
     }
 
-    public OptimizerJob() : base() { }
-    public OptimizerJob(IOptimizer optimizer)
+    public OptimizerTask() : base() { }
+    public OptimizerTask(IOptimizer optimizer)
       : this() {
       this.Item = optimizer;
@@ -62 +60 @@
     }
     [StorableConstructor]
-    protected OptimizerJob(bool deserializing) { }
-    protected OptimizerJob(OptimizerJob original, Cloner cloner)
+    protected OptimizerTask(bool deserializing) { }
+    protected OptimizerTask(OptimizerTask original, Cloner cloner)
       : base(original, cloner) {
       this.IndexInParentOptimizerList = original.IndexInParentOptimizerList;
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new OptimizerJob(this, cloner);
+      return new OptimizerTask(this, cloner);
     }
 
@@ -85 +83 @@
     }
 
-    #region IJob Members
+    #region ITask Members
     public override ExecutionState ExecutionState {
       get { return Item.ExecutionState; }
@@ -101 +99 @@
       if ((Item is Experiment && OptimizerAsExperiment.Optimizers.Count == 0) || // experiment would not fire OnStopped if it has 0 optimizers
           (Item is BatchRun && OptimizerAsBatchRun.Optimizer == null)) { // batchrun would not fire OnStopped if algorithm == null
-        OnJobStopped();
+        OnTaskStopped();
       } else {
         Item.Start();
@@ -156 +154 @@
 
     protected virtual void optimizer_ExceptionOccurred(object sender, EventArgs<Exception> e) {
-      OnJobFailed(e);
+      OnTaskFailed(e);
     }
 
     protected virtual void optimizer_Started(object sender, EventArgs e) {
-      OnJobStarted();
+      OnTaskStarted();
     }
 
     protected virtual void optimizer_Stopped(object sender, EventArgs e) {
-      OnJobStopped();
+      OnTaskStopped();
     }
 
     protected virtual void optimizer_Paused(object sender, EventArgs e) {
-      OnJobPaused();
+      OnTaskPaused();
     }