Changeset 10483 for branches/LogResidualEvaluator/HeuristicLab.Problems.TestFunctions

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.Problems.TestFunctions (modified) (1 prop)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs (modified) (2 diffs)

branches/LogResidualEvaluator/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs

@@ -34 +34 @@
   [Item("Evaluator", "Base calls for single objective test function evaluators.")]
   [StorableClass]
-  public abstract class SingleObjectiveTestFunctionProblemEvaluator : SingleSuccessorOperator, ISingleObjectiveTestFunctionProblemEvaluator {
+  public abstract class SingleObjectiveTestFunctionProblemEvaluator : InstrumentedOperator, ISingleObjectiveTestFunctionProblemEvaluator {
     /// <summary>
     /// The name of the function
@@ -86 +86 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       RealVector point = PointParameter.ActualValue;
       double quality = Evaluate(point);
       QualityParameter.ActualValue = new DoubleValue(quality);
-      return base.Apply();
+      return base.InstrumentedApply();
     }