Changeset 6178 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/OptimizerHiveJob.cs

Timestamp:

05/10/11 17:58:59 (13 years ago)

Author:

cneumuel

Message:

#1233

• added semaphores to ensure an appdomain is never unloaded when the start method has not finished
• HiveEngine uploading and downloading of jobs works and is displayed in the view

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/OptimizerHiveJob.cs (modified) (15 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/OptimizerHiveJob.cs

@@ -37 +37 @@
     public OptimizerHiveJob(IOptimizer optimizer)
       : this() {
-      this.JobItem = new OptimizerJob(optimizer);
+      this.ItemJob = new OptimizerJob(optimizer);
     }
     public OptimizerHiveJob(OptimizerJob optimizerJob)
       : this() {
-      this.JobItem = optimizerJob;
+      this.ItemJob = optimizerJob;
     }
     protected OptimizerHiveJob(OptimizerHiveJob original, Cloner cloner)
@@ -60 +60 @@
       base.UpdateChildHiveJobs();
       if (Job != null && syncJobsWithOptimizers) {
-        if (!JobItem.ComputeInParallel) {
+        if (!ItemJob.ComputeInParallel) {
           this.childHiveJobs.Clear();
         } else {
-          if (JobItem.Item is Optimization.Experiment) {
-            Optimization.Experiment experiment = (Optimization.Experiment)JobItem.Item;
+          if (ItemJob.Item is Optimization.Experiment) {
+            Optimization.Experiment experiment = (Optimization.Experiment)ItemJob.Item;
             foreach (IOptimizer childOpt in experiment.Optimizers) {
               this.childHiveJobs.Add(new OptimizerHiveJob(childOpt));
             }
-          } else if (JobItem.Item is Optimization.BatchRun) {
-            Optimization.BatchRun batchRun = JobItem.OptimizerAsBatchRun;
+          } else if (ItemJob.Item is Optimization.BatchRun) {
+            Optimization.BatchRun batchRun = ItemJob.OptimizerAsBatchRun;
             if (batchRun.Optimizer != null) {
               while (this.childHiveJobs.Count < batchRun.Repetitions) {
@@ -83 +83 @@
     }
 
-    protected override void RegisterJobItemEvents() {
-      base.RegisterJobItemEvents();
-      if (JobItem != null) {
-        if (JobItem.Item is Optimization.Experiment) {
-          Optimization.Experiment experiment = JobItem.OptimizerAsExperiment;
+    protected override void RegisterItemJobEvents() {
+      base.RegisterItemJobEvents();
+      if (ItemJob != null) {
+        if (ItemJob.Item is Optimization.Experiment) {
+          Optimization.Experiment experiment = ItemJob.OptimizerAsExperiment;
           experiment.Optimizers.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsAdded);
           experiment.Optimizers.ItemsReplaced += new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsReplaced);
           experiment.Optimizers.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsRemoved);
           experiment.Optimizers.CollectionReset += new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_CollectionReset);
-        } else if (JobItem.Item is Optimization.BatchRun) {
-          Optimization.BatchRun batchRun = JobItem.OptimizerAsBatchRun;
+        } else if (ItemJob.Item is Optimization.BatchRun) {
+          Optimization.BatchRun batchRun = ItemJob.OptimizerAsBatchRun;
           batchRun.RepetitionsChanged += new EventHandler(batchRun_RepetitionsChanged);
           batchRun.OptimizerChanged += new EventHandler(batchRun_OptimizerChanged);
@@ -99 +99 @@
       }
     }
-    protected override void DergisterJobItemsEvents() {
-      base.DergisterJobItemsEvents();
-      if (JobItem != null) {
-        if (JobItem.Item is Optimization.Experiment) {
-          Optimization.Experiment experiment = JobItem.OptimizerAsExperiment;
+    protected override void DergisterItemJobEvents() {
+      base.DergisterItemJobEvents();
+      if (ItemJob != null) {
+        if (ItemJob.Item is Optimization.Experiment) {
+          Optimization.Experiment experiment = ItemJob.OptimizerAsExperiment;
           experiment.Optimizers.ItemsAdded -= new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsAdded);
           experiment.Optimizers.ItemsReplaced -= new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsReplaced);
           experiment.Optimizers.ItemsRemoved -= new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_ItemsRemoved);
           experiment.Optimizers.CollectionReset -= new CollectionItemsChangedEventHandler<IndexedItem<IOptimizer>>(Optimizers_CollectionReset);
-        } else if (JobItem.Item is Optimization.BatchRun) {
-          Optimization.BatchRun batchRun = JobItem.OptimizerAsBatchRun;
+        } else if (ItemJob.Item is Optimization.BatchRun) {
+          Optimization.BatchRun batchRun = ItemJob.OptimizerAsBatchRun;
           batchRun.RepetitionsChanged -= new EventHandler(batchRun_RepetitionsChanged);
           batchRun.OptimizerChanged -= new EventHandler(batchRun_OptimizerChanged);
@@ -129 +129 @@
 
     private void Optimizers_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOptimizer>> e) {
-      if (syncJobsWithOptimizers && this.JobItem.ComputeInParallel) {
+      if (syncJobsWithOptimizers && this.ItemJob.ComputeInParallel) {
         foreach (var item in e.Items) {
           if (GetChildByOptimizer(item.Value) == null && item.Value.Name != "Placeholder") {
@@ -138 +138 @@
     }
     private void Optimizers_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOptimizer>> e) {
-      if (syncJobsWithOptimizers && this.JobItem.ComputeInParallel) {
+      if (syncJobsWithOptimizers && this.ItemJob.ComputeInParallel) {
         foreach (var item in e.OldItems) {
           this.childHiveJobs.Remove(this.GetChildByOptimizer(item.Value));
@@ -150 +150 @@
     }
     private void Optimizers_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOptimizer>> e) {
-      if (syncJobsWithOptimizers && this.JobItem.ComputeInParallel) {
+      if (syncJobsWithOptimizers && this.ItemJob.ComputeInParallel) {
         foreach (var item in e.Items) {
           this.childHiveJobs.Remove(this.GetChildByOptimizer(item.Value));
@@ -157 +157 @@
     }
     private void Optimizers_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOptimizer>> e) {
-      if (syncJobsWithOptimizers && this.JobItem.ComputeInParallel) {
+      if (syncJobsWithOptimizers && this.ItemJob.ComputeInParallel) {
         foreach (var item in e.Items) {
           this.childHiveJobs.Remove(this.GetChildByOptimizer(item.Value));
@@ -174 +174 @@
       syncJobsWithOptimizers = false; // don't sync with optimizers during this method
 
-      if (this.JobItem != null && this.JobItem.Item != null) {
-        if (this.JobItem.Item is Optimization.Experiment) {
-          UpdateOptimizerInExperiment(this.JobItem.OptimizerAsExperiment, optimizerJob);
-        } else if (this.JobItem.Item is Optimization.BatchRun) {
-          UpdateOptimizerInBatchRun(this.JobItem.OptimizerAsBatchRun, optimizerJob);
+      if (this.ItemJob != null && this.ItemJob.Item != null) {
+        if (this.ItemJob.Item is Optimization.Experiment) {
+          UpdateOptimizerInExperiment(this.ItemJob.OptimizerAsExperiment, optimizerJob);
+        } else if (this.ItemJob.Item is Optimization.BatchRun) {
+          UpdateOptimizerInBatchRun(this.ItemJob.OptimizerAsBatchRun, optimizerJob);
         }
       }
@@ -185 +185 @@
       if (!optimizerJob.ComputeInParallel) {
         child.syncJobsWithOptimizers = false;
-        child.JobItem = optimizerJob;
+        child.ItemJob = optimizerJob;
         child.syncJobsWithOptimizers = true;
       }
@@ -236 +236 @@
     internal void SetIndexInParentOptimizerList(OptimizerHiveJob parentHiveJob) {
       if (parentHiveJob != null) {
-        if (parentHiveJob.JobItem.Item is Optimization.Experiment) {
-          this.JobItem.IndexInParentOptimizerList = parentHiveJob.JobItem.OptimizerAsExperiment.Optimizers.IndexOf(this.JobItem.Item);
-        } else if (parentHiveJob.JobItem.Item is Optimization.BatchRun) {
-          this.JobItem.IndexInParentOptimizerList = 0;
+        if (parentHiveJob.ItemJob.Item is Optimization.Experiment) {
+          this.ItemJob.IndexInParentOptimizerList = parentHiveJob.ItemJob.OptimizerAsExperiment.Optimizers.IndexOf(this.ItemJob.Item);
+        } else if (parentHiveJob.ItemJob.Item is Optimization.BatchRun) {
+          this.ItemJob.IndexInParentOptimizerList = 0;
         } else {
           throw new NotSupportedException("Only Experiment and BatchRuns are supported");
@@ -253 +253 @@
       var optimizerHiveJob = (OptimizerHiveJob)hiveJob;
       syncJobsWithOptimizers = false;
-      if (this.JobItem != null && optimizerHiveJob.JobItem != null) {
+      if (this.ItemJob != null && optimizerHiveJob.ItemJob != null) {
         // if job is in state Paused, it has to preserve its ResultCollection, which is cleared when a optimizer is added to an experiment
         OptimizerJob optimizerJobClone = null;
         if (optimizerHiveJob.Job.State == JobState.Paused) {
-          optimizerJobClone = (OptimizerJob)optimizerHiveJob.JobItem.Clone();
-        }
-
-        if (this.JobItem.Item is Optimization.Experiment) {
-          if (!this.JobItem.OptimizerAsExperiment.Optimizers.Contains(optimizerHiveJob.JobItem.Item)) {
-            UpdateOptimizerInExperiment(this.JobItem.OptimizerAsExperiment, optimizerHiveJob.JobItem);
+          optimizerJobClone = (OptimizerJob)optimizerHiveJob.ItemJob.Clone();
+        }
+
+        if (this.ItemJob.Item is Optimization.Experiment) {
+          if (!this.ItemJob.OptimizerAsExperiment.Optimizers.Contains(optimizerHiveJob.ItemJob.Item)) {
+            UpdateOptimizerInExperiment(this.ItemJob.OptimizerAsExperiment, optimizerHiveJob.ItemJob);
           }
-        } else if (this.JobItem.Item is Optimization.BatchRun) {
-          UpdateOptimizerInBatchRun(this.JobItem.OptimizerAsBatchRun, optimizerHiveJob.JobItem);
+        } else if (this.ItemJob.Item is Optimization.BatchRun) {
+          UpdateOptimizerInBatchRun(this.ItemJob.OptimizerAsBatchRun, optimizerHiveJob.ItemJob);
         }
 
         if (optimizerHiveJob.Job.State == JobState.Paused) {
-          optimizerHiveJob.JobItem = optimizerJobClone;
+          optimizerHiveJob.ItemJob = optimizerJobClone;
         }
       }
@@ -283 +283 @@
     public override JobData GetAsJobData(bool withoutChildOptimizers, out List<IPluginDescription> plugins) {
       plugins = new List<IPluginDescription>();
-      if (this.jobItem == null) // || this.jobItem.Optimizer == null
+      if (this.itemJob == null) // || this.jobItem.Optimizer == null
         return null;
 
       IEnumerable<Type> usedTypes;
       byte[] jobByteArray;
-      if (withoutChildOptimizers && this.JobItem.Item is Optimization.Experiment) {
-        OptimizerJob clonedJob = (OptimizerJob)this.JobItem.Clone(); // use a cloned job, so that the childHiveJob don't get confused
+      if (withoutChildOptimizers && this.ItemJob.Item is Optimization.Experiment) {
+        OptimizerJob clonedJob = (OptimizerJob)this.ItemJob.Clone(); // use a cloned job, so that the childHiveJob don't get confused
         clonedJob.OptimizerAsExperiment.Optimizers.Clear();
         jobByteArray = PersistenceUtil.Serialize(clonedJob, out usedTypes);
-      } else if (withoutChildOptimizers && this.JobItem.Item is Optimization.BatchRun) {
-        OptimizerJob clonedJob = (OptimizerJob)this.JobItem.Clone();
+      } else if (withoutChildOptimizers && this.ItemJob.Item is Optimization.BatchRun) {
+        OptimizerJob clonedJob = (OptimizerJob)this.ItemJob.Clone();
         clonedJob.OptimizerAsBatchRun.Optimizer = null;
         jobByteArray = PersistenceUtil.Serialize(clonedJob, out usedTypes);
-      } else if (this.JobItem.Item is IAlgorithm) {
-        ((IAlgorithm)this.JobItem.Item).StoreAlgorithmInEachRun = false; // avoid storing the algorithm in runs to reduce size
-        jobByteArray = PersistenceUtil.Serialize(this.JobItem, out usedTypes);
+      } else if (this.ItemJob.Item is IAlgorithm) {
+        ((IAlgorithm)this.ItemJob.Item).StoreAlgorithmInEachRun = false; // avoid storing the algorithm in runs to reduce size
+        jobByteArray = PersistenceUtil.Serialize(this.ItemJob, out usedTypes);
       } else {
-        jobByteArray = PersistenceUtil.Serialize(this.JobItem, out usedTypes);
+        jobByteArray = PersistenceUtil.Serialize(this.ItemJob, out usedTypes);
       }
 
@@ -315 +315 @@
     public OptimizerHiveJob GetChildByOptimizerJob(OptimizerJob optimizerJob) {
       foreach (OptimizerHiveJob child in ChildHiveJobs) {
-        if (child.JobItem == optimizerJob)
+        if (child.ItemJob == optimizerJob)
           return child;
       }
@@ -323 +323 @@
     public HiveJob<OptimizerJob> GetChildByOptimizer(IOptimizer optimizer) {
       foreach (OptimizerHiveJob child in ChildHiveJobs) {
-        if (child.JobItem.Item == optimizer)
+        if (child.ItemJob.Item == optimizer)
           return child;
       }