Changeset 10295 for trunk/sources/HeuristicLab.Operators

Timestamp:

01/07/14 13:13:41 (11 years ago)

Author:

mkommend

Message:

#2119: Adapted all multi operators to subclass InstrumentedOperator.

Location:

trunk/sources/HeuristicLab.Operators/3.3

Files:

• MultiOperator.cs (modified) (1 diff)
• StochasticMultiBranch.cs (modified) (2 diffs)
• SubScopesProcessor.cs (modified) (1 diff)

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

@@ -34 +34 @@
   [Item("MultiOperator", "A base class for operators which apply arbitrary many other operators of a specific type.")]
   [StorableClass]
-  public abstract class MultiOperator<T> : SingleSuccessorOperator, IMultiOperator<T> where T : class, IOperator {
+  public abstract class MultiOperator<T> : InstrumentedOperator, IMultiOperator<T> where T : class, IOperator {
     private List<IValueParameter<T>> operatorParameters;
     protected IEnumerable<IValueParameter<T>> OperatorParameters { get { return operatorParameters; } }

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

@@ -132 +132 @@
     /// 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 InstrumentedApply() {
       IRandom random = RandomParameter.ActualValue;
       DoubleArray probabilities = ProbabilitiesParameter.ActualValue;
@@ -156 +156 @@
         }
       }
-      OperationCollection next = new OperationCollection(base.Apply());
+      OperationCollection next = new OperationCollection(base.InstrumentedApply());
       if (successor != null) {
         if (TraceSelectedOperatorParameter.Value.Value)

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

@@ -67 +67 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       List<IScope> scopes = GetScopesOnLevel(ExecutionContext.Scope, Depth.Value).ToList();
-      OperationCollection next = new OperationCollection(base.Apply());
+      OperationCollection next = new OperationCollection(base.InstrumentedApply());
       if (scopes.Count != Operators.Count)
         throw new ArgumentException("The number of operators doesn't match the number of sub-scopes at depth " + Depth.Value);