Changeset 4838

Timestamp:

11/18/10 16:47:16 (13 years ago)

Author:

epitzer

Message:

Better reflect single successor operation generation inside user visible code. (#1275)

Location:

trunk/sources/HeuristicLab.Operators.Programmable/3.3

Files:

• ProgrammableOperator.cs (modified) (7 diffs)
• ProgrammableOperatorView.cs (modified) (2 diffs)
• ProgrammableSingleSuccessorOperator.cs (modified) (2 diffs)

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

@@ -193 +193 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
+      // ensure default namespaces and assemblies are present if deserializing old operators
+      namespaces.Add("HeuristicLab.Operators.Programmable");
+      Assemblies[typeof(HeuristicLab.Operators.Operator).Assembly] = true;
+      Assemblies[typeof(HeuristicLab.Operators.Programmable.ProgrammableOperator).Assembly] = true;
       RegisterEvents();
     }
@@ -254 +258 @@
       typeof(System.Text.StringBuilder).Assembly,
       typeof(System.Data.Linq.DataContext).Assembly,
+      typeof(System.ComponentModel.INotifyPropertyChanged).Assembly,
       typeof(HeuristicLab.Common.IDeepCloneable).Assembly,
       typeof(HeuristicLab.Core.Item).Assembly,
@@ -259 +264 @@
       typeof(HeuristicLab.Parameters.ValueParameter<IItem>).Assembly,
       typeof(HeuristicLab.Collections.ObservableList<IItem>).Assembly,
-      typeof(System.ComponentModel.INotifyPropertyChanged).Assembly,
-
+      typeof(HeuristicLab.Operators.Operator).Assembly,
+      typeof(HeuristicLab.Operators.Programmable.ProgrammableOperator).Assembly,
     };
 
@@ -293 +298 @@
         "HeuristicLab.Data",
         "HeuristicLab.Parameters",
+        "HeuristicLab.Operators.Programmable",
         "System",
         "System.Collections.Generic",
@@ -399 +405 @@
         var sb = new StringBuilder()
         .Append("public static IOperation Execute(")
-        .Append(TypeNameParser.Parse(typeof(IOperator).FullName).GetTypeNameInCode(namespaces))
+        .Append(TypeNameParser.Parse(GetType().FullName).GetTypeNameInCode(namespaces))
         .Append(" op, ")
         .Append(TypeNameParser.Parse(typeof(IExecutionContext).FullName).GetTypeNameInCode(namespaces))
@@ -421 +427 @@
       method.ReturnType = new CodeTypeReference(typeof(IOperation));
       method.Attributes = MemberAttributes.Public | MemberAttributes.Static;
-      method.Parameters.Add(new CodeParameterDeclarationExpression(typeof(IOperator), "op"));
+      method.Parameters.Add(new CodeParameterDeclarationExpression(GetType(), "op"));
       method.Parameters.Add(new CodeParameterDeclarationExpression(typeof(IExecutionContext), "context"));
       foreach (var param in Parameters)
@@ -429 +435 @@
         codeLines[i] = string.Format("#line {0} \"ProgrammableOperator\"{1}{2}", i + 1, "\r\n", codeLines[i]);
       }
-      method.Statements.Add(new CodeSnippetStatement(
-        string.Join("\r\n", codeLines) +
-        "\r\nreturn null;"));
+      method.Statements.Add(new CodeSnippetStatement(string.Join("\r\n", codeLines) + MethodSuffix));
       return method;
+    }
+
+    public virtual string MethodSuffix {
+      get { return "return null;"; }
     }
 

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

@@ -71 +71 @@
       } else {
         codeEditor.Prefix = GetGeneratedPrefix();
-        codeEditor.Suffix = @"    return null;
-  }
-}";
+        codeEditor.Suffix = String.Format("    {0}\n  }}\n}}", ProgrammableOperator.MethodSuffix);
         codeEditor.UserCode = ProgrammableOperator.Code;
         if (codeEditor.UserCode == "")
@@ -121 +119 @@
         ProgrammableOperator.Compile();
         MessageBox.Show("Compilation successful", "Success", MessageBoxButtons.OK, MessageBoxIcon.Information);
-      }
-      catch (Exception ex) {
+      } catch (Exception ex) {
         ErrorHandling.ShowErrorDialog(this, ex);
       }

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

@@ -9 +9 @@
   [StorableClass]
   public class ProgrammableSingleSuccessorOperator : ProgrammableOperator {
+
+    public IOperator Successor {
+      get {
+        IParameter parameter;
+        Parameters.TryGetValue("Successor", out parameter);
+        OperatorParameter successorParameter = parameter as OperatorParameter;
+        if (successorParameter == null)
+          return null;
+        return successorParameter.Value;
+      }
+      set {
+        ((OperatorParameter)Parameters["Successor"]).Value = value;
+      }
+    }
 
     [StorableConstructor]
@@ -24 +38 @@
     }
 
-    public override IOperation Apply() {
-      IOperation operation = base.Apply();
-      if (operation != null)
-        return operation;
-      IParameter parameter;
-      Parameters.TryGetValue("Successor", out parameter);
-      OperatorParameter successorParameter = parameter as OperatorParameter;
-      if (successorParameter != null && successorParameter.Value != null)
-        return ExecutionContext.CreateOperation(successorParameter.Value);
-      else
-        return null;
+    public override string MethodSuffix {
+      get { return "return op.Successor == null ? null : context.CreateOperation(op.Successor);"; }
     }
   }