Changeset 5177 for branches/ParallelEngine/HeuristicLab.Operators/3.3

Timestamp:

12/26/10 03:51:30 (13 years ago)

Author:

swagner

Message:

Removed property ExecutionContext in Operator (#1333)

Location:

branches/ParallelEngine/HeuristicLab.Operators/3.3

Files:

• AlgorithmOperator.cs (modified) (1 diff)
• Assigner.cs (modified) (1 diff)
• Comparator.cs (modified) (2 diffs)
• ConditionalBranch.cs (modified) (1 diff)
• DoubleCounter.cs (modified) (1 diff)
• IntCounter.cs (modified) (1 diff)
• Operator.cs (modified) (7 diffs)
• Placeholder.cs (modified) (1 diff)
• ScopeCleaner.cs (modified) (1 diff)
• SingleSuccessorOperator.cs (modified) (1 diff)
• StochasticBranch.cs (modified) (1 diff)
• StochasticMultiBranch.cs (modified) (2 diffs)
• SubScopesCreator.cs (modified) (1 diff)
• SubScopesMixer.cs (modified) (2 diffs)
• SubScopesProcessor.cs (modified) (2 diffs)
• SubScopesRemover.cs (modified) (2 diffs)
• SubScopesSorter.cs (modified) (1 diff)
• UniformSubScopesProcessor.cs (modified) (1 diff)
• VariableCreator.cs (modified) (2 diffs)

branches/ParallelEngine/HeuristicLab.Operators/3.3/AlgorithmOperator.cs

@@ -55 +55 @@
     }
 
-    public override IOperation Apply() {
-      OperationCollection next = new OperationCollection(base.Apply());
+    public override IOperation Apply(IExecutionContext context) {
+      OperationCollection next = new OperationCollection(base.Apply(context));
       if (operatorGraph.InitialOperator != null)
-        next.Insert(0, ExecutionContext.CreateChildOperation(operatorGraph.InitialOperator));
+        next.Insert(0, context.CreateChildOperation(operatorGraph.InitialOperator));
       return next;
     }

branches/ParallelEngine/HeuristicLab.Operators/3.3/Assigner.cs

@@ -54 +54 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation Apply(IExecutionContext context) {
       LeftSideParameter.ActualValue = (IItem)RightSideParameter.ActualValue.Clone();
-      return base.Apply();
+      return base.Apply(context);
     }
   }

branches/ParallelEngine/HeuristicLab.Operators/3.3/Comparator.cs

@@ -68 +68 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation Apply(IExecutionContext context) {
       IItem left = LeftSideParameter.ActualValue;
       IItem right = RightSideParameter.ActualValue;
@@ -91 +91 @@
       }
       ResultParameter.ActualValue = new BoolValue(b);
-      return base.Apply();
+      return base.Apply(context);
     }
   }

branches/ParallelEngine/HeuristicLab.Operators/3.3/ConditionalBranch.cs

@@ -67 +67 @@
     }
 
-    public override IOperation Apply() {
-      OperationCollection next = new OperationCollection(base.Apply());
+    public override IOperation Apply(IExecutionContext context) {
+      OperationCollection next = new OperationCollection(base.Apply(context));
       if (ConditionParameter.ActualValue != null && ConditionParameter.ActualValue.Value) {
-        if (TrueBranch != null) next.Insert(0, ExecutionContext.CreateOperation(TrueBranch));
+        if (TrueBranch != null) next.Insert(0, context.CreateOperation(TrueBranch));
       } else {
-        if (FalseBranch != null) next.Insert(0, ExecutionContext.CreateOperation(FalseBranch));
+        if (FalseBranch != null) next.Insert(0, context.CreateOperation(FalseBranch));
       }
       return next;

branches/ParallelEngine/HeuristicLab.Operators/3.3/DoubleCounter.cs

@@ -59 +59 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation Apply(IExecutionContext context) {
       if (ValueParameter.ActualValue == null) ValueParameter.ActualValue = new DoubleValue();
       ValueParameter.ActualValue.Value += IncrementParameter.ActualValue.Value;
-      return base.Apply();
+      return base.Apply(context);
     }
   }

branches/ParallelEngine/HeuristicLab.Operators/3.3/IntCounter.cs

@@ -59 +59 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation Apply(IExecutionContext context) {
       if (ValueParameter.ActualValue == null) ValueParameter.ActualValue = new IntValue();
       ValueParameter.ActualValue.Value += IncrementParameter.ActualValue.Value;
-      return base.Apply();
+      return base.Apply(context);
     }
   }

branches/ParallelEngine/HeuristicLab.Operators/3.3/Operator.cs

@@ -28 +28 @@
 namespace HeuristicLab.Operators {
   /// <summary>
-  /// The base class for all operators.
+  /// Base class for operators.
   /// </summary>
   [Item("Operator", "Base class for operators.")]
@@ -43 +43 @@
     }
 
-    [Storable]
-    private IExecutionContext executionContext;
-    protected IExecutionContext ExecutionContext {
-      get { return executionContext; }
-      private set {
-        if (value != executionContext) {
-          executionContext = value;
-          OnExecutionContextChanged();
-        }
-      }
-    }
-
-    /// <summary>
-    /// Flag whether the current instance has been canceled.
-    /// </summary>
     private bool canceled;
-    /// <inheritdoc/>
     protected bool Canceled {
       get { return canceled; }
@@ -72 +56 @@
     [Storable]
     private bool breakpoint;
-    /// <inheritdoc/>
-    /// <remarks>Calls <see cref="OnBreakpointChanged"/> in the setter.</remarks>
     public bool Breakpoint {
       get { return breakpoint; }
@@ -91 +73 @@
       this.canceled = original.canceled;
       this.breakpoint = original.breakpoint;
-      this.executionContext = cloner.Clone<IExecutionContext>(original.executionContext);
     }
-    /// <summary>
-    /// Initializes a new instance of <see cref="OperatorBase"/> setting the breakpoint flag and 
-    /// the canceled flag to <c>false</c> and the name of the operator to the type name. 
-    /// </summary>
     protected Operator()
       : base() {
@@ -123 +100 @@
     }
 
-    /// <inheritdoc/>
     public virtual IOperation Execute(IExecutionContext context) {
       try {
         Canceled = false;
-        ExecutionContext = context;
         foreach (IParameter param in Parameters)
           param.ExecutionContext = context;
-        IOperation next = Apply();
+        IOperation next = Apply(context);
         OnExecuted();
         return next;
@@ -137 +112 @@
         foreach (IParameter param in Parameters)
           param.ExecutionContext = null;
-        ExecutionContext = null;
       }
     }
-    /// <inheritdoc/>
-    /// <remarks>Sets property <see cref="Canceled"/> to <c>true</c>.</remarks>
     public void Abort() {
       Canceled = true;
     }
-    /// <summary>
-    /// Performs the current operator on the specified <paramref name="scope"/>.
-    /// </summary>
-    /// <param name="scope">The scope where to execute the operator</param>
-    /// <returns><c>null</c>.</returns>
-    public abstract IOperation Apply();
+    public abstract IOperation Apply(IExecutionContext context);
 
-    protected virtual void OnExecutionContextChanged() { }
     protected virtual void OnCanceledChanged() { }
-    /// <inheritdoc/>
     public event EventHandler BreakpointChanged;
-    /// <summary>
-    /// Fires a new <c>BreakpointChanged</c> event.
-    /// </summary>
     protected virtual void OnBreakpointChanged() {
       if (BreakpointChanged != null) {
@@ -164 +126 @@
       }
     }
-    /// <inheritdoc/>
     public event EventHandler Executed;
-    /// <summary>
-    /// Fires a new <c>Executed</c> event.
-    /// </summary>
     protected virtual void OnExecuted() {
       if (Executed != null) {

branches/ParallelEngine/HeuristicLab.Operators/3.3/Placeholder.cs

@@ -50 +50 @@
     }
 
-    public override IOperation Apply() {
-      OperationCollection next = new OperationCollection(base.Apply());
+    public override IOperation Apply(IExecutionContext context) {
+      OperationCollection next = new OperationCollection(base.Apply(context));
       IOperator op = OperatorParameter.ActualValue;
       if (op != null)
-        next.Insert(0, ExecutionContext.CreateOperation(op));
+        next.Insert(0, context.CreateOperation(op));
       return next;
     }

branches/ParallelEngine/HeuristicLab.Operators/3.3/ScopeCleaner.cs

@@ -53 +53 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation Apply(IExecutionContext context) {
       CurrentScope.Variables.Clear();
       CurrentScope.SubScopes.Clear();
-      return base.Apply();
+      return base.Apply(context);
     }
   }

branches/ParallelEngine/HeuristicLab.Operators/3.3/SingleSuccessorOperator.cs

@@ -50 +50 @@
     }
     
-    public override IOperation Apply() {
+    public override IOperation Apply(IExecutionContext context) {
       if (Successor != null)
-        return ExecutionContext.CreateOperation(Successor);
+        return context.CreateOperation(Successor);
       else
         return null;

branches/ParallelEngine/HeuristicLab.Operators/3.3/StochasticBranch.cs

@@ -71 +71 @@
     }
 
-    public override IOperation Apply() {
-      OperationCollection next = new OperationCollection(base.Apply());
+    public override IOperation Apply(IExecutionContext context) {
+      OperationCollection next = new OperationCollection(base.Apply(context));
       if (RandomParameter.ActualValue.NextDouble() < ProbabilityParameter.ActualValue.Value) {
-        if (FirstBranch != null) next.Insert(0, ExecutionContext.CreateOperation(FirstBranch));
+        if (FirstBranch != null) next.Insert(0, context.CreateOperation(FirstBranch));
       } else {
-        if (SecondBranch != null) next.Insert(0, ExecutionContext.CreateOperation(SecondBranch));
+        if (SecondBranch != null) next.Insert(0, context.CreateOperation(SecondBranch));
       }
       return next;

branches/ParallelEngine/HeuristicLab.Operators/3.3/StochasticMultiBranch.cs

@@ -109 +109 @@
     /// or all selected operators have zero probabitlity.</exception>
     /// <returns>A new operation with the operator that was selected followed by the current operator's successor.</returns>
-    public override IOperation Apply() {
+    public override IOperation Apply(IExecutionContext context) {
       IRandom random = RandomParameter.ActualValue;
       DoubleArray probabilities = ProbabilitiesParameter.ActualValue;
@@ -131 +131 @@
         }
       }
-      OperationCollection next = new OperationCollection(base.Apply());
+      OperationCollection next = new OperationCollection(base.Apply(context));
       if (successor != null) {
         if (CreateChildOperation)
-          next.Insert(0, ExecutionContext.CreateChildOperation(successor));
-        else next.Insert(0, ExecutionContext.CreateOperation(successor));
+          next.Insert(0, context.CreateChildOperation(successor));
+        else next.Insert(0, context.CreateOperation(successor));
       }
       return next;

branches/ParallelEngine/HeuristicLab.Operators/3.3/SubScopesCreator.cs

@@ -58 +58 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation Apply(IExecutionContext context) {
       int n = NumberOfSubScopesParameter.ActualValue.Value;
       for (int i = 0; i < n; i++)
         CurrentScope.SubScopes.Add(new Scope(i.ToString()));
-      return base.Apply();
+      return base.Apply(context);
     }
   }

branches/ParallelEngine/HeuristicLab.Operators/3.3/SubScopesMixer.cs

@@ -77 +77 @@
     /// <param name="scope">The scope whose sub scopes should be mixed.</param>
     /// <returns><c>null</c>.</returns>
-    public override IOperation Apply() {
+    public override IOperation Apply(IExecutionContext context) {
       int partitions = Partitions.Value;
-      IScope scope = ExecutionContext.Scope;
+      IScope scope = context.Scope;
       int count = scope.SubScopes.Count;
       if ((count % partitions) != 0)
@@ -96 +96 @@
       scope.SubScopes.AddRange(reorderedSubScopes);
 
-      return base.Apply();
+      return base.Apply(context);
     }
   }

branches/ParallelEngine/HeuristicLab.Operators/3.3/SubScopesProcessor.cs

@@ -67 +67 @@
     }
 
-    public override IOperation Apply() {
-      List<IScope> scopes = GetScopesOnLevel(ExecutionContext.Scope, Depth.Value).ToList();
-      OperationCollection next = new OperationCollection(base.Apply());
+    public override IOperation Apply(IExecutionContext context) {
+      List<IScope> scopes = GetScopesOnLevel(context.Scope, Depth.Value).ToList();
+      OperationCollection next = new OperationCollection(base.Apply(context));
       if (scopes.Count != Operators.Count)
         throw new ArgumentException("The number of operators doesn't match the number of sub-scopes at depth " + Depth.Value);
@@ -75 +75 @@
       inner.Parallel = Parallel == null ? false : Parallel.Value;
       for (int i = 0; i < scopes.Count(); i++) {
-        inner.Add(ExecutionContext.CreateOperation(Operators[i], scopes[i]));
+        inner.Add(context.CreateOperation(Operators[i], scopes[i]));
       }
       next.Insert(0, inner);

branches/ParallelEngine/HeuristicLab.Operators/3.3/SubScopesRemover.cs

@@ -67 +67 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation Apply(IExecutionContext context) {
       if (RemoveAllSubScopes)
         CurrentScope.SubScopes.Clear();
@@ -73 +73 @@
         CurrentScope.SubScopes.RemoveAt(SubScopeIndexParameter.ActualValue.Value);
       }
-      return base.Apply();
+      return base.Apply(context);
     }
   }

branches/ParallelEngine/HeuristicLab.Operators/3.3/SubScopesSorter.cs

@@ -65 +65 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation Apply(IExecutionContext context) {
       descending = DescendingParameter.ActualValue.Value;
       actualName = ValueParameter.TranslatedName;
       CurrentScope.SubScopes.Sort(SortScopes);
-      return base.Apply();
+      return base.Apply(context);
     }
 

branches/ParallelEngine/HeuristicLab.Operators/3.3/UniformSubScopesProcessor.cs

@@ -74 +74 @@
     }
 
-    public override IOperation Apply() {
-      OperationCollection next = new OperationCollection(base.Apply());
+    public override IOperation Apply(IExecutionContext context) {
+      OperationCollection next = new OperationCollection(base.Apply(context));
       if (Operator != null) {
-        List<IScope> scopes = GetScopesOnLevel(ExecutionContext.Scope, Depth.Value).ToList();
+        List<IScope> scopes = GetScopesOnLevel(context.Scope, Depth.Value).ToList();
         OperationCollection inner = new OperationCollection();
         inner.Parallel = Parallel == null ? false : Parallel.Value;
         for (int i = 0; i < scopes.Count; i++) {
-          inner.Add(ExecutionContext.CreateOperation(Operator, scopes[i]));
+          inner.Add(context.CreateOperation(Operator, scopes[i]));
         }
         next.Insert(0, inner);

branches/ParallelEngine/HeuristicLab.Operators/3.3/VariableCreator.cs

@@ -53 +53 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation Apply(IExecutionContext context) {
       IVariable var;
       foreach (IParameter param in CollectedValues) {
@@ -66 +66 @@
           CurrentScope.Variables.Add(new Variable(name, param.Description, value == null ? null : (IItem)value.Clone()));
       }
-      return base.Apply();
+      return base.Apply(context);
     }
   }