Changeset 6033 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4

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

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4

Files:

• EngineJob.cs (modified) (7 diffs)
• HeuristicLabHiveEnginePlugin.cs.frame (modified) (1 diff)
• HiveEngine.cs (modified) (3 diffs)
• Views/HiveEngineView.Designer.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/EngineJob.cs

@@ -9 +9 @@
 namespace HeuristicLab.HiveEngine {
   [StorableClass]
-  public class EngineJob : AbstractJob {
-    [Storable]
-    private IEngine engine;
-
+  public class EngineJob : ItemJob {
     [Storable]
     protected IOperation initialOperation;
@@ -20 +17 @@
     }
 
+    public new IEngine Item {
+      get { return (IEngine)base.Item; }
+      set { base.Item = value; }
+    }
+
     public override TimeSpan ExecutionTime {
-      get { return engine.ExecutionTime; }
+      get { return Item.ExecutionTime; }
     }
 
     public override ExecutionState ExecutionState {
-      get { return engine.ExecutionState; }
+      get { return Item.ExecutionState; }
     }
 
@@ -32 +34 @@
     public EngineJob(IOperation initialOperation, IEngine engine) {
       this.initialOperation = initialOperation;
-      this.engine = engine;
-      RegisterEngineEvents();
+      this.Item = engine;
     }
 
@@ -40 +41 @@
     protected EngineJob(EngineJob original, Cloner cloner)
       : base(original, cloner) {
-      this.engine = cloner.Clone(original.engine);
       this.initialOperation = cloner.Clone(original.initialOperation);
-      RegisterEngineEvents();
     }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new EngineJob(this, cloner);
-    }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      RegisterEngineEvents();
     }
     #endregion
@@ -60 +55 @@
 
     public override void Start() {
-      engine.Prepare(initialOperation);
-      engine.Start();
+      Item.Prepare(initialOperation);
+      Item.Start();
     }
     
     public override void Pause() {
-      engine.Pause();
+      Item.Pause();
     }
 
     public override void Stop() {
-      engine.Stop();
+      Item.Stop();
     }
     
@@ -76 +71 @@
     }
 
-    private void RegisterEngineEvents() {
-      engine.Stopped += new EventHandler(engine_Stopped);
-      engine.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(engine_ExceptionOccurred);
+    protected override void RegisterItemEvents() {
+      Item.Stopped += new EventHandler(engine_Stopped);
+      Item.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(engine_ExceptionOccurred);
+    }
+
+    protected override void DeregisterItemEvents() {
+      Item.Stopped -= new EventHandler(engine_Stopped);
+      Item.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(engine_ExceptionOccurred);
     }
 
@@ -103 +103 @@
 
     public override string Name {
-      get { return engine.ToString(); }
+      get { return Item.ToString(); }
       set { throw new NotSupportedException(); }
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/HeuristicLabHiveEnginePlugin.cs.frame

@@ -26 +26 @@
   [PluginFile("HeuristicLab.HiveEngine-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Clients.Common", "3.3")]
+  [PluginDependency("HeuristicLab.Clients.Hive", "3.4")]
+  [PluginDependency("HeuristicLab.Clients.Hive.Views", "3.4")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
-  [PluginDependency("HeuristicLab.DataAccess", "3.3")]
-  [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
-  [PluginDependency("HeuristicLab.Hive.ExperimentManager", "3.3")]
-  [PluginDependency("HeuristicLab.Hive.JobBase", "3.3")]
+  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
+  [PluginDependency("HeuristicLab.Hive", "3.4")]
+  [PluginDependency("HeuristicLab.MainForm", "3.3")]
+  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Random", "3.3")]
   [PluginDependency("HeuristicLab.SequentialEngine", "3.3")]
   public class HeuristicLabHiveEnginePlugin : PluginBase {

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/HiveEngine.cs

@@ -54 +54 @@
 
     [Storable]
-    private ItemCollection<HiveExperiment> hiveExperiments;
-    public ItemCollection<HiveExperiment> HiveExperiments {
+    private ItemCollection<RefreshableHiveExperiment> hiveExperiments;
+    public ItemCollection<RefreshableHiveExperiment> HiveExperiments {
       get { return hiveExperiments; }
       set { hiveExperiments = value; }
@@ -75 +75 @@
     public HiveEngine() {
       ResourceNames = "HEAL";
-      HiveExperiments = new ItemCollection<HiveExperiment>();
+      HiveExperiments = new ItemCollection<RefreshableHiveExperiment>();
       Priority = 0;
     }
@@ -239 +239 @@
         hiveExperiment.UseLocalPlugins = this.UseLocalPlugins;
         hiveExperiment.ResourceNames = this.ResourceNames;
-        hiveExperiment.RefreshAutomatically = false;
         hiveExperiment.Id = ServiceLocator.Instance.CallHiveService(s => s.AddHiveExperiment(hiveExperiment));
-        hiveExperiments.Add(hiveExperiment);
+        hiveExperiments.Add(new RefreshableHiveExperiment(hiveExperiment));
 
         // create upload-tasks

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/Views/HiveEngineView.Designer.cs

@@ -222 +222 @@
     private System.Windows.Forms.TextBox priorityTextBox;
     private System.Windows.Forms.Label label1;
-    protected System.Windows.Forms.TextBox executionTimeOnHiveTextBox;
+    private System.Windows.Forms.TextBox executionTimeOnHiveTextBox;
     private System.Windows.Forms.TabControl tabControl;
     private System.Windows.Forms.TabPage jobsTabPage;
     private System.Windows.Forms.TabPage logTabPage;
     private System.Windows.Forms.Label executionTimeLabel;
-    protected System.Windows.Forms.TextBox executionTimeTextBox;
+    private System.Windows.Forms.TextBox executionTimeTextBox;
     private System.Windows.Forms.CheckBox useLocalPluginsCheckBox;
     private HeuristicLab.Core.Views.LogView logView;