Changeset 1730

Timestamp:

05/02/09 22:43:01 (16 years ago)

Author:

gkronber

Message:

Implemented calculation of list of necessary plugins for a job in the HiveEngine #545 (Engine which can be executed in the Hive).

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Engine/3.2/HiveEngine.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/PluginManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Engine/3.2/HiveEngine.cs

@@ -32 +32 @@
 using System.IO;
 using System.Xml;
+using System.IO.Compression;
 
 namespace HeuristicLab.Hive.Engine {
@@ -76 +77 @@
       IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(HiveServerUrl);
 
-      DiscoveryService dService = new DiscoveryService();
-      PluginInfo depInfo = dService.GetDeclaringPlugin(typeof(HiveEngine));
-      List<PluginInfo> dependentPlugins = PluginManager.Manager.GetDependentPluginsRec(depInfo);
-      dependentPlugins.Add(depInfo);
-
+      var jobObj = CreateJobObj();
+
+      ResponseObject<Contracts.BusinessObjects.Job> res = executionEngineFacade.AddJob(jobObj);
+      jobId = res.Obj.Id;
+    }
+
+    private HeuristicLab.Hive.Contracts.BusinessObjects.Job CreateJobObj() {
       HeuristicLab.Hive.Contracts.BusinessObjects.Job jobObj = new HeuristicLab.Hive.Contracts.BusinessObjects.Job();
-      jobObj.SerializedJob = PersistenceManager.SaveToGZip(job);
-      jobObj.State = HeuristicLab.Hive.Contracts.BusinessObjects.State.offline;
+
+      MemoryStream memStream = new MemoryStream();
+      GZipStream stream = new GZipStream(memStream, CompressionMode.Compress, true);
+      XmlDocument document = PersistenceManager.CreateXmlDocument();
+      Dictionary<Guid, IStorable> dictionary = new Dictionary<Guid, IStorable>();
+      XmlNode rootNode = document.CreateElement("Root");
+      document.AppendChild(rootNode);
+      rootNode.AppendChild(PersistenceManager.Persist(job, document, dictionary));
+      document.Save(stream);
+      stream.Close();
+      jobObj.SerializedJob = memStream.ToArray();
+
+      DiscoveryService service = new DiscoveryService();
+      List<PluginInfo> plugins = new List<PluginInfo>();
+
+      foreach (IStorable storeable in dictionary.Values) {
+        PluginInfo pluginInfo = service.GetDeclaringPlugin(storeable.GetType());
+        if (!plugins.Contains(pluginInfo)) plugins.Add(pluginInfo);
+      }
 
       List<HivePluginInfo> pluginsNeeded =
         new List<HivePluginInfo>();
-
-      foreach (PluginInfo info in dependentPlugins) {
+      foreach (PluginInfo uniquePlugin in plugins) {
         HivePluginInfo pluginInfo =
           new HivePluginInfo();
-        pluginInfo.Name = info.Name;
-        pluginInfo.Version = info.Version.ToString();
-        pluginInfo.BuildDate = info.BuildDate;
+        pluginInfo.Name = uniquePlugin.Name;
+        pluginInfo.Version = uniquePlugin.Version.ToString();
+        pluginInfo.BuildDate = uniquePlugin.BuildDate;
         pluginsNeeded.Add(pluginInfo);
       }
 
       jobObj.PluginsNeeded = pluginsNeeded;
-      ResponseObject<Contracts.BusinessObjects.Job> res = executionEngineFacade.AddJob(jobObj);
-      jobId = res.Obj.Id;
+      jobObj.State = HeuristicLab.Hive.Contracts.BusinessObjects.State.offline;
+      return jobObj;
     }
 

trunk/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs

@@ -263 +263 @@
     }
 
-
-    /// <summary>
-    /// Calculates a set of plugins that directly or transitively depend on the plugin given in the argument.
-    /// </summary>
-    /// <param name="pluginInfo">The plugin the other depend on.</param>
-    /// <returns>a list of plugins that are directly of transitively dependent.</returns>
-    public List<PluginInfo> GetDependentPluginsRec(PluginInfo pluginInfo) {
-      List<PluginInfo> mergedList = new List<PluginInfo>();
-      //Bugfix the hell out of this...
-      //Bugfixed the hell out of this...
-      foreach (PluginInfo info in pluginInfo.Dependencies) {
-        if (!mergedList.Contains(info)) {
-          mergedList.Add(info);
-          AddDependenciesRecursive(info, mergedList);        
-        }        
-      }
-      return mergedList;
-    }
-
-    private void AddDependenciesRecursive(PluginInfo info, List<PluginInfo> mergedList) {
-      //if we've already processed this element => STOP IT!
-      if(!mergedList.Contains(info)) {
-        mergedList.Add(info);
-        return;
-      }
-      foreach (PluginInfo depinfo in info.Dependencies)
-        AddDependenciesRecursive(depinfo, mergedList);       
-    }
-
     /// <summary>
     /// Unloads all plugins.