Changeset 6033 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Jobs/OptimizerJob.cs

Timestamp:

04/19/11 18:58:53 (13 years ago)

Author:

cneumuel

Message:

#1233

• created baseclass for jobs (ItemJob) which derives OperatorJobs and EngineJobs
• created special view for OptimizerJobs which derives from a more general view
• removed logic from domain class HiveExperiment and moved it into RefreshableHiveExperiment
• improved ItemTreeView
• corrected plugin dependencies
• fixed bug in database trigger when deleting HiveExperiments
• added delete cascade for Plugin and PluginData
• lots of fixes

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Jobs/OptimizerJob.cs (modified) (10 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/Jobs/OptimizerJob.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -32 +31 @@
   [Item("Optimizer Job", "Represents Job which executes a IOptimizer object.")]
   [StorableClass]
-  public class OptimizerJob : AbstractJob {
+  public class OptimizerJob : ItemJob {
     public override bool IsParallelizable {
-      get { return this.Optimizer is Optimization.Experiment || this.Optimizer is BatchRun; }
+      get { return this.Item is Experiment || this.Item is BatchRun; }
     }
 
-    [Storable]
-    protected IOptimizer optimizer;
-    public IOptimizer Optimizer {
-      get { return optimizer; }
-      set {
-        if (value != optimizer) {
-          if (optimizer != null) DeregisterOptimizerEvents();
-          optimizer = value;
-          if (optimizer != null) RegisterOptimizerEvents();
-          OnOptimizerChanged();
-        }
-      }
+    public new IOptimizer Item {
+      get { return (IOptimizer)base.Item; }
+      set { base.Item = value; }
     }
 
@@ -58 +48 @@
     }
 
-    public OptimizerJob() : base() {
-      
-    }
+    public OptimizerJob() : base() { }
     public OptimizerJob(IOptimizer optimizer)
       : this() {
-      this.Optimizer = optimizer;
+        this.Item = optimizer;
 
-      if (optimizer is Optimization.Experiment) {
+      if (optimizer is Experiment) {
         this.ComputeInParallel = true;
-      } else if (optimizer is Optimization.BatchRun) {
+      } else if (optimizer is BatchRun) {
         this.ComputeInParallel = false;
       } else {
@@ -77 +65 @@
     protected OptimizerJob(OptimizerJob original, Cloner cloner)
       : base(original, cloner) {
-      this.Optimizer = cloner.Clone(original.Optimizer);
       this.IndexInParentOptimizerList = original.IndexInParentOptimizerList;
       this.CollectChildJobs = original.CollectChildJobs;
-      this.RegisterOptimizerEvents();
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -86 +72 @@
     }
 
-    [StorableHook(HookType.AfterDeserialization)]
-    protected virtual void AfterDeserialization() {
-      RegisterOptimizerEvents();
-    }
-
     /// <summary>
     /// Casts the Optimizer to an Experiment. Returns null if cast was not successfull.
     /// </summary>
-    public Optimization.Experiment OptimizerAsExperiment {
-      get { return Optimizer as Optimization.Experiment; }
+    public Experiment OptimizerAsExperiment {
+      get { return Item as Experiment; }
     }
 
@@ -101 +82 @@
     /// Casts the Optimizer to an BatchRun. Returns null if cast was not successfull.
     /// </summary>
-    public Optimization.BatchRun OptimizerAsBatchRun {
-      get { return Optimizer as Optimization.BatchRun; }
+    public BatchRun OptimizerAsBatchRun {
+      get { return Item as BatchRun; }
     }
 
@@ -108 +89 @@
 
     public override ExecutionState ExecutionState {
-      get { return optimizer.ExecutionState; }
+      get { return Item.ExecutionState; }
     }
 
     public override TimeSpan ExecutionTime {
-      get { return optimizer.ExecutionTime; }
+      get { return Item.ExecutionTime; }
     }
 
     public override void Prepare() {
-      optimizer.Prepare();
+      Item.Prepare();
     }
 
     public override void Start() {
-      if ((optimizer is Optimization.Experiment && OptimizerAsExperiment.Optimizers.Count == 0) || // experiment would not fire OnStopped if it has 0 optimizers
-          (optimizer is Optimization.BatchRun && OptimizerAsBatchRun.Optimizer == null)) { // batchrun would not fire OnStopped if algorithm == null
+      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();
       } else {
-        optimizer.Start();
+        Item.Start();
       }
     }
 
     public override void Pause() {
-      optimizer.Pause();
+      Item.Pause();
     }
 
     public override void Stop() {
-      optimizer.Stop();
+      Item.Stop();
     }
 
@@ -142 +123 @@
 
     #region Optimizer Events
-    protected virtual void RegisterOptimizerEvents() {
-      optimizer.Stopped += new EventHandler(optimizer_Stopped);
-      optimizer.Paused += new EventHandler(optimizer_Paused);
-      optimizer.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(optimizer_ExceptionOccurred);
-      optimizer.DescriptionChanged += new EventHandler(optimizer_DescriptionChanged);
-      optimizer.ItemImageChanged += new EventHandler(optimizer_ItemImageChanged);
-      optimizer.NameChanged += new EventHandler(optimizer_NameChanged);
-      optimizer.NameChanging += new EventHandler<CancelEventArgs<string>>(optimizer_NameChanging);
-      optimizer.ToStringChanged += new EventHandler(optimizer_ToStringChanged);
+    protected override void RegisterItemEvents() {
+      base.RegisterItemEvents();
+      Item.Stopped += new EventHandler(optimizer_Stopped);
+      Item.Paused += new EventHandler(optimizer_Paused);
+      Item.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(optimizer_ExceptionOccurred);
+      Item.DescriptionChanged += new EventHandler(optimizer_DescriptionChanged);
+      Item.NameChanged += new EventHandler(optimizer_NameChanged);
+      Item.NameChanging += new EventHandler<CancelEventArgs<string>>(optimizer_NameChanging);
     }
 
     protected virtual void DeregisterOptimizerEvents() {
-      optimizer.Stopped -= new EventHandler(optimizer_Stopped);
-      optimizer.Paused -= new EventHandler(optimizer_Paused);
-      optimizer.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(optimizer_ExceptionOccurred);
-      optimizer.DescriptionChanged -= new EventHandler(optimizer_DescriptionChanged);
-      optimizer.ItemImageChanged -= new EventHandler(optimizer_ItemImageChanged);
-      optimizer.NameChanged -= new EventHandler(optimizer_NameChanged);
-      optimizer.NameChanging -= new EventHandler<CancelEventArgs<string>>(optimizer_NameChanging);
-      optimizer.ToStringChanged -= new EventHandler(optimizer_ToStringChanged);
-    }
-
-    protected void optimizer_ToStringChanged(object sender, EventArgs e) {
-      this.OnToStringChanged();
+      Item.Stopped -= new EventHandler(optimizer_Stopped);
+      Item.Paused -= new EventHandler(optimizer_Paused);
+      Item.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(optimizer_ExceptionOccurred);
+      Item.DescriptionChanged -= new EventHandler(optimizer_DescriptionChanged);
+      Item.NameChanged -= new EventHandler(optimizer_NameChanged);
+      Item.NameChanging -= new EventHandler<CancelEventArgs<string>>(optimizer_NameChanging);
+      base.DeregisterItemEvents();
     }
 
@@ -174 +149 @@
     protected void optimizer_NameChanged(object sender, EventArgs e) {
       this.OnNameChanged();
-    }
-
-    protected void optimizer_ItemImageChanged(object sender, EventArgs e) {
-      this.OnItemImageChanged();
     }
 
@@ -198 +169 @@
 
     #region INamedItem Members
-
     public override bool CanChangeDescription {
-      get { return optimizer.CanChangeDescription; }
+      get { return Item.CanChangeDescription; }
     }
 
     public override bool CanChangeName {
-      get { return optimizer.CanChangeName; }
+      get { return Item.CanChangeName; }
     }
 
     public override string Description {
-      get { return optimizer.Description; }
-      set { optimizer.Description = value; }
+      get { return Item.Description; }
+      set { Item.Description = value; }
     }
 
     public override string Name {
-      get { return optimizer.Name; }
-      set { optimizer.Name = value; }
-    }
-    #endregion
-    
-    #region IItem Members
-
-    public override string ItemDescription {
-      get { return optimizer.ItemDescription; }
-    }
-
-    public override Image ItemImage {
-      get { return optimizer.ItemImage; }
-    }
-
-    public override string ItemName {
-      get { return optimizer.ItemName; }
-    }
-
-    public override Version ItemVersion {
-      get { return optimizer.ItemVersion; }
+      get { return Item.Name; }
+      set { Item.Name = value; }
     }
     #endregion