Changeset 10483 for branches/LogResidualEvaluator/HeuristicLab.Optimization.Operators/3.3/UserDefinedOperator.cs

Timestamp:

02/20/14 14:56:39 (11 years ago)

Author:

gkronber

Message:

#2093: merged trunk changes to prepare for reintegration

Location:

branches/LogResidualEvaluator

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization.Operators/3.3/UserDefinedOperator.cs (modified) (1 diff)

branches/LogResidualEvaluator/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;
     }