Changeset 4838 for trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableSingleSuccessorOperator.cs

Timestamp:

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

Author:

epitzer

Message:

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

File:

• trunk/sources/HeuristicLab.Operators.Programmable/3.3/ProgrammableSingleSuccessorOperator.cs (modified) (2 diffs)

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);"; }
     }
   }