Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/25/14 14:00:47 (10 years ago)
Author:
mkommend
Message:

#2119: Merged r10149, r10231, r10261, r10291, r10292, r10295 and r10298 into stable.

Location:
stable
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Encodings.PermutationEncoding

  • stable/HeuristicLab.Encodings.PermutationEncoding/3.3/Creators/RandomPermutationCreator.cs

    r9456 r10507  
    3434  [Item("RandomPermutationCreator", "An operator which creates a new random permutation of integer values.")]
    3535  [StorableClass]
    36   public sealed class RandomPermutationCreator : SingleSuccessorOperator, IPermutationCreator, IStochasticOperator {
     36  public sealed class RandomPermutationCreator : InstrumentedOperator, IPermutationCreator, IStochasticOperator {
    3737    public override bool CanChangeName {
    3838      get { return false; }
     
    7272    }
    7373
    74     public override IOperation Apply() {
     74    public override IOperation InstrumentedApply() {
    7575      PermutationParameter.ActualValue = new Permutation(PermutationType, LengthParameter.ActualValue.Value, RandomParameter.ActualValue);
    76       return base.Apply();
     76      return base.InstrumentedApply();
    7777    }
    7878  }
  • stable/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/MultiPermutationCrossover.cs

    r9456 r10507  
    9090    }
    9191
    92     public override IOperation Apply() {
     92    public override IOperation InstrumentedApply() {
    9393      if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one permutation crossover to choose from.");
    94       return base.Apply();
     94      return base.InstrumentedApply();
    9595    }
    9696  }
  • stable/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/MultiPermutationManipulator.cs

    r9456 r10507  
    8282    }
    8383
    84     public override IOperation Apply() {
     84    public override IOperation InstrumentedApply() {
    8585      if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one permutation manipulator to choose from.");
    86       return base.Apply();
     86      return base.InstrumentedApply();
    8787    }
    8888  }
  • stable/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationCrossover.cs

    r9456 r10507  
    3333  [Item("PermutationCrossover", "A base class for permutation crossover operators.")]
    3434  [StorableClass]
    35   public abstract class PermutationCrossover : SingleSuccessorOperator, IPermutationCrossover, IStochasticOperator {
     35  public abstract class PermutationCrossover : InstrumentedOperator, IPermutationCrossover, IStochasticOperator {
    3636    public override bool CanChangeName {
    3737      get { return false; }
     
    6060    }
    6161
    62     public sealed override IOperation Apply() {
     62    public sealed override IOperation InstrumentedApply() {
    6363      ChildParameter.ActualValue = Cross(RandomParameter.ActualValue, ParentsParameter.ActualValue);
    64       return base.Apply();
     64      return base.InstrumentedApply();
    6565    }
    6666
  • stable/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationManipulator.cs

    r9456 r10507  
    3333  [Item("PermutationManipulator", "A base class for permutation manipulation operators.")]
    3434  [StorableClass]
    35   public abstract class PermutationManipulator : SingleSuccessorOperator, IPermutationManipulator, IStochasticOperator {
     35  public abstract class PermutationManipulator : InstrumentedOperator, IPermutationManipulator, IStochasticOperator {
    3636    public override bool CanChangeName {
    3737      get { return false; }
     
    5454    }
    5555
    56     public sealed override IOperation Apply() {
     56    public sealed override IOperation InstrumentedApply() {
    5757      Manipulate(RandomParameter.ActualValue, PermutationParameter.ActualValue);
    58       return base.Apply();
     58      return base.InstrumentedApply();
    5959    }
    6060
Note: See TracChangeset for help on using the changeset viewer.