Changeset 17114


Ignore:
Timestamp:
07/08/19 15:41:41 (13 days ago)
Author:
abeham
Message:

#3004: merged to stable (16861)

Location:
stable
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Algorithms.ALPS

  • stable/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithm.cs

    r17111 r17114  
    444444      base.OnProblemChanged();
    445445      ParameterizeStochasticOperator(Problem.SolutionCreator);
    446       ParameterizeStochasticOperatorForLayer(Problem.Evaluator);
    447446      foreach (var @operator in Problem.Operators.OfType<IOperator>())
    448447        ParameterizeStochasticOperator(@operator);
     448      ParameterizeStochasticOperatorForLayer(Problem.Evaluator);
    449449
    450450      ParameterizeIterationBasedOperators();
     
    478478      base.Problem_SolutionCreatorChanged(sender, e);
    479479      ParameterizeStochasticOperator(Problem.SolutionCreator);
    480       ParameterizeStochasticOperatorForLayer(Problem.Evaluator);
    481480
    482481      Problem.Evaluator.QualityParameter.ActualNameChanged += Evaluator_QualityParameter_ActualNameChanged;
     
    487486    protected override void Problem_EvaluatorChanged(object sender, EventArgs e) {
    488487      base.Problem_EvaluatorChanged(sender, e);
    489 
    490488      ParameterizeStochasticOperatorForLayer(Problem.Evaluator);
    491 
    492       foreach (var @operator in Problem.Operators.OfType<IOperator>())
    493         ParameterizeStochasticOperator(@operator);
    494489
    495490      UpdateAnalyzers();
     
    502497      base.Problem_OperatorsChanged(sender, e);
    503498      foreach (IOperator op in Problem.Operators.OfType<IOperator>()) ParameterizeStochasticOperator(op);
     499      ParameterizeStochasticOperatorForLayer(Problem.Evaluator);
    504500      ParameterizeIterationBasedOperators();
    505501      UpdateCrossovers();
  • stable/HeuristicLab.Algorithms.ALPS/3.3/AlpsOffspringSelectionGeneticAlgorithm.cs

    r17111 r17114  
    507507      base.OnProblemChanged();
    508508      ParameterizeStochasticOperator(Problem.SolutionCreator);
    509       ParameterizeStochasticOperatorForLayer(Problem.Evaluator);
    510509      foreach (var @operator in Problem.Operators.OfType<IOperator>())
    511510        ParameterizeStochasticOperator(@operator);
     511      ParameterizeStochasticOperatorForLayer(Problem.Evaluator);
    512512
    513513      ParameterizeIterationBasedOperators();
     
    541541      base.Problem_SolutionCreatorChanged(sender, e);
    542542      ParameterizeStochasticOperator(Problem.SolutionCreator);
    543       ParameterizeStochasticOperatorForLayer(Problem.Evaluator);
    544543
    545544      Problem.Evaluator.QualityParameter.ActualNameChanged += Evaluator_QualityParameter_ActualNameChanged;
     
    550549    protected override void Problem_EvaluatorChanged(object sender, EventArgs e) {
    551550      base.Problem_EvaluatorChanged(sender, e);
    552       foreach (var @operator in Problem.Operators.OfType<IOperator>())
    553         ParameterizeStochasticOperator(@operator);
     551      ParameterizeStochasticOperatorForLayer(Problem.Evaluator);
    554552
    555553      UpdateAnalyzers();
     
    562560      base.Problem_OperatorsChanged(sender, e);
    563561      foreach (IOperator op in Problem.Operators.OfType<IOperator>()) ParameterizeStochasticOperator(op);
     562      ParameterizeStochasticOperatorForLayer(Problem.Evaluator);
    564563      ParameterizeIterationBasedOperators();
    565564      UpdateCrossovers();
  • stable/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs

    r17097 r17114  
    2222using System;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Analysis;
    2526using HeuristicLab.Common;
     
    3031using HeuristicLab.Optimization.Operators;
    3132using HeuristicLab.Parameters;
    32 using HEAL.Attic;
    3333using HeuristicLab.PluginInfrastructure;
    3434using HeuristicLab.Random;
     
    372372    protected override void OnProblemChanged() {
    373373      ParameterizeStochasticOperator(Problem.SolutionCreator);
     374      foreach (IOperator op in Problem.Operators.OfType<IOperator>()) ParameterizeStochasticOperator(op);
    374375      ParameterizeStochasticOperatorForIsland(Problem.Evaluator);
    375       foreach (IOperator op in Problem.Operators.OfType<IOperator>()) ParameterizeStochasticOperator(op);
    376376      ParameterizeSolutionsCreator();
    377377      ParameterizeMainLoop();
     
    402402    protected override void Problem_OperatorsChanged(object sender, EventArgs e) {
    403403      foreach (IOperator op in Problem.Operators.OfType<IOperator>()) ParameterizeStochasticOperator(op);
     404      ParameterizeStochasticOperatorForIsland(Problem.Evaluator);
    404405      ParameterizeIterationBasedOperators();
    405406      UpdateCrossovers();
Note: See TracChangeset for help on using the changeset viewer.