Changeset 12307 for branches/TerminationCriteria

Timestamp:

04/14/15 11:14:16 (10 years ago)

Author:

pfleck

Message:

#2027 Fixed problem that parameter values are not available during operator construction by using value changed events.
Note that the debug view is not working with this because of the runtime operator graph change.

File:

• branches/TerminationCriteria/HeuristicLab.Termination/3.3/TerminationOperator.cs (modified) (5 diffs)

branches/TerminationCriteria/HeuristicLab.Termination/3.3/TerminationOperator.cs

@@ -21 +21 @@
 
 using System;
-using HeuristicLab.Collections;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -30 +30 @@
 
 namespace HeuristicLab.Termination {
-  [Item("Termination Operator", "An operator which either calls the terminate- or the continue branch.")]
+  [Item("TerminationOperator", "An operator which either calls the terminate- or the continue branch.")]
   [StorableClass]
   public sealed class TerminationOperator : AlgorithmOperator {
@@ -60 +60 @@
     private TerminationOperator(TerminationOperator original, Cloner cloner)
       : base(original, cloner) {
+      Initialize();
     }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new TerminationOperator(this, cloner);
     }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      Initialize();
+    }
+
+
+    private Assigner Assigner { get { return OperatorGraph.Iterate().OfType<Assigner>().Single(); } }
+    private Placeholder Placeholder { get { return OperatorGraph.Iterate().OfType<Placeholder>().Single(); } }
+    private ConditionalBranch Branch { get { return OperatorGraph.Iterate().OfType<ConditionalBranch>().Single(); } }
 
     public TerminationOperator()
@@ -74 +84 @@
       var assigner = new Assigner() { Name = "Terminate = false" };
       var placeholder = new Placeholder() { Name = "Check termination criteria (Placeholder)" };
-      var terminateBranch = new ConditionalBranch() { Name = "Terminate?" };
+      var branch = new ConditionalBranch() { Name = "Terminate?" };
 
       OperatorGraph.InitialOperator = assigner;
@@ -83 +93 @@
 
       placeholder.OperatorParameter.ActualName = TerminationCriteriaParameter.Name;
-      placeholder.Successor = terminateBranch;
+      placeholder.Successor = branch;
+
+      branch.ConditionParameter.ActualName = TerminateParameter.Name;
+
+      Initialize();
     }
 
-    public override IOperation Apply() {
-      var next = new OperationCollection(base.Apply());
-      // ToDo Terminate available after call execution of the operator graph
-      if (TerminateParameter.ActualValue != null && TerminateParameter.ActualValue.Value) {
-        if (TerminateBranch != null) next.Insert(0, ExecutionContext.CreateOperation(TerminateBranch));
-      } else {
-        if (ContinueBranch != null) next.Insert(0, ExecutionContext.CreateOperation(ContinueBranch));
-      }
-      return next;
+    private void Initialize() {
+      TerminateBranchParameter.ValueChanged += TerminateBranchParameter_ValueChanged;
+      ContinueBranchParameter.ValueChanged += ContinueBranchParameter_ValueChanged;
+
+      TerminateParameter.ActualNameChanged += TerminateParameter_ActualNameChanged;
+      TerminationCriteriaParameter.ActualNameChanged += TerminationCriteriaParameter_ActualNameChanged;
     }
+
+    #region Events
+    private void TerminateBranchParameter_ValueChanged(object s, EventArgs e) {
+      Branch.TrueBranch = TerminateBranch;
+    }
+    private void ContinueBranchParameter_ValueChanged(object s, EventArgs e) {
+      Branch.FalseBranch = ContinueBranch;
+    }
+    private void TerminateParameter_ActualNameChanged(object s, EventArgs e) {
+      Assigner.LeftSideParameter.ActualName = TerminateParameter.ActualName;
+    }
+    private void TerminationCriteriaParameter_ActualNameChanged(object s, EventArgs e) {
+      Placeholder.OperatorParameter.ActualName = TerminationCriteriaParameter.ActualName;
+    }
+    #endregion
   }
 }