Changeset 5958 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager

Timestamp:

04/05/11 17:45:59 (14 years ago)

Author:

cneumuel

Message:

#1233

• initial port of HiveEngine

Location:

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

Files:

• ExperimentManagerClient.cs (modified) (2 diffs)
• HiveJobClient.cs (modified) (1 diff)

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

@@ -257 +257 @@
       }
 
-      hiveJob.Job.PluginsNeededIds = GetPluginDependencies(service, this.onlinePlugins, this.alreadyUploadedPlugins, plugins, useLocalPlugins);
+      hiveJob.Job.PluginsNeededIds = PluginUtil.GetPluginDependencies(service, this.onlinePlugins, this.alreadyUploadedPlugins, plugins, useLocalPlugins);
       hiveJob.Job.PluginsNeededIds.Add(configPluginId);
 
@@ -350 +350 @@
     }
 
-    #region Plugin Management
-    /// <summary>
-    /// Checks if plugins are available on Hive Server. If not they are uploaded. Ids are returned.
-    /// </summary>
-    /// <param name="service">An active service-proxy</param>
-    /// <param name="onlinePlugins">List of plugins which are available online</param>
-    /// <param name="alreadyUploadedPlugins">List of plugins which have been uploaded from this HiveExperiment</param>
-    /// <param name="neededPlugins">List of plugins which need to be uploaded</param>
-    /// <param name="useLocalPlugins">If true, the plugins which are already online are ignored. All local plugins are uploaded, but only once.</param>
-    /// <returns></returns>
-    private static List<Guid> GetPluginDependencies(IHiveService service, IEnumerable<Plugin> onlinePlugins, List<Plugin> alreadyUploadedPlugins, IEnumerable<IPluginDescription> neededPlugins, bool useLocalPlugins) {
-      var pluginIds = new List<Guid>();
-      foreach (var neededPlugin in neededPlugins) {
-        Plugin foundPlugin = alreadyUploadedPlugins.SingleOrDefault(p => p.Name == neededPlugin.Name && p.Version == neededPlugin.Version);
-        if (foundPlugin == null) {
-          foundPlugin = onlinePlugins.SingleOrDefault(p => p.Name == neededPlugin.Name && p.Version == neededPlugin.Version);
-          if (useLocalPlugins || foundPlugin == null) {
-            Plugin p = CreatePlugin(neededPlugin, useLocalPlugins);
-            List<PluginData> pd = CreatePluginDatas(neededPlugin);
-            p.Id = service.AddPlugin(p, pd);
-            alreadyUploadedPlugins.Add(p);
-            pluginIds.Add(p.Id);
-          } else {
-            pluginIds.Add(foundPlugin.Id);
-          }
-        } else {
-          pluginIds.Add(foundPlugin.Id);
-        }
-      }
-      return pluginIds;
-    }
-
-    private static Plugin CreatePlugin(IPluginDescription plugin, bool useLocalPlugins) {
-      return new Plugin() { Name = plugin.Name, Version = plugin.Version, IsLocal = useLocalPlugins };
-    }
-
-    private static List<PluginData> CreatePluginDatas(IPluginDescription plugin) {
-      List<PluginData> pluginDatas = new List<PluginData>();
-
-      foreach (IPluginFile pf in plugin.Files) {
-        PluginData pluginData = new PluginData();
-
-        pluginData.Data = File.ReadAllBytes(pf.Name);
-        pluginData.FileName = Path.GetFileName(pf.Name);
-        pluginDatas.Add(pluginData);
-      }
-      return pluginDatas;
-    }
-    #endregion
-
     public static OptimizerJob LoadOptimizerJob(Guid jobId) {
       JobData jobData = ServiceLocator.Instance.CallHiveService(s => s.GetJobData(jobId));

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

@@ -491 +491 @@
       };
 
-      CollectDeclaringPlugins(plugins, usedTypes);
+      PluginUtil.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);
-        }
-      }
-    }
 
     #region Events