Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/07/19 23:40:10 (5 years ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Encodings.RealVectorEncoding

  • stable/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/AverageCrossover.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.RealVectorEncoding {
    … …  
    3333  /// </remarks>
    3434  [Item("AverageCrossover", "The average crossover (intermediate recombination) produces a new offspring by calculating in each position the average of a number of parents. It is implemented as described by Beyer, H.-G. and Schwefel, H.-P. 2002. Evolution Strategies - A Comprehensive Introduction Natural Computing, 1, pp. 3-52.")]
    35   [StorableClass]
     35  [StorableType("D182B4D8-DFB1-467C-B6C8-8A8BC7540304")]
    3636  public class AverageCrossover : RealVectorCrossover {
    3737    [StorableConstructor]
    38     protected AverageCrossover(bool deserializing) : base(deserializing) { }
     38    protected AverageCrossover(StorableConstructorFlag _) : base(_) { }
    3939    protected AverageCrossover(AverageCrossover original, Cloner cloner) : base(original, cloner) { }
    4040    public AverageCrossover() : base() { }

  • stable/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/BlendAlphaBetaCrossover.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.RealVectorEncoding {
    … …  
    4040  /// </remarks>
    4141  [Item("BlendAlphaBetaCrossover", "The blend alpha beta crossover (BLX-a-b) for real vectors is similar to the blend alpha crossover (BLX-a), but distinguishes between the better and worse of the parents. The interval from which to choose the new offspring can be extended beyond the better parent by specifying a higher alpha value, and beyond the worse parent by specifying a higher beta value. The new offspring is sampled uniformly in the extended range. It is implemented as described in Takahashi, M. and Kita, H. 2001. A crossover operator using independent component analysis for real-coded genetic algorithms Proceedings of the 2001 Congress on Evolutionary Computation, pp. 643-649.")]
    42   [StorableClass]
     42  [StorableType("08F92C45-995C-4A05-B86F-0885BCB3F04C")]
    4343  public class BlendAlphaBetaCrossover : RealVectorCrossover, ISingleObjectiveOperator {
    4444    /// <summary>
    … …  
    6868
    6969    [StorableConstructor]
    70     protected BlendAlphaBetaCrossover(bool deserializing) : base(deserializing) { }
     70    protected BlendAlphaBetaCrossover(StorableConstructorFlag _) : base(_) { }
    7171    protected BlendAlphaBetaCrossover(BlendAlphaBetaCrossover original, Cloner cloner) : base(original, cloner) { }
    7272    /// <summary>

  • stable/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/BlendAlphaCrossover.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.RealVectorEncoding {
    … …  
    3838  /// </remarks>
    3939  [Item("BlendAlphaCrossover", "The blend alpha crossover (BLX-a) for real vectors creates new offspring by sampling a new value in the range [min_i - d * alpha, max_i + d * alpha) at each position i. Here min_i and max_i are the smaller and larger value of the two parents at position i and d is max_i - min_i. It is implemented as described in Takahashi, M. and Kita, H. 2001. A crossover operator using independent component analysis for real-coded genetic algorithms Proceedings of the 2001 Congress on Evolutionary Computation, pp. 643-649.")]
    40   [StorableClass]
     40  [StorableType("A56EA6B8-79A2-4762-B651-BEBAB95F8E8E")]
    4141  public class BlendAlphaCrossover : RealVectorCrossover {
    4242    /// <summary>
    … …  
    5151
    5252    [StorableConstructor]
    53     protected BlendAlphaCrossover(bool deserializing) : base(deserializing) { }
     53    protected BlendAlphaCrossover(StorableConstructorFlag _) : base(_) { }
    5454    protected BlendAlphaCrossover(BlendAlphaCrossover original, Cloner cloner) : base(original, cloner) { }
    5555    /// <summary>

  • stable/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/DiscreteCrossover.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.RealVectorEncoding {
    … …  
    3535  /// </remarks>
    3636  [Item("DiscreteCrossover", "Discrete crossover for real vectors: Creates a new offspring by combining the alleles in the parents such that each allele is randomly selected from one parent. It is implemented as described in Beyer, H.-G. and Schwefel, H.-P. 2002. Evolution Strategies - A Comprehensive Introduction Natural Computing, 1, pp. 3-52.")]
    37   [StorableClass]
     37  [StorableType("F88C9256-B1C9-43B4-B8EB-FAF2357A0310")]
    3838  public class DiscreteCrossover : RealVectorCrossover {
    3939    [StorableConstructor]
    40     protected DiscreteCrossover(bool deserializing) : base(deserializing) { }
     40    protected DiscreteCrossover(StorableConstructorFlag _) : base(_) { }
    4141    protected DiscreteCrossover(DiscreteCrossover original, Cloner cloner) : base(original, cloner) { }
    4242    public DiscreteCrossover() : base() { }

  • stable/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/HeuristicCrossover.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.RealVectorEncoding {
    … …  
    3737  /// </remarks>
    3838  [Item("HeuristicCrossover", "The heuristic crossover produces offspring that extend the better parent in direction from the worse to the better parent. It is implemented as described in Wright, A.H. (1994), Genetic algorithms for real parameter optimization, Foundations of Genetic Algorithms, G.J.E. Rawlins (Ed.), Morgan Kaufmann, San Mateo, CA, 205-218.")]
    39   [StorableClass]
     39  [StorableType("CBD8F372-73EA-4D52-8D35-A3D2D514B96A")]
    4040  public class HeuristicCrossover : RealVectorCrossover, ISingleObjectiveOperator {
    4141    /// <summary>
    … …  
    5353
    5454    [StorableConstructor]
    55     protected HeuristicCrossover(bool deserializing) : base(deserializing) { }
     55    protected HeuristicCrossover(StorableConstructorFlag _) : base(_) { }
    5656    protected HeuristicCrossover(HeuristicCrossover original, Cloner cloner) : base(original, cloner) { }
    5757    /// <summary>

  • stable/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/LocalCrossover.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.RealVectorEncoding {
    … …  
    3333  /// </remarks>
    3434  [Item("LocalCrossover", @"The local crossover is similar to the arithmetic all positions crossover, but uses a random alpha for each position x = alpha * p1 + (1-alpha) * p2. It is implemented as described in Dumitrescu, D. et al. (2000), Evolutionary computation, CRC Press, Boca Raton, FL., p. 194.")]
    35   [StorableClass]
     35  [StorableType("FB601681-7738-4380-889F-44A7CFA1D38F")]
    3636  public class LocalCrossover : RealVectorCrossover {
    3737    [StorableConstructor]
    38     protected LocalCrossover(bool deserializing) : base(deserializing) { }
     38    protected LocalCrossover(StorableConstructorFlag _) : base(_) { }
    3939    protected LocalCrossover(LocalCrossover original, Cloner cloner) : base(original, cloner) { }
    4040    public LocalCrossover() : base() { }

  • stable/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/MultiRealVectorCrossover.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232using HeuristicLab.PluginInfrastructure;
    3333
    3434namespace HeuristicLab.Encodings.RealVectorEncoding {
    3535  [Item("MultiRealVectorCrossover", "Randomly selects and applies one of its crossovers every time it is called.")]
    36   [StorableClass]
     36  [StorableType("38437BE4-8B77-4347-A7F8-73D787942944")]
    3737  public class MultiRealVectorCrossover : StochasticMultiBranch<IRealVectorCrossover>, IRealVectorCrossover, IStochasticOperator {
    3838    public override bool CanChangeName {
    … …  
    5454
    5555    [StorableConstructor]
    56     protected MultiRealVectorCrossover(bool deserializing) : base(deserializing) { }
     56    protected MultiRealVectorCrossover(StorableConstructorFlag _) : base(_) { }
    5757    protected MultiRealVectorCrossover(MultiRealVectorCrossover original, Cloner cloner)
    5858      : base(original, cloner) {

  • stable/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/RandomConvexCrossover.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.RealVectorEncoding {
    … …  
    3333  /// </remarks>
    3434  [Item("RandomConvexCrossover", "The random convex crossover acts like the local crossover, but with just one randomly chosen alpha for all crossed positions. It is implementes as described in Dumitrescu, D. et al. (2000), Evolutionary computation, CRC Press, Boca Raton, FL, pp. 193 - 194.")]
    35   [StorableClass]
     35  [StorableType("951482B3-BBED-4C8F-BEC4-B26A6B756E72")]
    3636  public class RandomConvexCrossover : RealVectorCrossover {
    3737    [StorableConstructor]
    38     protected RandomConvexCrossover(bool deserializing) : base(deserializing) { }
     38    protected RandomConvexCrossover(StorableConstructorFlag _) : base(_) { }
    3939    protected RandomConvexCrossover(RandomConvexCrossover original, Cloner cloner) : base(original, cloner) { }
    4040    public RandomConvexCrossover() : base() { }

  • stable/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/SimulatedBinaryCrossover.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.RealVectorEncoding {
    … …  
    3636  /// </remarks>
    3737  [Item("SimulatedBinaryCrossover", "The simulated binary crossover (SBX) is implemented as described in Deb, K. and Agrawal, R. B. 1995. Simulated binary crossover for continuous search space. Complex Systems, 9, pp. 115-148.")]
    38   [StorableClass]
     38  [StorableType("0A0686ED-BA7E-41A6-824E-134C4BF36408")]
    3939  public class SimulatedBinaryCrossover : RealVectorCrossover {
    4040    /// <summary>
    … …  
    4646
    4747    [StorableConstructor]
    48     protected SimulatedBinaryCrossover(bool deserializing) : base(deserializing) { }
     48    protected SimulatedBinaryCrossover(StorableConstructorFlag _) : base(_) { }
    4949    protected SimulatedBinaryCrossover(SimulatedBinaryCrossover original, Cloner cloner) : base(original, cloner) { }
    5050    /// <summary>

  • stable/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/SinglePointCrossover.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.RealVectorEncoding {
    … …  
    3535  /// </remarks>
    3636  [Item("SinglePointCrossover", "Breaks both parent chromosomes at a randomly chosen point and assembles a child by taking one part of the first parent and the other part of the second pard. It is implemented as described in Michalewicz, Z. 1999. Genetic Algorithms + Data Structures = Evolution Programs. Third, Revised and Extended Edition, Spring-Verlag Berlin Heidelberg.")]
    37   [StorableClass]
     37  [StorableType("008449CF-6CB0-481D-855A-80DA1F2DFC7E")]
    3838  public class SinglePointCrossover : RealVectorCrossover {
    3939    [StorableConstructor]
    40     protected SinglePointCrossover(bool deserializing) : base(deserializing) { }
     40    protected SinglePointCrossover(StorableConstructorFlag _) : base(_) { }
    4141    protected SinglePointCrossover(SinglePointCrossover original, Cloner cloner) : base(original, cloner) { }
    4242    public SinglePointCrossover() : base() { }

  • stable/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/UniformAllPositionsArithmeticCrossover.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.RealVectorEncoding {
    … …  
    3636  /// </remarks>
    3737  [Item("UniformAllPositionsArithmeticCrossover", "The uniform all positions arithmetic crossover constructs an offspring by calculating x = alpha * p1 + (1-alpha) * p2 for every position x in the vector. Note that for alpha = 0.5 it is the same as the AverageCrossover (except that the AverageCrossover is defined for more than 2 parents). It is implemented as described in Michalewicz, Z. 1999. Genetic Algorithms + Data Structures = Evolution Programs. Third, Revised and Extended Edition, Spring-Verlag Berlin Heidelberg.")]
    38   [StorableClass]
     38  [StorableType("F3081373-87F2-43CE-92E3-F4D1A690FF31")]
    3939  public class UniformAllPositionsArithmeticCrossover : RealVectorCrossover {
    4040    /// <summary>
    … …  
    4646
    4747    [StorableConstructor]
    48     protected UniformAllPositionsArithmeticCrossover(bool deserializing) : base(deserializing) { }
     48    protected UniformAllPositionsArithmeticCrossover(StorableConstructorFlag _) : base(_) { }
    4949    protected UniformAllPositionsArithmeticCrossover(UniformAllPositionsArithmeticCrossover original, Cloner cloner) : base(original, cloner) { }
    5050    /// <summary>

  • stable/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/UniformSomePositionsArithmeticCrossover.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.RealVectorEncoding {
    … …  
    3636  /// </remarks>
    3737  [Item("UniformSomePositionsArithmeticCrossover", "The uniform some positions arithmetic crossover (continuous recombination) constructs an offspring by calculating x = alpha * p1 + (1-alpha) * p2 for a position x in the vector with a given probability (otherwise p1 is taken at this position). It is implemented as described in Dumitrescu, D. et al. (2000), Evolutionary computation, CRC Press, Boca Raton, FL, p. 191. Note that Dumitrescu et al. specify the alpha to be 0.5.")]
    38   [StorableClass]
     38  [StorableType("54FF8CE9-72E4-4C39-AF00-F38A548EDDD6")]
    3939  public class UniformSomePositionsArithmeticCrossover : RealVectorCrossover {
    4040    /// <summary>
    … …  
    5252
    5353    [StorableConstructor]
    54     protected UniformSomePositionsArithmeticCrossover(bool deserializing) : base(deserializing) { }
     54    protected UniformSomePositionsArithmeticCrossover(StorableConstructorFlag _) : base(_) { }
    5555    protected UniformSomePositionsArithmeticCrossover(UniformSomePositionsArithmeticCrossover original, Cloner cloner) : base(original, cloner) { }
    5656    /// <summary>
Note: See TracChangeset for help on using the changeset viewer.