Changeset 12686

Timestamp:

07/08/15 14:16:13 (9 years ago)

Author:

ascheibe

Message:

#2409 merged r12616, r12621, r12644, r12673 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/HiveTasks/EngineHiveTask.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveTasks/HiveTask.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/Util/PluginUtil.cs (modified) (6 diffs)
• HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IProgrammableItem.cs (copied) (copied from trunk/sources/HeuristicLab.Core/3.3/Interfaces/IProgrammableItem.cs)
• HeuristicLab.ExtLibs (modified) (1 prop)
• HeuristicLab.ExtLibs/HeuristicLab.MathJax/1.1/HeuristicLab.MathJax-1.1/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.cs (modified) (2 diffs)
• HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs (modified) (1 diff)
• HeuristicLab.Scripting/3.3/Script.cs (modified) (1 diff)

stable/HeuristicLab.Clients.Hive/3.3/HiveTasks/EngineHiveTask.cs

@@ -47 +47 @@
 
     public override TaskData GetAsTaskData(bool withoutChildOptimizers, out List<IPluginDescription> plugins) {
-      plugins = new List<IPluginDescription>();
-      if (this.itemTask == null)
+      if (ItemTask == null) {
+        plugins = new List<IPluginDescription>();
         return null;
+      }
 
       TaskData jobData = new TaskData();
@@ -60 +61 @@
       jobData.Data = PersistenceUtil.Serialize(ItemTask, out usedTypes);
 
-      PluginUtil.CollectDeclaringPlugins(plugins, usedTypes);
+      plugins = PluginUtil.GetPluginsForTask(usedTypes, ItemTask);
       return jobData;
     }

stable/HeuristicLab.Clients.Hive/3.3/HiveTasks/HiveTask.cs

@@ -295 +295 @@
     /// </param>
     public virtual TaskData GetAsTaskData(bool withoutChildOptimizers, out List<IPluginDescription> plugins) {
-      plugins = new List<IPluginDescription>();
-      if (this.itemTask == null)
+      if (ItemTask == null) {
+        plugins = new List<IPluginDescription>();
         return null;
+      }
 
       IEnumerable<Type> usedTypes;
-      byte[] taskByteArray = PersistenceUtil.Serialize(this.ItemTask, out usedTypes);
+      byte[] taskByteArray = PersistenceUtil.Serialize(ItemTask, out usedTypes);
       TaskData taskData = new TaskData() { TaskId = task.Id, Data = taskByteArray };
-      PluginUtil.CollectDeclaringPlugins(plugins, usedTypes);
+      plugins = PluginUtil.GetPluginsForTask(usedTypes, ItemTask);
       return taskData;
     }

stable/HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.cs

@@ -347 +347 @@
     /// </param>
     public override TaskData GetAsTaskData(bool withoutChildOptimizers, out List<IPluginDescription> plugins) {
-      plugins = new List<IPluginDescription>();
-      if (this.itemTask == null) // || this.jobItem.Optimizer == null
+      if (ItemTask == null) {
+        plugins = new List<IPluginDescription>();
         return null;
+      }
 
       IEnumerable<Type> usedTypes;
       byte[] jobByteArray;
-      if (withoutChildOptimizers && this.ItemTask.Item is Optimization.Experiment) {
-        OptimizerTask clonedJob = (OptimizerTask)this.ItemTask.Clone(); // use a cloned task, so that the childHiveJob don't get confused
+      if (withoutChildOptimizers && ItemTask.Item is Optimization.Experiment) {
+        OptimizerTask clonedJob = (OptimizerTask)ItemTask.Clone(); // use a cloned task, so that the childHiveJob don't get confused
         clonedJob.OptimizerAsExperiment.Optimizers.Clear();
         jobByteArray = PersistenceUtil.Serialize(clonedJob, out usedTypes);
-      } else if (withoutChildOptimizers && this.ItemTask.Item is Optimization.BatchRun) {
-        OptimizerTask clonedJob = (OptimizerTask)this.ItemTask.Clone();
+      } else if (withoutChildOptimizers && ItemTask.Item is Optimization.BatchRun) {
+        OptimizerTask clonedJob = (OptimizerTask)ItemTask.Clone();
         clonedJob.OptimizerAsBatchRun.Optimizer = null;
         jobByteArray = PersistenceUtil.Serialize(clonedJob, out usedTypes);
-      } else if (this.ItemTask.Item is IAlgorithm) {
-        ((IAlgorithm)this.ItemTask.Item).StoreAlgorithmInEachRun = false; // avoid storing the algorithm in runs to reduce size
-        jobByteArray = PersistenceUtil.Serialize(this.ItemTask, out usedTypes);
+      } else if (ItemTask.Item is IAlgorithm) {
+        ((IAlgorithm)ItemTask.Item).StoreAlgorithmInEachRun = false; // avoid storing the algorithm in runs to reduce size
+        jobByteArray = PersistenceUtil.Serialize(ItemTask, out usedTypes);
       } else {
-        jobByteArray = PersistenceUtil.Serialize(this.ItemTask, out usedTypes);
+        jobByteArray = PersistenceUtil.Serialize(ItemTask, out usedTypes);
       }
 
       TaskData jobData = new TaskData() { TaskId = task.Id, Data = jobByteArray };
-      PluginUtil.CollectDeclaringPlugins(plugins, usedTypes);
+      plugins = PluginUtil.GetPluginsForTask(usedTypes, ItemTask);
       return jobData;
     }

stable/HeuristicLab.Clients.Hive/3.3/Util/PluginUtil.cs

@@ -26 +26 @@
 using System.Security.Cryptography;
 using System.ServiceModel;
+using HeuristicLab.Core;
 using HeuristicLab.PluginInfrastructure;
 
@@ -39 +40 @@
     /// <param name="neededPlugins">List of plugins which need to be uploaded</param>
     /// <returns></returns>
-    public static List<Guid> GetPluginDependencies(IHiveService service, List<Plugin> onlinePlugins, List<Plugin> alreadyUploadedPlugins, IEnumerable<IPluginDescription> neededPlugins) {
+    public static List<Guid> GetPluginDependencies(IHiveService service, List<Plugin> onlinePlugins, List<Plugin> alreadyUploadedPlugins,
+                                                   IEnumerable<IPluginDescription> neededPlugins) {
       var pluginIds = new List<Guid>();
       Dictionary<IPluginDescription, byte[]> checksumsNeededPlugins = CalcChecksumsForPlugins(neededPlugins);
@@ -61 +63 @@
               alreadyUploadedPlugins.Add(p);
               pluginIds.Add(p.Id);
-            }
-            catch (FaultException<PluginAlreadyExistsFault> fault) {
+            } catch (FaultException<PluginAlreadyExistsFault> fault) {
               onlinePlugins.Add(service.GetPlugin(fault.Detail.Id));
             }
@@ -79 +80 @@
     }
 
-    public static Plugin CreatePlugin(IPluginDescription plugin) {
-      return new Plugin() { Name = plugin.Name, Version = plugin.Version };
-    }
-
     public static List<PluginData> CreatePluginDatas(IPluginDescription plugin) {
       List<PluginData> pluginDatas = new List<PluginData>();
@@ -96 +93 @@
     }
 
-    public static void CollectDeclaringPlugins(List<IPluginDescription> plugins, IEnumerable<Type> usedTypes) {
+    public static List<IPluginDescription> GetPluginsForTask(IEnumerable<Type> usedTypes, object task) {
+      if (usedTypes.Any(x => typeof(IProgrammableItem).IsAssignableFrom(x))) {
+        //when a programmable item is used all plugins that are currently loaded need to be sent to Hive
+        return ApplicationManager.Manager.Plugins.ToList();
+      } else {
+        return CollectDeclaringPlugins(usedTypes);
+      }
+    }
+
+    private static List<IPluginDescription> CollectDeclaringPlugins(IEnumerable<Type> usedTypes) {
+      List<IPluginDescription> plugins = new List<IPluginDescription>();
       foreach (Type type in usedTypes) {
         var plugin = ApplicationManager.Manager.GetDeclaringPlugin(type);
@@ -104 +111 @@
         }
       }
+      return plugins;
     }
 
-    public static void CollectPluginDependencies(List<IPluginDescription> plugins, IPluginDescription plugin) {
+    private static void CollectPluginDependencies(List<IPluginDescription> plugins, IPluginDescription plugin) {
       if (plugin == null) return;
       foreach (var dependency in plugin.Dependencies) {

stable/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

@@ -166 +166 @@
     <Compile Include="Interfaces\IFixedValueParameter.cs" />
     <Compile Include="Interfaces\IOperatorGraphOperator.cs" />
+    <Compile Include="Interfaces\IProgrammableItem.cs" />
     <Compile Include="Interfaces\IStatefulItem.cs" />
     <Compile Include="OperatorExecutionException.cs" />

stable/HeuristicLab.ExtLibs/HeuristicLab.MathJax/1.1/HeuristicLab.MathJax-1.1/Plugin.cs.frame

@@ -36 +36 @@
       base.OnLoad();
       if (!Directory.EnumerateFiles(AppDomain.CurrentDomain.BaseDirectory, "mathjax.js", SearchOption.TopDirectoryOnly).Any()) {
-        ZipFile.ExtractToDirectory("mathjax.zip", AppDomain.CurrentDomain.BaseDirectory);
+        ZipFile.ExtractToDirectory(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "mathjax.zip"), AppDomain.CurrentDomain.BaseDirectory);
       }
     }

stable/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.cs

@@ -42 +42 @@
   [Item("ProgrammableOperator", "An operator that can be programmed for arbitrary needs.")]
   [StorableClass]
-  public class ProgrammableOperator : Operator, IParameterizedNamedItem, IStorableContent {
+  public class ProgrammableOperator : Operator, IParameterizedNamedItem, IStorableContent, IProgrammableItem {
 
     #region Fields & Properties
@@ -280 +280 @@
             assemblies.Add(a, false);
           }
-        }
-        catch (NotSupportedException) {
+        } catch (NotSupportedException) {
           // NotSupportedException is thrown while accessing 
           // the Location property of the anonymously hosted

stable/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs

@@ -33 +33 @@
   [Creatable("Problems")]
   [StorableClass]
-  public sealed class MultiObjectiveProgrammableProblem : MultiObjectiveBasicProblem<IEncoding> {
+  public sealed class MultiObjectiveProgrammableProblem : MultiObjectiveBasicProblem<IEncoding>, IProgrammableItem {
     public static new Image StaticItemImage {
       get { return VSImageLibrary.Script; }

stable/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs

@@ -35 +35 @@
   [Creatable("Problems")]
   [StorableClass]
-  public sealed class SingleObjectiveProgrammableProblem : SingleObjectiveBasicProblem<IEncoding> {
+  public sealed class SingleObjectiveProgrammableProblem : SingleObjectiveBasicProblem<IEncoding>, IProgrammableItem {
     public static new Image StaticItemImage {
       get { return VSImageLibrary.Script; }

stable/HeuristicLab.Scripting/3.3/Script.cs

@@ -37 +37 @@
 namespace HeuristicLab.Scripting {
   [StorableClass]
-  public class Script : NamedItem {
+  public class Script : NamedItem, IProgrammableItem {
     protected virtual string CodeTemplate {
       get { return string.Empty; }