Changeset 1499

Timestamp:

04/03/09 12:30:43 (15 years ago)

Author:

kgrading

Message:

added the recursive dependency resolvement and added the SequentialEngien Dependency to the Hive.Engine (#570)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Core/Core.cs (modified) (2 diffs)
• HeuristicLab.Hive.Client.Core/HeuristicLab.Hive.Client.Core.csproj (modified) (1 diff)
• HeuristicLab.Hive.Engine/HeuristicLab.Hive.Engine.csproj (modified) (2 diffs)
• HeuristicLab.Hive.Engine/HeuristicLab.snk (added)
• HeuristicLab.Hive.Engine/HeuristicLabHiveEnginePlugin.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure/PluginManager.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

@@ -45 +45 @@
 using HeuristicLab.Hive.Client.Core.JobStorage;
 
-
 namespace HeuristicLab.Hive.Client.Core {
   /// <summary>
@@ -206 +205 @@
 
         PluginManager.Manager.Initialize();
-        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, typeof(TestJob));
+        
+        AppDomain appDomain = PluginManager.Manager.CreateAndInitAppDomainWithSandbox(e.Result.Job.Id.ToString(), sandboxed, typeof(HeuristicLab.Hive.Engine.HiveEngine));
         appDomain.UnhandledException += new UnhandledExceptionEventHandler(appDomain_UnhandledException);
         lock (engines) {                    

trunk/sources/HeuristicLab.Hive.Client.Core/HeuristicLab.Hive.Client.Core.csproj

@@ -143 +143 @@
       <Name>HeuristicLab.Hive.Contracts</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Hive.Engine\HeuristicLab.Hive.Engine.csproj">
+      <Project>{C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}</Project>
+      <Name>HeuristicLab.Hive.Engine</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Hive.JobBase\HeuristicLab.Hive.JobBase.csproj">
       <Project>{21187322-52DD-4243-80A4-A85F0263E63B}</Project>

trunk/sources/HeuristicLab.Hive.Engine/HeuristicLab.Hive.Engine.csproj

@@ -13 +13 @@
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -122 +124 @@
   </ItemGroup>
   <ItemGroup>
+    <None Include="HeuristicLab.snk" />
     <None Include="Properties\AssemblyInfo.frame" />
   </ItemGroup>

trunk/sources/HeuristicLab.Hive.Engine/HeuristicLabHiveEnginePlugin.cs

@@ -33 +33 @@
   [Dependency(Dependency = "HeuristicLab.Core-3.2")]
   [Dependency(Dependency = "HeuristicLab.Hive.JobBase-3.2")]
+  [Dependency(Dependency = "HeuristicLab.SequentialEngine-3.2")]
   public class HeuristicLabHiveEnginePlugin : PluginBase {
   }

trunk/sources/HeuristicLab.PluginInfrastructure/PluginManager.cs

@@ -241 +241 @@
     public List<PluginInfo> GetDependentPlugins(PluginInfo pluginInfo) {
       List<PluginInfo> mergedList = new List<PluginInfo>();
-      foreach (PluginInfo plugin in InstalledPlugins) {
-        if (plugin.Dependencies.Contains(pluginInfo)) {
-          if (!mergedList.Contains(plugin)) {
-            mergedList.Add(plugin);
-          }
-          // for each of the dependent plugins add the list of transitively dependent plugins
-          // make sure that only one entry for each plugin is added to the merged list
-          GetDependentPlugins(plugin).ForEach(delegate(PluginInfo dependentPlugin) {
-            if (!mergedList.Contains(dependentPlugin)) {
-              mergedList.Add(dependentPlugin);
-            }
-          });
-        }
+      //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);       
     }