Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/19/19 15:22:34 (5 years ago)
Author:
mkommend
Message:

#3020: Merged r17198 into stable.

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithm.cs

    r17181 r17352  
    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;
     
    282282
    283283      var optionalMutatorParameter = MutatorParameter as OptionalConstrainedValueParameter<IManipulator>;
    284       if (optionalMutatorParameter != null) {
     284      var mutatorParameter = MutatorParameter as ConstrainedValueParameter<IManipulator>;
     285      if (mutatorParameter == null && optionalMutatorParameter != null) {
    285286        Parameters.Remove(optionalMutatorParameter);
    286287        Parameters.Add(new ConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));
  • stable/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs

    r17181 r17352  
    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;
     
    230230
    231231      var optionalMutatorParameter = MutatorParameter as OptionalConstrainedValueParameter<IManipulator>;
    232       if (optionalMutatorParameter != null) {
     232      var mutatorParameter = MutatorParameter as ConstrainedValueParameter<IManipulator>;
     233      if (mutatorParameter == null && optionalMutatorParameter != null) {
    233234        Parameters.Remove(optionalMutatorParameter);
    234235        Parameters.Add(new ConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));
  • stable/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SASEGASA.cs

    r17181 r17352  
    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;
     
    258258
    259259      var optionalMutatorParameter = MutatorParameter as OptionalConstrainedValueParameter<IManipulator>;
    260       if (optionalMutatorParameter != null) {
     260      var mutatorParameter = MutatorParameter as ConstrainedValueParameter<IManipulator>;
     261      if (mutatorParameter == null && optionalMutatorParameter != null) {
    261262        Parameters.Remove(optionalMutatorParameter);
    262263        Parameters.Add(new ConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));
Note: See TracChangeset for help on using the changeset viewer.