Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/13/19 09:40:12 (5 years ago)
Author:
gkronber
Message:

#2994: merged r17132:17198 from trunk to branch

Location:
branches/2994-AutoDiffForIntervals
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2994-AutoDiffForIntervals

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs

    r16565 r17209  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    221221        Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", (BoolValue)new BoolValue(false).AsReadOnly()) { Hidden = true });
    222222      }
     223
    223224      var optionalMutatorParameter = MutatorParameter as OptionalConstrainedValueParameter<IManipulator>;
    224       if (optionalMutatorParameter != null) {
     225      var mutatorParameter = MutatorParameter as ConstrainedValueParameter<IManipulator>;
     226      if (mutatorParameter == null && optionalMutatorParameter != null) {
    225227        Parameters.Remove(optionalMutatorParameter);
    226228        Parameters.Add(new ConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));
Note: See TracChangeset for help on using the changeset viewer.