Changeset 3903 for trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.cs

Timestamp:

06/08/10 16:26:35 (14 years ago)

Author:

epitzer

Message:

Incorporate changes suggested by abeham in 842#comment:28 (#842)

• Fix persistence of selected assemblies
• Fix problem with static initialization
• Make parameter values (ActualValue) with parameter object
• show (or hide) parameter namespaces as necessary
• add icons for buttons, assemblies and namespaces
• sort assemblies and namespaces alphabetically
• correctly mark and unmark select assemblies
• put assemblies and namespaces into group boxes

File:

• trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.cs (modified) (12 diffs)

trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableOperator.cs

@@ -38 +38 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence.Auxiliary;
 using HeuristicLab.Collections;
 
@@ -43 +44 @@
 
   [Item("ProgrammableOperator", "An operator that can be programmed for arbitrary needs.")]
-  [StorableClass]  
+  [StorableClass]
   public class ProgrammableOperator : Operator, IParameterizedNamedItem {
 
@@ -79 +80 @@
     protected Dictionary<Assembly, bool> Assemblies;
 
-    [Storable]
-    private List<string> _persistedAssemblyNames {
+    [Storable(Name="SelectedAssemblies")]
+    private List<string> _selectedAssemblyNames_persistence {
       get {
-        return Assemblies.Keys.Select(a => a.FullName).ToList();
+        return Assemblies.Where(a => a.Value).Select(a => a.Key.FullName).ToList();        
       }
       set {
@@ -115 +116 @@
 
     public void SelectAssembly(Assembly a) {
-      if (a != null && Assemblies.ContainsKey(a))
+      if (a != null && Assemblies.ContainsKey(a) && !Assemblies[a]) {
         Assemblies[a] = true;
+      }
     }
 
     public void UnselectAssembly(Assembly a) {
-      if (a != null && Assemblies.ContainsKey(a))
+      if (a != null && Assemblies.ContainsKey(a) && Assemblies[a]) {
         Assemblies[a] = false;
+      }
     }
 
     public void SelectNamespace(string ns) {
       namespaces.Add(ns);
+      OnSignatureChanged();
     }
 
     public void UnselectNamespace(string ns) {
       namespaces.Remove(ns);
+      OnSignatureChanged();
     }
 
@@ -162 +167 @@
       executeMethod = null;
       ProgrammableOperator.StaticInitialize();
-      Assemblies = defaultAssemblyDict;
-      Plugins = defaultPluginDict;
+      Assemblies = defaultAssemblyDict.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+      Plugins = defaultPluginDict.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.ToList());
       namespaces = new HashSet<string>(DiscoverNamespaces());
       RegisterEvents();
@@ -170 +175 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void RegisterEvents() {
-      Parameters.ItemsAdded += OnSignatureChanged;
-      Parameters.ItemsRemoved += OnSignatureChanged;
-      Parameters.ItemsReplaced += OnSignatureChanged;
-      Parameters.CollectionReset += OnSignatureChanged;
-    }
-
-    protected void OnSignatureChanged(object sender, CollectionItemsChangedEventArgs<IParameter> args) {
-      if (SignatureChanged != null)
-        SignatureChanged(sender, EventArgs.Empty);
+      Parameters.ItemsAdded += Parameters_Changed;
+      Parameters.ItemsRemoved += Parameters_Changed;
+      Parameters.ItemsReplaced += Parameters_Changed;
+      Parameters.CollectionReset += Parameters_Changed;
+    }
+
+    private void Parameters_Changed(object sender, CollectionItemsChangedEventArgs<IParameter> args) {
+      OnSignatureChanged();
+    }
+
+    protected void OnSignatureChanged() {
+      EventHandler handler = SignatureChanged;
+      if (handler != null)
+        handler(this, EventArgs.Empty);
     }
 
     private static void StaticInitialize() {
       lock (initLock) {
-        if (defaultPluginDict != null || defaultAssemblyDict != null) return;
+        if (defaultPluginDict != null && defaultAssemblyDict != null)
+          return;
         defaultAssemblyDict = DiscoverAssemblies();
         defaultPluginDict = GroupAssemblies(defaultAssemblyDict.Keys);
@@ -220 +231 @@
       typeof(HeuristicLab.Core.Item).Assembly,
       typeof(HeuristicLab.Data.IntValue).Assembly,
+      typeof(HeuristicLab.Parameters.ValueParameter<IItem>).Assembly,
+      typeof(HeuristicLab.Collections.ObservableList<IItem>).Assembly,
+      typeof(System.ComponentModel.INotifyPropertyChanged).Assembly,
+
     };
 
@@ -248 +263 @@
     protected static List<string> DiscoverNamespaces() {
       return new List<string>() {
+        "HeuristicLab.Common",
+        "HeuristicLab.Core",
+        "HeuristicLab.Data",
+        "HeuristicLab.Parameters",
         "System",
         "System.Collections.Generic",
@@ -253 +272 @@
         "System.Linq",
         "System.Data.Linq",
-        "HeuristicLab.Common",
-        "HeuristicLab.Core",
-        "HeuristicLab.Data",
       };
     }
@@ -356 +372 @@
       get {
         var sb = new StringBuilder()
-        .Append("public static IOperation Execute(IOperator op, IExecutionContext context");
+        .Append("public static IOperation Execute(")
+        .Append(TypeNameParser.Parse(typeof(IOperator).FullName).GetTypeNameInCode(namespaces))
+        .Append(" op, ")
+        .Append(TypeNameParser.Parse(typeof(IExecutionContext).FullName).GetTypeNameInCode(namespaces))
+        .Append(" context");
         foreach (IParameter param in Parameters) {
-          sb.Append(String.Format(", {0} {1}", param.DataType.Name, param.Name));
+          sb.Append(String.Format(", {0} {1}",
+            TypeNameParser.Parse(param.GetType().FullName).GetTypeNameInCode(namespaces),
+            param.Name));
         }
         return sb.Append(")").ToString();
@@ -376 +398 @@
       method.Parameters.Add(new CodeParameterDeclarationExpression(typeof(IExecutionContext), "context"));
       foreach (var param in Parameters)
-        method.Parameters.Add(new CodeParameterDeclarationExpression(param.DataType, param.Name));
+        method.Parameters.Add(new CodeParameterDeclarationExpression(param.GetType(), param.Name));
       string[] codeLines = lineSplitter.Split(code);
       for (int i = 0; i < codeLines.Length; i++) {
@@ -399 +421 @@
 
       var parameters = new List<object>() { this, ExecutionContext };
-      parameters.AddRange(Parameters.Select(p => (object)p.ActualValue));
+      parameters.AddRange(Parameters.Select(p => (object)p));
       return (IOperation)executeMethod.Invoke(null, parameters.ToArray());
     }