Ignore:
Timestamp:
05/04/19 08:22:42 (4 months ago)
Author:
gkronber
Message:

#2925 merged r16661:16890 from trunk to branch

Location:
branches/2925_AutoDiffForDynamicalModels
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2925_AutoDiffForDynamicalModels

  • branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Algorithms.ALPS

  • branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithm.cs

    r16662 r16892  
    2323using System.Collections.Generic;
    2424using System.Linq;
     25using HEAL.Attic;
    2526using HeuristicLab.Analysis;
    2627using HeuristicLab.Collections;
     
    3233using HeuristicLab.Optimization.Operators;
    3334using HeuristicLab.Parameters;
    34 using HEAL.Attic;
    3535using HeuristicLab.PluginInfrastructure;
    3636using HeuristicLab.Random;
     
    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();
     
    501496    protected override void Problem_OperatorsChanged(object sender, EventArgs e) {
    502497      base.Problem_OperatorsChanged(sender, e);
     498      foreach (IOperator op in Problem.Operators.OfType<IOperator>()) ParameterizeStochasticOperator(op);
     499      ParameterizeStochasticOperatorForLayer(Problem.Evaluator);
    503500      ParameterizeIterationBasedOperators();
    504501      UpdateCrossovers();
  • branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Algorithms.ALPS/3.3/AlpsOffspringSelectionGeneticAlgorithm.cs

    r16662 r16892  
    2323using System.Collections.Generic;
    2424using System.Linq;
     25using HEAL.Attic;
    2526using HeuristicLab.Analysis;
    2627using HeuristicLab.Collections;
     
    3233using HeuristicLab.Optimization.Operators;
    3334using HeuristicLab.Parameters;
    34 using HEAL.Attic;
    3535using HeuristicLab.PluginInfrastructure;
    3636using HeuristicLab.Random;
     
    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();
     
    561559    protected override void Problem_OperatorsChanged(object sender, EventArgs e) {
    562560      base.Problem_OperatorsChanged(sender, e);
     561      foreach (IOperator op in Problem.Operators.OfType<IOperator>()) ParameterizeStochasticOperator(op);
     562      ParameterizeStochasticOperatorForLayer(Problem.Evaluator);
    563563      ParameterizeIterationBasedOperators();
    564564      UpdateCrossovers();
  • branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Algorithms.ALPS/3.3/AlpsOffspringSelectionGeneticAlgorithmMainOperator.cs

    r16662 r16892  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
     
    2627using HeuristicLab.Optimization.Operators;
    2728using HeuristicLab.Parameters;
    28 using HEAL.Attic;
    2929using HeuristicLab.Selection;
    3030
     
    266266
    267267      variableCreator1.Name = "MutatedOffspring = true";
    268       variableCreator1.CollectedValues.Add(new ValueParameter<BoolValue>("MutatedOffspring", null, new BoolValue(true), false));
     268      variableCreator1.CollectedValues.Add(new ValueParameter<BoolValue>("MutatedOffspring", null, new BoolValue(true)) { GetsCollected = false });
    269269      variableCreator1.Successor = null;
    270270
    271271      variableCreator2.Name = "MutatedOffspring = false";
    272       variableCreator2.CollectedValues.Add(new ValueParameter<BoolValue>("MutatedOffspring", null, new BoolValue(false), false));
     272      variableCreator2.CollectedValues.Add(new ValueParameter<BoolValue>("MutatedOffspring", null, new BoolValue(false)) { GetsCollected = false });
    273273      variableCreator2.Successor = null;
    274274
Note: See TracChangeset for help on using the changeset viewer.