Changeset 5404 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveJobClient.cs

Timestamp:

02/01/11 15:51:11 (14 years ago)

Author:

cneumuel

Message:

#1233

• changed the workflow of aquireing a new job from server.
  • if a job is available for calculation, the slave receives the jobId already with the heartbeats. The job is then exclusively assigned to this slave.
• extended the metainfo for a slave by OperatingSystem and CpuArchitecture
• enhanced the way plugin-dependencies are discovered by using the types used by XmlGenerator. Now only mimimum amount of plugins are transferred.
• selection of waiting jobs now consideres assigned slave-group
• more unit tests for service
• added unit tests for experiment manager

File:

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

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

@@ -32 +32 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
+using HeuristicLab.PluginInfrastructure.Manager;
 
 namespace HeuristicLab.Clients.Hive {
@@ -425 +426 @@
     ///   if true the Child-Optimizers will not be serialized (if the job contains an Experiment)
     /// </param>
-    public JobData GetAsJobData(bool withoutChildOptimizers) {
+    public JobData GetAsJobData(bool withoutChildOptimizers, out List<IPluginDescription> plugins) {
+      plugins = new List<IPluginDescription>();
       if (this.optimizerJob == null || this.optimizerJob.Optimizer == null)
         return null;
 
+      IEnumerable<Type> usedTypes;
       byte[] jobByteArray;
       if (withoutChildOptimizers && this.OptimizerJob.Optimizer is Optimization.Experiment) {
         OptimizerJob clonedJob = (OptimizerJob)this.OptimizerJob.Clone(); // use a cloned job, so that the childHiveJob don't get confused
         clonedJob.OptimizerAsExperiment.Optimizers.Clear();
-        jobByteArray = PersistenceUtil.Serialize(clonedJob);
+        jobByteArray = PersistenceUtil.Serialize(clonedJob, out usedTypes);
       } else if (withoutChildOptimizers && this.OptimizerJob.Optimizer is Optimization.BatchRun) {
         OptimizerJob clonedJob = (OptimizerJob)this.OptimizerJob.Clone();
         clonedJob.OptimizerAsBatchRun.Optimizer = null;
-        jobByteArray = PersistenceUtil.Serialize(clonedJob);
+        jobByteArray = PersistenceUtil.Serialize(clonedJob, out usedTypes);
       } else if (this.OptimizerJob.Optimizer is IAlgorithm) {
         ((IAlgorithm)this.OptimizerJob.Optimizer).StoreAlgorithmInEachRun = false; // avoid storing the algorithm in runs to reduce size
-        jobByteArray = PersistenceUtil.Serialize(this.OptimizerJob);
+        jobByteArray = PersistenceUtil.Serialize(this.OptimizerJob, out usedTypes);
       } else {
-        jobByteArray = PersistenceUtil.Serialize(this.OptimizerJob);
+        jobByteArray = PersistenceUtil.Serialize(this.OptimizerJob, out usedTypes);
       }
 
@@ -450 +453 @@
       };
 
+      CollectDeclaringPlugins(plugins, usedTypes);
+
       return jobData;
+    }
+
+    private void CollectDeclaringPlugins(List<IPluginDescription> plugins, IEnumerable<Type> usedTypes) {
+      foreach (Type type in usedTypes) {
+        var plugin = ApplicationManager.Manager.GetDeclaringPlugin(type);
+        if (plugin != null && !plugins.Contains(plugin)) {
+          plugins.Add(plugin);
+          CollectPluginDependencies(plugins, plugin);
+        }
+      }
+    }
+
+    private void CollectPluginDependencies(List<IPluginDescription> plugins, IPluginDescription plugin) {
+      if (plugin == null) return;
+      foreach (var dependency in plugin.Dependencies) {
+        if (!plugins.Contains(dependency)) {
+          plugins.Add(dependency);
+          CollectPluginDependencies(plugins, dependency);
+        }
+      }
     }