Changeset 12617


Ignore:
Timestamp:
07/06/15 18:24:07 (4 years ago)
Author:
abeham
Message:

#2364: Changed hierarchy of basic problems' evaluators to derive from InstrumentedOperator

Location:
trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Operators
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiObjectiveEvaluator.cs

    r12012 r12617  
    3131  [Item("Multi-objective Evaluator", "Calls the Evaluate method of the problem definition and writes the return value into the scope.")]
    3232  [StorableClass]
    33   public class MultiObjectiveEvaluator : SingleSuccessorOperator, IMultiObjectiveEvaluationOperator, IStochasticOperator {
     33  public class MultiObjectiveEvaluator : InstrumentedOperator, IMultiObjectiveEvaluationOperator, IStochasticOperator {
    3434
    3535    public ILookupParameter<IRandom> RandomParameter {
     
    6060    }
    6161
    62     public override IOperation Apply() {
     62    public override IOperation InstrumentedApply() {
    6363      var random = RandomParameter.ActualValue;
    6464      var encoding = EncodingParameter.ActualValue;
    6565      var individual = encoding.GetIndividual(ExecutionContext.Scope);
    6666      QualitiesParameter.ActualValue = new DoubleArray(EvaluateFunc(individual, random));
    67       return base.Apply();
     67      return base.InstrumentedApply();
    6868    }
    6969  }
  • trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveEvaluator.cs

    r12012 r12617  
    3131  [Item("Single-objective Evaluator", "Calls the script's Evaluate method to get the quality value of the parameter vector.")]
    3232  [StorableClass]
    33   public sealed class SingleObjectiveEvaluator : SingleSuccessorOperator, ISingleObjectiveEvaluationOperator, IStochasticOperator {
     33  public sealed class SingleObjectiveEvaluator : InstrumentedOperator, ISingleObjectiveEvaluationOperator, IStochasticOperator {
    3434
    3535    public ILookupParameter<IRandom> RandomParameter {
     
    5858    public override IDeepCloneable Clone(Cloner cloner) { return new SingleObjectiveEvaluator(this, cloner); }
    5959
    60     public override IOperation Apply() {
     60    public override IOperation InstrumentedApply() {
    6161      var random = RandomParameter.ActualValue;
    6262      var encoding = EncodingParameter.ActualValue;
    6363      var individual = encoding.GetIndividual(ExecutionContext.Scope);
    6464      QualityParameter.ActualValue = new DoubleValue(EvaluateFunc(individual, random));
    65       return base.Apply();
     65      return base.InstrumentedApply();
    6666    }
    6767  }
Note: See TracChangeset for help on using the changeset viewer.