Changeset 3439

Timestamp:

04/20/10 15:13:38 (14 years ago)

Author:

abeham

Message:

Updated ConditionalBranch to return false branch when condition is not found #984

File:

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

trunk/sources/HeuristicLab.Operators/3.3/ConditionalBranch.cs

@@ -30 +30 @@
   /// A branch of two operators whose executions depend on a condition.
   /// </summary>
-  [Item("ConditionalBranch", "A branch of two operators whose executions depend on a boolean condition.")]
+  [Item("ConditionalBranch", "A branch of two operators whose executions depend on a boolean condition. If the boolean condition is not present, the false branch is executed.")]
   [StorableClass]
   public class ConditionalBranch : SingleSuccessorOperator {
@@ -60 +60 @@
     public override IOperation Apply() {
       OperationCollection next = new OperationCollection(base.Apply());
-      if (ConditionParameter.ActualValue.Value) {
+      if (ConditionParameter.ActualValue != null && ConditionParameter.ActualValue.Value) {
         if (TrueBranch != null) next.Insert(0, ExecutionContext.CreateOperation(TrueBranch));
       } else {