Changeset 10295 for trunk/sources/HeuristicLab.Optimization.Operators

Timestamp:

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

Author:

mkommend

Message:

#2119: Adapted all multi operators to subclass InstrumentedOperator.

Location:

trunk/sources/HeuristicLab.Optimization.Operators/3.3

Files:

• ShakingOperator.cs (modified) (2 diffs)
• UserDefinedOperator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimization.Operators/3.3/ShakingOperator.cs

@@ -56 +56 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       if (NeighborhoodCountParameter.ActualValue == null)
         NeighborhoodCountParameter.ActualValue = new IntValue(Operators.CheckedItems.Count());
@@ -64 +64 @@
       var shaker = base.Operators.CheckedItems.SingleOrDefault(x => x.Index == index);
 
-      OperationCollection next = new OperationCollection(base.Apply());
+      OperationCollection next = new OperationCollection(base.InstrumentedApply());
       if (shaker.Value != null)
         next.Insert(0, ExecutionContext.CreateChildOperation(shaker.Value));

trunk/sources/HeuristicLab.Optimization.Operators/3.3/UserDefinedOperator.cs

@@ -35 +35 @@
     public UserDefinedOperator() : base() { }
 
-    public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       OperationCollection result = new OperationCollection();
       foreach (IOperator op in Operators.CheckedItems.OrderBy(x => x.Index).Select(x => x.Value)) {
         result.Add(ExecutionContext.CreateOperation(op));
       }
-      result.Add(base.Apply());
+      result.Add(base.InstrumentedApply());
       return result;
     }